Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
a62d119a
Commit
a62d119a
authored
Jun 08, 2013
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opensles: do not set volume if aout start failed
Close: #8579
parent
01b0eaf8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
modules/audio_output/opensles_android.c
modules/audio_output/opensles_android.c
+6
-0
No files found.
modules/audio_output/opensles_android.c
View file @
a62d119a
...
@@ -202,6 +202,9 @@ static void Flush(audio_output_t *aout, bool drain)
...
@@ -202,6 +202,9 @@ static void Flush(audio_output_t *aout, bool drain)
static
int
VolumeSet
(
audio_output_t
*
aout
,
float
vol
)
static
int
VolumeSet
(
audio_output_t
*
aout
,
float
vol
)
{
{
if
(
!
aout
->
sys
->
volumeItf
)
return
-
1
;
/* Convert UI volume to linear factor (cube) */
/* Convert UI volume to linear factor (cube) */
vol
=
vol
*
vol
*
vol
;
vol
=
vol
*
vol
*
vol
;
...
@@ -218,6 +221,9 @@ static int VolumeSet(audio_output_t *aout, float vol)
...
@@ -218,6 +221,9 @@ static int VolumeSet(audio_output_t *aout, float vol)
static
int
MuteSet
(
audio_output_t
*
aout
,
bool
mute
)
static
int
MuteSet
(
audio_output_t
*
aout
,
bool
mute
)
{
{
if
(
!
aout
->
sys
->
volumeItf
)
return
-
1
;
SLresult
r
=
SetMute
(
aout
->
sys
->
volumeItf
,
mute
);
SLresult
r
=
SetMute
(
aout
->
sys
->
volumeItf
,
mute
);
return
(
r
==
SL_RESULT_SUCCESS
)
?
0
:
-
1
;
return
(
r
==
SL_RESULT_SUCCESS
)
?
0
:
-
1
;
}
}
...
...
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