aout_instance_t * p_aout;
/* Allocate descriptor. */
- p_aout = vlc_object_create( p_parent, VLC_OBJECT_AOUT );
+ p_aout = vlc_custom_create( p_parent, sizeof( *p_aout ), VLC_OBJECT_AOUT,
+ "audio output" );
if( p_aout == NULL )
{
return NULL;
/* Initialize members. */
vlc_mutex_init( &p_aout->input_fifos_lock );
vlc_mutex_init( &p_aout->mixer_lock );
+ vlc_mutex_init( &p_aout->volume_vars_lock );
vlc_mutex_init( &p_aout->output_fifo_lock );
p_aout->i_nb_inputs = 0;
p_aout->mixer_multiplier = 1.0;
aout_instance_t * p_aout = (aout_instance_t *)p_this;
vlc_mutex_destroy( &p_aout->input_fifos_lock );
vlc_mutex_destroy( &p_aout->mixer_lock );
+ vlc_mutex_destroy( &p_aout->volume_vars_lock );
vlc_mutex_destroy( &p_aout->output_fifo_lock );
}
/* Lock ordering rules:
*
- * Mixer Input IFIFO OFIFO (< Inner lock)
- * Mixer No! Yes Yes Yes
- * Input No! No! Yes Yes
- * In FIFOs No! No! No! Yes
- * Out FIFOs No! No! No! No!
+ * Vars Mixer Input IFIFO OFIFO (< Inner lock)
+ * Vars No! Yes Yes Yes Yes
+ * Mixer No! No! Yes Yes Yes
+ * Input No! No! No! Yes Yes
+ * In FIFOs No! No! No! No! Yes
+ * Out FIFOs No! No! No! No! No!
* (^ Outer lock)
*/
#ifdef AOUT_DEBUG
unsigned allowed;
switch (i)
{
- case MIXER_LOCK:
+ case VOLUME_VARS_LOCK:
allowed = 0;
break;
+ case MIXER_LOCK:
+ allowed = VOLUME_VARS_LOCK;
+ break;
case INPUT_LOCK:
- allowed = MIXER_LOCK;
+ allowed = VOLUME_VARS_LOCK|MIXER_LOCK;
break;
case INPUT_FIFO_LOCK:
- allowed = MIXER_LOCK|INPUT_LOCK;
+ allowed = VOLUME_VARS_LOCK|MIXER_LOCK|INPUT_LOCK;
break;
case OUTPUT_FIFO_LOCK:
- allowed = MIXER_LOCK|INPUT_LOCK|INPUT_FIFO_LOCK;
+ allowed = VOLUME_VARS_LOCK|MIXER_LOCK|INPUT_LOCK|INPUT_FIFO_LOCK;
break;
+ default:
+ abort ();
}
if (aout_locks & ~allowed)
*****************************************************************************/
void aout_FormatPrepare( audio_sample_format_t * p_format )
{
+ p_format->i_channels = aout_FormatNbChannels( p_format );
p_format->i_bitspersample = aout_BitsPerSample( p_format->i_format );
if( p_format->i_bitspersample > 0 )
{