Commit c9cf56f2 authored by Thomas Guillem's avatar Thomas Guillem Committed by Geoffrey Métais

LibVLC: MediaPlayer: rename mAudioDeviceFromUser

parent 12e39079
...@@ -362,7 +362,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> { ...@@ -362,7 +362,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
private Media mMedia = null; private Media mMedia = null;
private boolean mPlaying = false; private boolean mPlaying = false;
private boolean mPlayRequested = false; private boolean mPlayRequested = false;
private boolean mAudioDeviceFromUser = false; private boolean mListenAudioPlug = true;
private int mVoutCount = 0; private int mVoutCount = 0;
private boolean mAudioReset = false; private boolean mAudioReset = false;
private String mAudioOutput = "android_audiotrack"; private String mAudioOutput = "android_audiotrack";
...@@ -615,7 +615,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> { ...@@ -615,7 +615,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
nativeSetAudioOutputDevice(mAudioOutputDevice); nativeSetAudioOutputDevice(mAudioOutputDevice);
mAudioReset = false; mAudioReset = false;
} }
if (!mAudioDeviceFromUser) if (mListenAudioPlug)
registerAudioPlug(true); registerAudioPlug(true);
mPlayRequested = true; mPlayRequested = true;
if (mWindow.areSurfacesWaiting()) if (mWindow.areSurfacesWaiting())
...@@ -723,7 +723,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> { ...@@ -723,7 +723,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
synchronized (this) { synchronized (this) {
mAudioOutput = aout; mAudioOutput = aout;
/* The user forced an output, don't listen to audio plug events and let the user decide */ /* The user forced an output, don't listen to audio plug events and let the user decide */
mAudioDeviceFromUser = true; mListenAudioPlug = false;
registerAudioPlug(false); registerAudioPlug(false);
} }
} }
...@@ -737,7 +737,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> { ...@@ -737,7 +737,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
mAudioOutputDevice = id; mAudioOutputDevice = id;
if (fromUser) { if (fromUser) {
/* The user forced a device, don't listen to audio plug events and let the user decide */ /* The user forced a device, don't listen to audio plug events and let the user decide */
mAudioDeviceFromUser = true; mListenAudioPlug = false;
registerAudioPlug(false); registerAudioPlug(false);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment