/*****************************************************************************
* intf.c : audio output API towards the interface modules
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: intf.c,v 1.11 2002/12/10 18:22:01 gbazin Exp $
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
*
* 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.
*****************************************************************************/
/*****************************************************************************
/*****************************************************************************
* aout_VolumeGet : get the volume of the output device
*****************************************************************************/
-int aout_VolumeGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
+int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume )
{
- int i_result;
+ int i_result = 0;
+ aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
+ FIND_ANYWHERE );
- vlc_mutex_lock( &p_aout->mixer_lock );
+ if ( pi_volume == NULL ) return -1;
- if ( p_aout->mixer.b_error )
+ if ( p_aout == NULL )
{
- /* The output module is destroyed. */
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Err( p_aout, "VolumeGet called without output module" );
- return -1;
+ *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
+ return 0;
}
- i_result = p_aout->output.pf_volume_get( p_aout, pi_volume );
-
+ vlc_mutex_lock( &p_aout->mixer_lock );
+ if ( !p_aout->mixer.b_error )
+ {
+ i_result = p_aout->output.pf_volume_get( p_aout, pi_volume );
+ }
+ else
+ {
+ *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
+ }
vlc_mutex_unlock( &p_aout->mixer_lock );
+
+ vlc_object_release( p_aout );
return i_result;
}
/*****************************************************************************
* aout_VolumeSet : set the volume of the output device
*****************************************************************************/
-int aout_VolumeSet( aout_instance_t * p_aout, audio_volume_t i_volume )
+int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
{
- int i_result;
+ vlc_value_t val;
+ aout_instance_t *p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ int i_result = 0;
- vlc_mutex_lock( &p_aout->mixer_lock );
+ config_PutInt( p_object, "volume", i_volume );
- if ( p_aout->mixer.b_error )
- {
- /* The output module is destroyed. */
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Err( p_aout, "VolumeSet called without output module" );
- return -1;
- }
+ val.b_bool = VLC_TRUE;
+ var_Set( p_object->p_libvlc, "volume-change", val );
- i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
+ if ( p_aout == NULL ) return 0;
+ vlc_mutex_lock( &p_aout->mixer_lock );
+ if ( !p_aout->mixer.b_error )
+ {
+ i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
+ }
vlc_mutex_unlock( &p_aout->mixer_lock );
+
+ var_Set( p_aout, "intf-change", val );
+ vlc_object_release( p_aout );
return i_result;
}
/*****************************************************************************
* aout_VolumeInfos : get the boundary pi_soft
*****************************************************************************/
-int aout_VolumeInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
+int __aout_VolumeInfos( vlc_object_t * p_object, audio_volume_t * pi_soft )
{
+ aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
+ FIND_ANYWHERE );
int i_result;
- vlc_mutex_lock( &p_aout->mixer_lock );
+ if ( p_aout == NULL ) return 0;
+ vlc_mutex_lock( &p_aout->mixer_lock );
if ( p_aout->mixer.b_error )
{
/* The output module is destroyed. */
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Err( p_aout, "VolumeInfos called without output module" );
- return -1;
+ i_result = -1;
+ }
+ else
+ {
+ i_result = p_aout->output.pf_volume_infos( p_aout, pi_soft );
}
-
- i_result = p_aout->output.pf_volume_infos( p_aout, pi_soft );
-
vlc_mutex_unlock( &p_aout->mixer_lock );
+
+ vlc_object_release( p_aout );
return i_result;
}
* If pi_volume != NULL, *pi_volume will contain the volume at the end of the
* function.
*****************************************************************************/
-int aout_VolumeUp( aout_instance_t * p_aout, int i_nb_steps,
+int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
audio_volume_t * pi_volume )
{
- int i_result;
- audio_volume_t i_volume;
-
- vlc_mutex_lock( &p_aout->mixer_lock );
+ aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
+ FIND_ANYWHERE );
+ int i_result = 0, i_volume = 0, i_volume_step = 0;
- if ( p_aout->mixer.b_error )
+ i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" );
+ i_volume = config_GetInt( p_object, "volume" );
+ i_volume += i_volume_step * i_nb_steps;
+ if ( i_volume > AOUT_VOLUME_MAX )
{
- /* The output module is destroyed. */
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Err( p_aout, "VolumeUp called without output module" );
- return -1;
+ i_volume = AOUT_VOLUME_MAX;
}
+ config_PutInt( p_object, "volume", i_volume );
+ var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+ var_SetInteger( p_object->p_libvlc_global, "saved-volume" ,
+ (audio_volume_t) i_volume );
+ if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
- if ( p_aout->output.pf_volume_get( p_aout, &i_volume ) )
+ if ( p_aout == NULL ) return 0;
+
+ vlc_mutex_lock( &p_aout->mixer_lock );
+ if ( !p_aout->mixer.b_error )
{
- vlc_mutex_unlock( &p_aout->mixer_lock );
- return -1;
+ i_result = p_aout->output.pf_volume_set( p_aout,
+ (audio_volume_t) i_volume );
}
-
- i_volume += AOUT_VOLUME_STEP * i_nb_steps;
- if ( i_volume > 1024 ) i_volume = 1024;
-
- i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
-
vlc_mutex_unlock( &p_aout->mixer_lock );
- if ( pi_volume != NULL ) *pi_volume = i_volume;
+ vlc_object_release( p_aout );
return i_result;
}
* If pi_volume != NULL, *pi_volume will contain the volume at the end of the
* function.
*****************************************************************************/
-int aout_VolumeDown( aout_instance_t * p_aout, int i_nb_steps,
+int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
audio_volume_t * pi_volume )
{
- int i_result;
- audio_volume_t i_volume;
-
- vlc_mutex_lock( &p_aout->mixer_lock );
+ aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
+ FIND_ANYWHERE );
+ int i_result = 0, i_volume = 0, i_volume_step = 0;
- if ( p_aout->mixer.b_error )
+ i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" );
+ i_volume = config_GetInt( p_object, "volume" );
+ i_volume -= i_volume_step * i_nb_steps;
+ if ( i_volume < AOUT_VOLUME_MIN )
{
- /* The output module is destroyed. */
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Err( p_aout, "VolumeUp called without output module" );
- return -1;
+ i_volume = AOUT_VOLUME_MIN;
}
+ config_PutInt( p_object, "volume", i_volume );
+ var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+ var_SetInteger( p_object->p_libvlc_global, "saved-volume", (audio_volume_t) i_volume );
+ if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
- if ( p_aout->output.pf_volume_get( p_aout, &i_volume ) )
+ if ( p_aout == NULL ) return 0;
+
+ vlc_mutex_lock( &p_aout->mixer_lock );
+ if ( !p_aout->mixer.b_error )
{
- vlc_mutex_unlock( &p_aout->mixer_lock );
- return -1;
+ i_result = p_aout->output.pf_volume_set( p_aout, (audio_volume_t) i_volume );
}
-
- if ( i_volume < AOUT_VOLUME_STEP * i_nb_steps )
- i_volume = 0;
- else
- i_volume -= AOUT_VOLUME_STEP * i_nb_steps;
-
- i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
-
vlc_mutex_unlock( &p_aout->mixer_lock );
- if ( pi_volume != NULL ) *pi_volume = i_volume;
+ vlc_object_release( p_aout );
return i_result;
}
* If pi_volume != NULL, *pi_volume will contain the volume at the end of the
* function (muted => 0).
*****************************************************************************/
-int aout_VolumeMute( aout_instance_t * p_aout, audio_volume_t * pi_volume )
+int __aout_VolumeMute( vlc_object_t * p_object, audio_volume_t * pi_volume )
{
int i_result;
audio_volume_t i_volume;
- vlc_mutex_lock( &p_aout->mixer_lock );
-
- if ( p_aout->mixer.b_error )
- {
- /* The output module is destroyed. */
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Err( p_aout, "VolumeUp called without output module" );
- return -1;
- }
-
- if ( p_aout->output.pf_volume_get( p_aout, &i_volume ) )
- {
- vlc_mutex_unlock( &p_aout->mixer_lock );
- return -1;
- }
-
- if ( i_volume == 0 )
+ i_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
+ if ( i_volume != 0 )
{
- i_volume = p_aout->output.i_saved_volume;
+ /* Mute */
+ i_result = aout_VolumeSet( p_object, AOUT_VOLUME_MIN );
+ var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+ var_SetInteger( p_object->p_libvlc_global, "saved-volume", (int)i_volume );
+ if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN;
}
else
{
- p_aout->output.i_saved_volume = i_volume;
- i_volume = 0;
+ /* Un-mute */
+ var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+ i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc_global,
+ "saved-volume" );
+ i_result = aout_VolumeSet( p_object, i_volume );
+ if ( pi_volume != NULL ) *pi_volume = i_volume;
}
- i_result = p_aout->output.pf_volume_set( p_aout, i_volume );
-
- vlc_mutex_unlock( &p_aout->mixer_lock );
-
- if ( pi_volume != NULL ) *pi_volume = i_volume;
return i_result;
}
p_aout->output.pf_volume_set = aout_VolumeSoftSet;
i_volume = config_GetInt( p_aout, "volume" );
- if ( i_volume < 0 )
+ if ( i_volume < AOUT_VOLUME_MIN )
{
i_volume = AOUT_VOLUME_DEFAULT;
}
aout_input_t * p_input = p_aout->pp_inputs[i];
b_error |= aout_InputNew( p_aout, p_input );
+ p_input->b_changed = 1;
vlc_mutex_unlock( &p_input->lock );
}
* that when those are changed, it is a significant change which implies
* rebuilding the audio-device and audio-channels variables.
*****************************************************************************/
-void aout_FindAndRestart( vlc_object_t * p_this )
+int aout_FindAndRestart( vlc_object_t * p_this, const char *psz_name,
+ vlc_value_t oldval, vlc_value_t val, void *p_data )
{
aout_instance_t * p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT,
FIND_ANYWHERE );
- if ( p_aout == NULL ) return;
+ if ( p_aout == NULL ) return VLC_SUCCESS;
if ( var_Type( p_aout, "audio-device" ) != 0 )
{
aout_Restart( p_aout );
vlc_object_release( p_aout );
+
+ return VLC_SUCCESS;
}
/*****************************************************************************
aout_Restart( p_aout );
return 0;
}
+
+/** Enable or disable an audio filter
+ * \param p_this a vlc object
+ * \param psz_name name of the filter
+ * \param b_add are we adding or removing the filter ?
+ */
+void aout_EnableFilter( vlc_object_t *p_this, const char *psz_name,
+ vlc_bool_t b_add )
+{
+ char *psz_parser, *psz_string;
+ aout_instance_t * p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT,
+ FIND_ANYWHERE );
+
+ if( p_aout )
+ psz_string = var_GetString( p_aout, "audio-filter" );
+ else
+ psz_string = config_GetPsz( p_this, "audio-filter" );
+
+ if( !psz_string ) psz_string = strdup("");
+
+ psz_parser = strstr( psz_string, psz_name );
+
+ if( b_add )
+ {
+ if( !psz_parser )
+ {
+ psz_parser = psz_string;
+ asprintf( &psz_string, (*psz_string) ? "%s:%s" : "%s%s",
+ psz_string, psz_name );
+ free( psz_parser );
+ }
+ else
+ {
+ vlc_object_release( p_aout );
+ return;
+ }
+ }
+ else
+ {
+ if( psz_parser )
+ {
+ memmove( psz_parser, psz_parser + strlen(psz_name) +
+ (*(psz_parser + strlen(psz_name)) == ':' ? 1 : 0 ),
+ strlen(psz_parser + strlen(psz_name)) + 1 );
+
+ if( *(psz_string+strlen(psz_string ) -1 ) == ':' )
+ {
+ *(psz_string+strlen(psz_string ) -1 ) = '\0';
+ }
+ }
+ else
+ {
+ free( psz_string );
+ return;
+ }
+ }
+
+ if( p_aout == NULL )
+ config_PutPsz( p_this, "audio-filter", psz_string );
+ else
+ {
+ var_SetString( p_aout, "audio-filter", psz_string );
+ for( int i = 0; i < p_aout->i_nb_inputs; i++ )
+ p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
+ vlc_object_release( p_aout );
+ }
+ free( psz_string );
+}
projects / vlc / blobdiff