/*****************************************************************************
* spdif.c : dummy mixer for S/PDIF output (1 input only)
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: spdif.c,v 1.5 2002/08/21 22:41:59 massiot Exp $
+ * Copyright (C) 2002 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* 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"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_aout.h>
/*****************************************************************************
* Local prototypes
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( _("dummy spdif audio mixer module") );
- set_capability( "audio mixer", 1 );
- set_callbacks( Create, NULL );
-vlc_module_end();
+vlc_module_begin ()
+ set_category( CAT_AUDIO )
+ set_subcategory( SUBCAT_AUDIO_MISC )
+ set_description( N_("Dummy S/PDIF audio mixer") )
+ set_capability( "audio mixer", 1 )
+ set_callbacks( Create, NULL )
+vlc_module_end ()
/*****************************************************************************
* Create: allocate spdif mixer
*****************************************************************************/
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->b_paused )
+ {
+ 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 || p_input->b_paused )
+ 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;
+ }
}