Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
ac201136
Commit
ac201136
authored
May 30, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not restart mixer on volume change
parent
91307e82
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
20 deletions
+4
-20
src/audio_output/aout_internal.h
src/audio_output/aout_internal.h
+1
-1
src/audio_output/mixer.c
src/audio_output/mixer.c
+3
-19
No files found.
src/audio_output/aout_internal.h
View file @
ac201136
...
@@ -111,7 +111,7 @@ void aout_FiltersPlay ( filter_t ** pp_filters, unsigned i_nb_filters, aout_buf
...
@@ -111,7 +111,7 @@ void aout_FiltersPlay ( filter_t ** pp_filters, unsigned i_nb_filters, aout_buf
int
aout_MixerNew
(
aout_instance_t
*
p_aout
);
int
aout_MixerNew
(
aout_instance_t
*
p_aout
);
void
aout_MixerDelete
(
aout_instance_t
*
p_aout
);
void
aout_MixerDelete
(
aout_instance_t
*
p_aout
);
void
aout_MixerRun
(
aout_instance_t
*
p_aout
);
void
aout_MixerRun
(
aout_instance_t
*
p_aout
);
int
aout_MixerMultiplierSet
(
aout_instance_t
*
p_aout
,
float
f_multiplier
);
void
aout_MixerMultiplierSet
(
aout_instance_t
*
p_aout
,
float
f_multiplier
);
/* From output.c : */
/* From output.c : */
int
aout_OutputNew
(
aout_instance_t
*
p_aout
,
int
aout_OutputNew
(
aout_instance_t
*
p_aout
,
...
...
src/audio_output/mixer.c
View file @
ac201136
...
@@ -366,25 +366,9 @@ void aout_MixerRun( aout_instance_t * p_aout )
...
@@ -366,25 +366,9 @@ void aout_MixerRun( aout_instance_t * p_aout )
* Please note that we assume that you own the mixer lock when entering this
* Please note that we assume that you own the mixer lock when entering this
* function. This function returns -1 on error.
* function. This function returns -1 on error.
*****************************************************************************/
*****************************************************************************/
int
aout_MixerMultiplierSet
(
aout_instance_t
*
p_aout
,
float
f_multiplier
)
void
aout_MixerMultiplierSet
(
aout_instance_t
*
p_aout
,
float
f_multiplier
)
{
{
float
f_old
=
p_aout
->
mixer_multiplier
;
bool
b_new_mixer
=
false
;
if
(
p_aout
->
p_mixer
)
{
aout_MixerDelete
(
p_aout
);
b_new_mixer
=
true
;
}
p_aout
->
mixer_multiplier
=
f_multiplier
;
p_aout
->
mixer_multiplier
=
f_multiplier
;
if
(
p_aout
->
p_mixer
)
if
(
b_new_mixer
&&
aout_MixerNew
(
p_aout
)
)
p_aout
->
p_mixer
->
multiplier
=
f_multiplier
;
{
p_aout
->
mixer_multiplier
=
f_old
;
aout_MixerNew
(
p_aout
);
return
-
1
;
}
return
0
;
}
}
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