/*****************************************************************************
* intf.c : audio output API towards the interface modules
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: intf.c,v 1.2 2002/09/18 21:21:24 massiot Exp $
+ * Copyright (C) 2002-2007 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* 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
*****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+
+#include <stdio.h>
#include <stdlib.h> /* calloc(), malloc(), free() */
#include <string.h>
-#include <vlc/vlc.h>
-
-#include "audio_output.h"
+#include <vlc_aout.h>
#include "aout_internal.h"
/*
* mixer is running, so we need the mixer lock (too).
*
* Here is a schematic of the i_volume range :
- *
- * |------------------+------------------------------------+--------------|
- * 0 pi_low_soft pi_high_soft 1024
*
- * Between pi_low_soft and pi_high_soft, the volume is done in hardware
- * by the output module. Outside, the output module will change
- * p_aout->mixer.i_multiplier (done in software). This scaling may result
- * in cropping errors and should be avoided as much as possible.
+ * |------------------------------+---------------------------------------|
+ * 0 pi_soft 1024
*
- * It is legal to have *pi_low_soft == *pi_high_soft, and do everything in
- * software. In that case, it is recommended to use *pi_low_soft == 256,
- * along with the utility functions provided in this file.
+ * Between 0 and pi_soft, the volume is done in hardware by the output
+ * module. Above, the output module will change p_aout->mixer.i_multiplier
+ * (done in software). This scaling may result * in cropping errors and
+ * should be avoided as much as possible.
*
- * It is also legal to have *pi_low_soft == 0 and *pi_high_soft == 1024, and
- * completely avoid software scaling. However, some streams (esp. A/52)
- * are encoded with a very low volume and users may complain.
+ * It is legal to have *pi_soft == 0, and do everything in software.
+ * It is also legal to have *pi_soft == 1024, and completely avoid
+ * software scaling. However, some streams (esp. A/52) are encoded with
+ * a very low volume and users may complain.
*/
/*****************************************************************************
* 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->i_nb_inputs == 0 )
+ 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->i_nb_inputs == 0 )
- {
- /* 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 = 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 boundaries pi_low_soft and pi_high_soft
+ * aout_VolumeInfos : get the boundary pi_soft
*****************************************************************************/
-int aout_VolumeInfos( aout_instance_t * p_aout, audio_volume_t * pi_low_soft,
- audio_volume_t * pi_high_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;
- if ( p_aout->i_nb_inputs == 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 );
+ }
+ vlc_mutex_unlock( &p_aout->mixer_lock );
- i_result = p_aout->output.pf_volume_infos( p_aout, pi_low_soft,
- pi_high_soft );
-
- vlc_mutex_lock( &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_value_t val;
+ 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;
+
+ 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 )
+ {
+ 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 );
+ if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
- vlc_mutex_lock( &p_aout->mixer_lock );
+ val.b_bool = true;
+ var_Set( p_object->p_libvlc, "volume-change", val );
- if ( p_aout->i_nb_inputs == 0 )
+ 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, "VolumeUp called without output module" );
- return -1;
+ i_result = p_aout->output.pf_volume_set( p_aout,
+ (audio_volume_t) i_volume );
}
+ vlc_mutex_unlock( &p_aout->mixer_lock );
- if ( p_aout->output.pf_volume_get( p_aout, &i_volume ) )
+ vlc_object_release( p_aout );
+ return i_result;
+}
+
+/*****************************************************************************
+ * aout_VolumeDown : lower the output volume
+ *****************************************************************************
+ * If pi_volume != NULL, *pi_volume will contain the volume at the end of the
+ * function.
+ *****************************************************************************/
+int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
+ audio_volume_t * pi_volume )
+{
+ vlc_value_t val;
+ 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;
+
+ 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 )
{
- vlc_mutex_unlock( &p_aout->mixer_lock );
- return -1;
+ i_volume = AOUT_VOLUME_MIN;
}
+ 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 );
+ if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
- i_volume += AOUT_VOLUME_STEP * i_nb_steps;
- if ( i_volume > 1024 ) i_volume = 1024;
+ val.b_bool = 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, (audio_volume_t) 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;
}
/*****************************************************************************
- * aout_VolumeDown : lower the output volume
+ * aout_VolumeMute : Mute/un-mute the output volume
*****************************************************************************
* If pi_volume != NULL, *pi_volume will contain the volume at the end of the
- * function.
+ * function (muted => 0).
*****************************************************************************/
-int aout_VolumeDown( aout_instance_t * p_aout, int i_nb_steps,
- 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->i_nb_inputs == 0 )
+ i_volume = (audio_volume_t)config_GetInt( p_object, "volume" );
+ if ( i_volume != 0 )
{
- /* The output module is destroyed. */
- vlc_mutex_unlock( &p_aout->mixer_lock );
- msg_Err( p_aout, "VolumeUp called without output module" );
- return -1;
+ /* Mute */
+ i_result = aout_VolumeSet( p_object, AOUT_VOLUME_MIN );
+ var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
+ var_SetInteger( p_object->p_libvlc, "saved-volume", (int)i_volume );
+ if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN;
}
-
- if ( p_aout->output.pf_volume_get( p_aout, &i_volume ) )
+ else
{
- vlc_mutex_unlock( &p_aout->mixer_lock );
- return -1;
+ /* Un-mute */
+ var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
+ i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc,
+ "saved-volume" );
+ i_result = aout_VolumeSet( p_object, i_volume );
+ if ( pi_volume != NULL ) *pi_volume = 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_lock( &p_aout->mixer_lock );
-
- if ( pi_volume != NULL ) *pi_volume = i_volume;
return i_result;
}
{
int i_volume;
+ p_aout->output.pf_volume_infos = aout_VolumeSoftInfos;
+ p_aout->output.pf_volume_get = aout_VolumeSoftGet;
+ p_aout->output.pf_volume_set = aout_VolumeSoftSet;
+
i_volume = config_GetInt( p_aout, "volume" );
- if ( i_volume == -1 )
+ if ( i_volume < AOUT_VOLUME_MIN )
{
- p_aout->output.i_volume = AOUT_VOLUME_DEFAULT;
+ i_volume = AOUT_VOLUME_DEFAULT;
}
- else
+ else if ( i_volume > AOUT_VOLUME_MAX )
{
- p_aout->output.i_volume = i_volume;
+ i_volume = AOUT_VOLUME_MAX;
}
- p_aout->output.pf_volume_infos = aout_VolumeSoftInfos;
- p_aout->output.pf_volume_get = aout_VolumeSoftGet;
- p_aout->output.pf_volume_set = aout_VolumeSoftSet;
+ aout_VolumeSoftSet( p_aout, (audio_volume_t)i_volume );
}
/* Placeholder for pf_volume_infos(). */
-int aout_VolumeSoftInfos( aout_instance_t * p_aout,
- audio_volume_t * pi_low_soft,
- audio_volume_t * pi_high_soft )
+int aout_VolumeSoftInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
{
- *pi_low_soft = *pi_high_soft = AOUT_VOLUME_DEFAULT;
+ (void)p_aout;
+ *pi_soft = 0;
return 0;
}
/* Placeholder for pf_volume_get(). */
-int aout_VolumeSoftGet( aout_instance_t * p_aout,
- audio_volume_t * pi_volume )
+int aout_VolumeSoftGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
{
*pi_volume = p_aout->output.i_volume;
return 0;
/* Placeholder for pf_volume_set(). */
-int aout_VolumeSoftSet( aout_instance_t * p_aout,
- audio_volume_t i_volume )
+int aout_VolumeSoftSet( aout_instance_t * p_aout, audio_volume_t i_volume )
{
- aout_MixerMultiplierSet( p_aout, (float)(i_volume / AOUT_VOLUME_DEFAULT) );
+ aout_MixerMultiplierSet( p_aout, (float)i_volume / AOUT_VOLUME_DEFAULT );
+ p_aout->output.i_volume = i_volume;
return 0;
}
}
/* Placeholder for pf_volume_infos(). */
-int aout_VolumeNoneInfos( aout_instance_t * p_aout,
- audio_volume_t * pi_low_soft,
- audio_volume_t * pi_high_soft )
+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;
}
+
+/*
+ * Pipelines management
+ */
+
+/*****************************************************************************
+ * aout_Restart : re-open the output device and rebuild the input and output
+ * pipelines
+ *****************************************************************************
+ * This function is used whenever the parameters of the output plug-in are
+ * changed (eg. selecting S/PDIF or PCM).
+ *****************************************************************************/
+static int aout_Restart( aout_instance_t * p_aout )
+{
+ int i;
+ bool b_error = 0;
+
+ vlc_mutex_lock( &p_aout->mixer_lock );
+
+ if ( p_aout->i_nb_inputs == 0 )
+ {
+ vlc_mutex_unlock( &p_aout->mixer_lock );
+ msg_Err( p_aout, "no decoder thread" );
+ return -1;
+ }
+
+ /* Lock all inputs. */
+ for ( i = 0; i < p_aout->i_nb_inputs; i++ )
+ {
+ vlc_mutex_lock( &p_aout->pp_inputs[i]->lock );
+ aout_InputDelete( p_aout, p_aout->pp_inputs[i] );
+ }
+
+ aout_MixerDelete( p_aout );
+
+ /* Re-open the output plug-in. */
+ aout_OutputDelete( p_aout );
+
+ if ( aout_OutputNew( p_aout, &p_aout->pp_inputs[0]->input ) == -1 )
+ {
+ /* Release all locks and report the error. */
+ for ( i = 0; i < p_aout->i_nb_inputs; i++ )
+ {
+ vlc_mutex_unlock( &p_aout->pp_inputs[i]->lock );
+ }
+ vlc_mutex_unlock( &p_aout->mixer_lock );
+ return -1;
+ }
+
+ if ( aout_MixerNew( p_aout ) == -1 )
+ {
+ aout_OutputDelete( p_aout );
+ for ( i = 0; i < p_aout->i_nb_inputs; i++ )
+ {
+ vlc_mutex_unlock( &p_aout->pp_inputs[i]->lock );
+ }
+ vlc_mutex_unlock( &p_aout->mixer_lock );
+ return -1;
+ }
+
+ /* Re-open all inputs. */
+ for ( i = 0; i < p_aout->i_nb_inputs; i++ )
+ {
+ 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 );
+ }
+
+ vlc_mutex_unlock( &p_aout->mixer_lock );
+
+ return b_error;
+}
+
+/*****************************************************************************
+ * aout_FindAndRestart : find the audio output instance and restart
+ *****************************************************************************
+ * This is used for callbacks of the configuration variables, and we believe
+ * that when those are changed, it is a significant change which implies
+ * 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 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 )
+ {
+ var_Destroy( p_aout, "audio-device" );
+ }
+ if ( var_Type( p_aout, "audio-channels" ) != 0 )
+ {
+ var_Destroy( p_aout, "audio-channels" );
+ }
+
+ aout_Restart( p_aout );
+ vlc_object_release( p_aout );
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * 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 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" ) )
+ {
+ /* This is supposed to be a significant change and supposes
+ * rebuilding the channel choices. */
+ if ( var_Type( p_aout, "audio-channels" ) >= 0 )
+ {
+ var_Destroy( p_aout, "audio-channels" );
+ }
+ }
+ 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,
+ bool 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_GetNonEmptyString( 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 = 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;
+ msg_Err( p_this, "FIXME: %s (%s %d) isn't implemented.", __func__,
+ __FILE__, __LINE__ );
+ return strdup("foobar");
+}
projects / vlc / blobdiff