int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input );
int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
aout_buffer_t * p_buffer, int i_input_rate );
+void aout_InputCheckAndRestart( aout_instance_t * p_aout, aout_input_t * p_input );
/* From filters.c : */
int aout_FiltersCreatePipeline ( aout_instance_t * p_aout, filter_t ** pp_filters, int * pi_nb_filters, const audio_sample_format_t * p_input_format, const audio_sample_format_t * p_output_format );
int aout_VolumeNoneGet( aout_instance_t *, audio_volume_t * );
int aout_VolumeNoneSet( aout_instance_t *, audio_volume_t );
int aout_VolumeNoneInfos( aout_instance_t *, audio_volume_t * );
+int doVolumeChanges( unsigned action, vlc_object_t * p_object, int i_nb_steps,
+ audio_volume_t i_volume, audio_volume_t * i_return_volume,
+ bool b_mute );
/* From dec.c */
#define aout_DecNew(a, b, c, d, e) __aout_DecNew(VLC_OBJECT(a), b, c, d, e)
void aout_DecChangePause( aout_instance_t *, aout_input_t *, bool b_paused, mtime_t i_date );
void aout_DecFlush( aout_instance_t *, aout_input_t * );
-/* Helpers */
+/* Audio output locking */
+
+#if !defined (NDEBUG) \
+ && defined __linux__ && (defined (__i386__) || defined (__x86_64__))
+# define AOUT_DEBUG 1
+#endif
+
+#ifdef AOUT_DEBUG
+enum
+{
+ MIXER_LOCK=1,
+ INPUT_LOCK=2,
+ INPUT_FIFO_LOCK=4,
+ OUTPUT_FIFO_LOCK=8,
+ VOLUME_VARS_LOCK=16
+};
+
+void aout_lock (unsigned);
+void aout_unlock (unsigned);
+
+#else
+# define aout_lock( i ) (void)0
+# define aout_unlock( i ) (void)0
+#endif
static inline void aout_lock_mixer( aout_instance_t *p_aout )
{
+ aout_lock( MIXER_LOCK );
vlc_mutex_lock( &p_aout->mixer_lock );
}
static inline void aout_unlock_mixer( aout_instance_t *p_aout )
{
+ aout_unlock( MIXER_LOCK );
vlc_mutex_unlock( &p_aout->mixer_lock );
}
static inline void aout_lock_input_fifos( aout_instance_t *p_aout )
{
+ aout_lock( INPUT_FIFO_LOCK );
vlc_mutex_lock( &p_aout->input_fifos_lock );
}
static inline void aout_unlock_input_fifos( aout_instance_t *p_aout )
{
+ aout_unlock( INPUT_FIFO_LOCK );
vlc_mutex_unlock( &p_aout->input_fifos_lock );
}
static inline void aout_lock_output_fifo( aout_instance_t *p_aout )
{
+ aout_lock( OUTPUT_FIFO_LOCK );
vlc_mutex_lock( &p_aout->output_fifo_lock );
}
static inline void aout_unlock_output_fifo( aout_instance_t *p_aout )
{
+ aout_unlock( OUTPUT_FIFO_LOCK );
vlc_mutex_unlock( &p_aout->output_fifo_lock );
}
static inline void aout_lock_input( aout_instance_t *p_aout, aout_input_t * p_input )
{
(void)p_aout;
+ aout_lock( INPUT_LOCK );
vlc_mutex_lock( &p_input->lock );
}
static inline void aout_unlock_input( aout_instance_t *p_aout, aout_input_t * p_input )
{
(void)p_aout;
+ aout_unlock( INPUT_LOCK );
vlc_mutex_unlock( &p_input->lock );
}
+static inline void aout_lock_volume( aout_instance_t *p_aout )
+{
+ aout_lock( VOLUME_VARS_LOCK );
+ vlc_mutex_lock( &p_aout->volume_vars_lock );
+}
+
+static inline void aout_unlock_volume( aout_instance_t *p_aout )
+{
+ aout_unlock( VOLUME_VARS_LOCK );
+ vlc_mutex_unlock( &p_aout->volume_vars_lock );
+}
+
+/* Helpers */
/**
* This function will safely mark aout input to be restarted as soon as
if( p_aout )
psz_val = var_GetString( p_aout, psz_variable );
else
- psz_val = config_GetPsz( p_obj, "audio-filter" );
+ {
+ psz_val = var_CreateGetString( p_obj->p_libvlc, "audio-filter" );
+ var_Destroy( p_obj->p_libvlc, "audio-filter" );
+ }
if( !psz_val )
psz_val = strdup( "" );