mixer: simplify based on single input per output

b6717257 · Rémi Denis-Courmont · d8ab9fd6 · b6717257 · b6717257
Commit b6717257 authored May 31, 2011 by Rémi Denis-Courmont
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 100 additions and 181 deletions

src/audio_output/intf.c src/audio_output/intf.c +2 -0

src/audio_output/mixer.c src/audio_output/mixer.c +98 -181

No files found.
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -318,6 +318,8 @@ static int aout_Restart( aout_instance_t * p_aout )
    /* Re-open the output plug-in. */
    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 )
    {
        /* Release all locks and report the error. */

--- a/src/audio_output/mixer.c
+++ b/src/audio_output/mixer.c