/*****************************************************************************
* intf.c : audio output API towards the interface modules
*****************************************************************************
- * Copyright (C) 2002-2004 the VideoLAN team
+ * Copyright (C) 2002-2007 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* calloc(), malloc(), free() */
-#include <string.h>
#include <vlc/vlc.h>
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <stdio.h>
+#include <stdlib.h> /* calloc(), malloc(), free() */
+#include <string.h>
+#include <vlc_aout.h>
+#include "aout_internal.h"
/*
* Volume management
*****************************************************************************/
int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume )
{
- int i_volume, i_result = 0;
+ int i_result = 0;
aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
FIND_ANYWHERE );
- i_volume = config_GetInt( p_object, "volume" );
- if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i_volume;
+ if ( pi_volume == NULL ) return -1;
- if ( p_aout == NULL ) return 0;
+ if ( p_aout == NULL )
+ {
+ *pi_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
+ return 0;
+ }
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 );
int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
{
vlc_value_t val;
- aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
+ aout_instance_t *p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT, FIND_ANYWHERE );
int i_result = 0;
config_PutInt( p_object, "volume", i_volume );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_object->p_libvlc, "volume-change", val );
+
if ( p_aout == NULL ) return 0;
vlc_mutex_lock( &p_aout->mixer_lock );
}
vlc_mutex_unlock( &p_aout->mixer_lock );
- vlc_object_release( p_aout );
-
- val.b_bool = VLC_TRUE;
var_Set( p_aout, "intf-change", val );
+ vlc_object_release( p_aout );
return i_result;
}
{
aout_instance_t * p_aout = vlc_object_find( p_object, VLC_OBJECT_AOUT,
FIND_ANYWHERE );
- int i_result = 0, i_volume = 0;
+ int i_result = 0, i_volume = 0, i_volume_step = 0;
+ i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" );
i_volume = config_GetInt( p_object, "volume" );
- i_volume += AOUT_VOLUME_STEP * i_nb_steps;
+ i_volume += i_volume_step * i_nb_steps;
if ( i_volume > AOUT_VOLUME_MAX )
{
i_volume = AOUT_VOLUME_MAX;
}
config_PutInt( p_object, "volume", i_volume );
var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
- var_SetInteger( p_object->p_libvlc, "saved-volume" , (audio_volume_t) i_volume );
+ var_SetInteger( p_object->p_libvlc, "saved-volume" ,
+ (audio_volume_t) i_volume );
if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) 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, (audio_volume_t) i_volume );
+ i_result = p_aout->output.pf_volume_set( p_aout,
+ (audio_volume_t) i_volume );
}
vlc_mutex_unlock( &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;
+ int i_result = 0, i_volume = 0, i_volume_step = 0;
+ i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" );
i_volume = config_GetInt( p_object, "volume" );
- i_volume -= AOUT_VOLUME_STEP * i_nb_steps;
+ i_volume -= i_volume_step * i_nb_steps;
if ( i_volume < AOUT_VOLUME_MIN )
{
i_volume = AOUT_VOLUME_MIN;
/* Placeholder for pf_volume_infos(). */
int aout_VolumeSoftInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
{
+ (void)p_aout;
*pi_soft = 0;
return 0;
}
/* Placeholder for pf_volume_infos(). */
int aout_VolumeNoneInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
{
+ (void)p_aout; (void)pi_soft;
return -1;
}
/* Placeholder for pf_volume_get(). */
int aout_VolumeNoneGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
{
+ (void)p_aout; (void)pi_volume;
return -1;
}
/* Placeholder for pf_volume_set(). */
int aout_VolumeNoneSet( aout_instance_t * p_aout, audio_volume_t i_volume )
{
+ (void)p_aout; (void)i_volume;
return -1;
}
* This function is used whenever the parameters of the output plug-in are
* changed (eg. selecting S/PDIF or PCM).
*****************************************************************************/
-int aout_Restart( aout_instance_t * p_aout )
+static int aout_Restart( aout_instance_t * p_aout )
{
int i;
vlc_bool_t b_error = 0;
* rebuilding the audio-device and audio-channels variables.
*****************************************************************************/
int aout_FindAndRestart( vlc_object_t * p_this, const char *psz_name,
- vlc_value_t oldval, vlc_value_t val, void *p_data )
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
aout_instance_t * p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT,
FIND_ANYWHERE );
+ (void)psz_name; (void)oldval; (void)newval; (void)p_data;
if ( p_aout == NULL ) return VLC_SUCCESS;
if ( var_Type( p_aout, "audio-device" ) != 0 )
* aout_ChannelsRestart : change the audio device or channels and restart
*****************************************************************************/
int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable,
- vlc_value_t old_value, vlc_value_t new_value,
- void * unused )
+ vlc_value_t oldval, vlc_value_t newval,
+ void *p_data )
{
aout_instance_t * p_aout = (aout_instance_t *)p_this;
+ (void)oldval; (void)newval; (void)p_data;
if ( !strcmp( psz_variable, "audio-device" ) )
{
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 );
+}
+
+/**
+ * Change audio visualization
+ * -1 goes backwards, +1 goes forward
+ */
+char *aout_VisualChange( vlc_object_t *p_this, int i_skip )
+{
+ (void)p_this; (void)i_skip;
+ return strdup("foobar");
+}