Skip to content
Snippets Groups Projects
Commit a40b8dca authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Revert "set media only when we actually play it"

This reverts commit dd5e7fcd.
parent c07d24c9
No related branches found
No related tags found
No related merge requests found
......@@ -1683,18 +1683,17 @@ public class PlaybackService extends Service implements IVLCVout.Callback {
return;
if (mw.getType() == MediaWrapper.TYPE_VIDEO && isVideoPlaying())
mw.addFlags(MediaWrapper.MEDIA_VIDEO);
if (mw .getType() != MediaWrapper.TYPE_VIDEO || mw.hasFlag(MediaWrapper.MEDIA_FORCE_AUDIO) || isVideoPlaying()) {
/* Pausable and seekable are true by default */
mParsed = false;
mSwitchingToVideo = false;
mPausable = mSeekable = true;
final Media media = new Media(VLCInstance.get(), mw.getUri());
VLCOptions.setMediaOptions(media, this, flags | mw.getFlags());
media.setEventListener(mMediaListener);
mMediaPlayer.setMedia(media);
media.release();
mParsed = false;
mSwitchingToVideo = false;
mPausable = mSeekable = true;
final Media media = new Media(VLCInstance.get(), mw.getUri());
VLCOptions.setMediaOptions(media, this, flags | mw.getFlags());
media.setEventListener(mMediaListener);
mMediaPlayer.setMedia(media);
media.release();
if (mw .getType() != MediaWrapper.TYPE_VIDEO || mw.hasFlag(MediaWrapper.MEDIA_FORCE_AUDIO) || isVideoPlaying()) {
mMediaPlayer.setEqualizer(VLCOptions.getEqualizer(this));
mMediaPlayer.setVideoTitleDisplay(MediaPlayer.Position.Disable, 0);
changeAudioFocus(true);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment