Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Casanowow Life for love
VLC-Android
Commits
c9cf56f2
Commit
c9cf56f2
authored
Mar 26, 2018
by
Thomas Guillem
Committed by
Geoffrey Métais
Mar 26, 2018
Browse files
LibVLC: MediaPlayer: rename mAudioDeviceFromUser
parent
12e39079
Changes
1
Hide whitespace changes
Inline
Side-by-side
libvlc/src/org/videolan/libvlc/MediaPlayer.java
View file @
c9cf56f2
...
...
@@ -362,7 +362,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
private
Media
mMedia
=
null
;
private
boolean
mPlaying
=
false
;
private
boolean
mPlayRequested
=
false
;
private
boolean
m
AudioDeviceFromUser
=
fals
e
;
private
boolean
m
ListenAudioPlug
=
tru
e
;
private
int
mVoutCount
=
0
;
private
boolean
mAudioReset
=
false
;
private
String
mAudioOutput
=
"android_audiotrack"
;
...
...
@@ -615,7 +615,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
nativeSetAudioOutputDevice
(
mAudioOutputDevice
);
mAudioReset
=
false
;
}
if
(
!
mAudioDeviceFromUser
)
if
(
mListenAudioPlug
)
registerAudioPlug
(
true
);
mPlayRequested
=
true
;
if
(
mWindow
.
areSurfacesWaiting
())
...
...
@@ -723,7 +723,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
synchronized
(
this
)
{
mAudioOutput
=
aout
;
/* The user forced an output, don't listen to audio plug events and let the user decide */
m
AudioDeviceFromUser
=
tru
e
;
m
ListenAudioPlug
=
fals
e
;
registerAudioPlug
(
false
);
}
}
...
...
@@ -737,7 +737,7 @@ public class MediaPlayer extends VLCObject<MediaPlayer.Event> {
mAudioOutputDevice
=
id
;
if
(
fromUser
)
{
/* The user forced a device, don't listen to audio plug events and let the user decide */
m
AudioDeviceFromUser
=
tru
e
;
m
ListenAudioPlug
=
fals
e
;
registerAudioPlug
(
false
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment