[Android] Revert "Workaround to load playlists from 3rd party apps"
Thomas Guillem
git at videolan.org
Tue Aug 18 16:39:26 CEST 2015
vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Aug 18 16:19:30 2015 +0200| [6389eb603cb3ae5368239f48c4e1f746487d6c54] | committer: Thomas Guillem
Revert "Workaround to load playlists from 3rd party apps"
This reverts commit 924363bf1f04a35aad0be85ea47106eec4221004.
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=6389eb603cb3ae5368239f48c4e1f746487d6c54
---
.../videolan/vlc/gui/video/VideoPlayerActivity.java | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index 0881d91..4ec9e04 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -102,10 +102,10 @@ import org.videolan.vlc.MediaWrapper;
import org.videolan.vlc.PlaybackService;
import org.videolan.vlc.R;
import org.videolan.vlc.VLCApplication;
-import org.videolan.vlc.gui.MainActivity;
+import org.videolan.vlc.gui.browser.FilePickerActivity;
import org.videolan.vlc.gui.PlaybackServiceActivity;
+import org.videolan.vlc.gui.MainActivity;
import org.videolan.vlc.gui.PreferencesActivity;
-import org.videolan.vlc.gui.browser.FilePickerActivity;
import org.videolan.vlc.gui.dialogs.AdvOptionsDialog;
import org.videolan.vlc.interfaces.IDelayController;
import org.videolan.vlc.util.AndroidDevices;
@@ -1321,16 +1321,11 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
}
}
- //FIXME hack to workaround playlist loading fail.
- boolean mIgnorePlaylistEnd = false;
@Override
public void onMediaPlayerEvent(MediaPlayer.Event event) {
switch (event.type) {
case MediaPlayer.Event.Playing:
- if (mService.getCurrentMediaWrapper().getType() == MediaWrapper.TYPE_PLAYLIST){
- mIgnorePlaylistEnd = true;
- } else
- onPlaying();
+ onPlaying();
break;
case MediaPlayer.Event.Paused:
updateOverlayPausePlay();
@@ -1339,10 +1334,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
exitOK();
break;
case MediaPlayer.Event.EndReached:
- if(mIgnorePlaylistEnd)
- mIgnorePlaylistEnd = false;
- else
- endReached();
+ endReached();
break;
case MediaPlayer.Event.EncounteredError:
encounteredError();
More information about the Android
mailing list