Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
92596bf2
Commit
92596bf2
authored
May 31, 2016
by
Geoffrey Métais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Restore correct audio volume after notifications"
This reverts commit
2ae42cb8
.
parent
6e2ff467
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
vlc-android/src/org/videolan/vlc/PlaybackService.java
vlc-android/src/org/videolan/vlc/PlaybackService.java
+6
-6
No files found.
vlc-android/src/org/videolan/vlc/PlaybackService.java
View file @
92596bf2
...
...
@@ -353,7 +353,7 @@ public class PlaybackService extends Service implements IVLCVout.Callback {
private
OnAudioFocusChangeListener
createOnAudioFocusChangeListener
()
{
return
new
OnAudioFocusChangeListener
()
{
private
boolean
mLossTransient
=
false
;
private
int
mLossTransient
Volume
=
-
1
;
private
boolean
mLossTransient
CanDuck
=
false
;
private
boolean
wasPlaying
=
false
;
@Override
...
...
@@ -381,15 +381,15 @@ public class PlaybackService extends Service implements IVLCVout.Callback {
// Lower the volume
if
(
mMediaPlayer
.
isPlaying
())
{
mMediaPlayer
.
setVolume
(
36
);
mLossTransient
Volume
=
mMediaPlayer
.
getVolume
()
;
mLossTransient
CanDuck
=
true
;
}
break
;
case
AudioManager
.
AUDIOFOCUS_GAIN
:
Log
.
i
(
TAG
,
"AUDIOFOCUS_GAIN: "
+
mLossTransient
Volume
+
", "
+
mLossTransient
);
Log
.
i
(
TAG
,
"AUDIOFOCUS_GAIN: "
+
mLossTransient
CanDuck
+
", "
+
mLossTransient
);
// Resume playback
if
(
mLossTransient
Volume
!=
-
1
)
{
mMediaPlayer
.
setVolume
(
mLossTransientVolume
);
mLossTransient
Volume
=
-
1
;
if
(
mLossTransient
CanDuck
)
{
mMediaPlayer
.
setVolume
(
100
);
mLossTransient
CanDuck
=
false
;
}
else
if
(
mLossTransient
)
{
if
(
wasPlaying
)
mMediaPlayer
.
play
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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