Skip to content

V
vlc-2-2
Commit b6717257 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

mixer: simplify based on single input per output

parent d8ab9fd6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 181 deletions
src/audio_output/intf.c
View file @ b6717257
...@@ -318,6 +318,8 @@ static int aout_Restart( aout_instance_t * p_aout ) ...@@ -318,6 +318,8 @@ static int aout_Restart( aout_instance_t * p_aout )
/* Re-open the output plug-in. */ /* Re-open the output plug-in. */
aout_OutputDelete( p_aout ); aout_OutputDelete( p_aout );
/* FIXME: This function is notoriously dangerous/unsafe.
* By the way, if OutputNew or MixerNew fails, we are totally screwed. */
if ( aout_OutputNew( p_aout, &p_aout->pp_inputs[0]->input ) == -1 ) if ( aout_OutputNew( p_aout, &p_aout->pp_inputs[0]->input ) == -1 )
{ {
/* Release all locks and report the error. */ /* Release all locks and report the error. */
......
src/audio_output/mixer.c
View file @ b6717257
This diff is collapsed.
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