/*****************************************************************************
* Preamble
*****************************************************************************/
-#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 <stddef.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_aout.h>
/*****************************************************************************
* Local prototypes
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_category( CAT_AUDIO );
- set_subcategory( SUBCAT_AUDIO_MISC );
- set_description( _("Trivial audio mixer") );
- 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_("Trivial audio mixer") )
+ set_capability( "audio mixer", 1 )
+ set_callbacks( Create, NULL )
+vlc_module_end ()
/*****************************************************************************
* Create: allocate trivial mixer
{
aout_instance_t * p_aout = (aout_instance_t *)p_this;
- if ( p_aout->mixer.mixer.i_format != VLC_FOURCC('f','l','3','2')
- && p_aout->mixer.mixer.i_format != VLC_FOURCC('f','i','3','2') )
+ if ( p_aout->mixer.mixer.i_format != VLC_CODEC_FL32
+ && p_aout->mixer.mixer.i_format != VLC_CODEC_FI32 )
{
return -1;
}
int i_nb_channels = aout_FormatNbChannels( &p_aout->mixer.mixer );
int i_nb_bytes = p_buffer->i_nb_samples * sizeof(int32_t)
* i_nb_channels;
- byte_t * p_in;
- byte_t * p_out;
+ uint8_t * p_in;
+ uint8_t * p_out;
- while ( p_input->b_error )
+ while ( p_input->b_error || p_input->b_paused )
{
p_input = p_aout->pp_inputs[++i];
/* This can't crash because if no input has b_error == 0, the
{
aout_buffer_t * p_old_buffer;
- if ( i_available_bytes > 0 )
- p_aout->p_libvlc->pf_memcpy( p_out, p_in, i_available_bytes );
+ vlc_memcpy( p_out, p_in, i_available_bytes );
i_nb_bytes -= i_available_bytes;
p_out += i_available_bytes;
}
else
{
- if ( i_nb_bytes > 0 )
- p_aout->p_libvlc->pf_memcpy( p_out, p_in, i_nb_bytes );
+ vlc_memcpy( p_out, p_in, i_nb_bytes );
p_input->p_first_byte_to_mix = p_in + i_nb_bytes;
break;
}
aout_buffer_t * p_deleted;
p_input = p_aout->pp_inputs[i];
- if ( p_input->b_error ) continue;
+ 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 )