[Android] Revert "set media only when we actually play it"

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Apr  4 17:15:11 2016 +0200| [a40b8dca40320e5632bf4d59a8beb941bff373e0] | committer: Geoffrey Métais

Revert "set media only when we actually play it"

This reverts commit dd5e7fcd5411b56af93a5f91aa2daeb877857f00.

> https://code.videolan.org/videolan/vlc-android/commit/a40b8dca40320e5632bf4d59a8beb941bff373e0
---

 vlc-android/src/org/videolan/vlc/PlaybackService.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/PlaybackService.java b/vlc-android/src/org/videolan/vlc/PlaybackService.java
index 3057718..b0b96b6 100644
--- a/vlc-android/src/org/videolan/vlc/PlaybackService.java
+++ b/vlc-android/src/org/videolan/vlc/PlaybackService.java
@@ -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);