X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_mixer%2Fspdif.c;h=8dfbdbc4224bc769e81493835c6dd25eb2d2ff87;hb=952f1805c2994ef0e18288013b698fd950ed7191;hp=307056959e55bfe8397afd207447f35cf0e9966b;hpb=eb93d56d8d76be74193a77ee163462c14af92959;p=vlc

diff --git a/modules/audio_mixer/spdif.c b/modules/audio_mixer/spdif.c
index 307056959e..8dfbdbc422 100644
--- a/modules/audio_mixer/spdif.c
+++ b/modules/audio_mixer/spdif.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * spdif.c : dummy mixer for S/PDIF output (1 input only)
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: spdif.c,v 1.3 2002/08/14 00:23:59 massiot Exp $
+ * Copyright (C) 2002 the VideoLAN team
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -18,19 +18,17 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 
 #include <vlc/vlc.h>
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <vlc_aout.h>
 
 /*****************************************************************************
  * Local prototypes
@@ -43,9 +41,10 @@ static void DoWork    ( aout_instance_t *, aout_buffer_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("dummy spdif audio mixer module") );
+    set_category( CAT_AUDIO );
+    set_subcategory( SUBCAT_AUDIO_MISC );
+    set_description( _("Dummy S/PDIF audio mixer") );
     set_capability( "audio mixer", 1 );
-    add_shortcut( "spdif" );
     set_callbacks( Create, NULL );
 vlc_module_end();
 
@@ -56,7 +55,7 @@ static int Create( vlc_object_t *p_this )
 {
     aout_instance_t * p_aout = (aout_instance_t *)p_this;
 
-    if ( !AOUT_FMT_NON_LINEAR(&p_aout->mixer.output) )
+    if ( !AOUT_FMT_NON_LINEAR(&p_aout->mixer.mixer) )
     {
         return -1;
     }
@@ -74,7 +73,32 @@ static int Create( vlc_object_t *p_this )
  *****************************************************************************/
 static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
 {
-    aout_input_t * p_input = p_aout->pp_inputs[0];
+    int i = 0;
+    aout_input_t * p_input = p_aout->pp_inputs[i];
+    while ( p_input->b_error )
+    {
+        p_input = p_aout->pp_inputs[++i];
+    }
     aout_FifoPop( p_aout, &p_input->fifo );
+
+    /* Empty other FIFOs to avoid a memory leak. */
+    for ( i++; i < p_aout->i_nb_inputs; i++ )
+    {
+        aout_fifo_t * p_fifo;
+        aout_buffer_t * p_deleted;
+
+        p_input = p_aout->pp_inputs[i];
+        if ( p_input->b_error ) continue;
+        p_fifo = &p_input->fifo;
+        p_deleted = p_fifo->p_first;  
+        while ( p_deleted != NULL )
+        {
+            aout_buffer_t * p_next = p_deleted->p_next;
+            aout_BufferFree( p_deleted );
+            p_deleted = p_next;
+        }
+        p_fifo->p_first = NULL;
+        p_fifo->pp_last = &p_fifo->p_first;
+    }
 }