Commit a672233d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

aout interface: remove leading underscores

parent 37a5c2e9
......@@ -312,16 +312,16 @@ VLC_EXPORT( aout_buffer_t *, aout_FifoPop, ( aout_instance_t * p_aout, aout_fifo
/* From intf.c : */
VLC_EXPORT( void, aout_VolumeSoftInit, ( aout_instance_t * ) );
VLC_EXPORT( void, aout_VolumeNoneInit, ( aout_instance_t * ) );
#define aout_VolumeGet(a, b) __aout_VolumeGet(VLC_OBJECT(a), b)
VLC_EXPORT( int, __aout_VolumeGet, ( vlc_object_t *, audio_volume_t * ) );
#define aout_VolumeSet(a, b) __aout_VolumeSet(VLC_OBJECT(a), b)
VLC_EXPORT( int, __aout_VolumeSet, ( vlc_object_t *, audio_volume_t ) );
#define aout_VolumeUp(a, b, c) __aout_VolumeUp(VLC_OBJECT(a), b, c)
VLC_EXPORT( int, __aout_VolumeUp, ( vlc_object_t *, int, audio_volume_t * ) );
#define aout_VolumeDown(a, b, c) __aout_VolumeDown(VLC_OBJECT(a), b, c)
VLC_EXPORT( int, __aout_VolumeDown, ( vlc_object_t *, int, audio_volume_t * ) );
#define aout_ToggleMute(a, b) __aout_ToggleMute(VLC_OBJECT(a), b)
VLC_EXPORT( int, __aout_ToggleMute, ( vlc_object_t *, audio_volume_t * ) );
VLC_EXPORT( int, aout_VolumeGet, ( vlc_object_t *, audio_volume_t * ) );
#define aout_VolumeGet(a, b) aout_VolumeGet(VLC_OBJECT(a), b)
VLC_EXPORT( int, aout_VolumeSet, ( vlc_object_t *, audio_volume_t ) );
#define aout_VolumeSet(a, b) aout_VolumeSet(VLC_OBJECT(a), b)
VLC_EXPORT( int, aout_VolumeUp, ( vlc_object_t *, int, audio_volume_t * ) );
#define aout_VolumeUp(a, b, c) aout_VolumeUp(VLC_OBJECT(a), b, c)
VLC_EXPORT( int, aout_VolumeDown, ( vlc_object_t *, int, audio_volume_t * ) );
#define aout_VolumeDown(a, b, c) aout_VolumeDown(VLC_OBJECT(a), b, c)
VLC_EXPORT( int, aout_ToggleMute, ( vlc_object_t *, audio_volume_t * ) );
#define aout_ToggleMute(a, b) aout_ToggleMute(VLC_OBJECT(a), b)
VLC_EXPORT( int, aout_SetMute, ( vlc_object_t *, audio_volume_t *, bool ) );
VLC_EXPORT( bool, aout_IsMuted, ( vlc_object_t * ) );
VLC_EXPORT( int, aout_FindAndRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );
......
......@@ -187,10 +187,11 @@ int doVolumeChanges( unsigned action, vlc_object_t * p_object, int i_nb_steps,
return i_result;
}
#undef aout_VolumeGet
/*****************************************************************************
* aout_VolumeGet : get the volume of the output device
*****************************************************************************/
int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume )
int aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume )
{
int i_result = 0;
aout_instance_t * p_aout = findAout( p_object );
......@@ -220,45 +221,49 @@ int __aout_VolumeGet( vlc_object_t * p_object, audio_volume_t * pi_volume )
return i_result;
}
#undef aout_VolumeSet
/*****************************************************************************
* aout_VolumeSet : set the volume of the output device
*****************************************************************************/
int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
int aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
{
return doVolumeChanges( SET_VOLUME, p_object, 1, i_volume, NULL, true );
}
#undef aout_VolumeUp
/*****************************************************************************
* aout_VolumeUp : raise the output volume
*****************************************************************************
* If pi_volume != NULL, *pi_volume will contain the volume at the end of the
* function.
*****************************************************************************/
int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
int aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps,
audio_volume_t * pi_volume )
{
return doVolumeChanges( INCREMENT_VOLUME, p_object, i_nb_steps, 0, pi_volume, true );
}
#undef aout_VolumeDown
/*****************************************************************************
* 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,
int aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps,
audio_volume_t * pi_volume )
{
return __aout_VolumeUp( p_object, -i_nb_steps, pi_volume );
return aout_VolumeUp( p_object, -i_nb_steps, pi_volume );
}
#undef aout_ToggleMute
/*****************************************************************************
* aout_ToggleMute : Mute/un-mute the output volume
*****************************************************************************
* If pi_volume != NULL, *pi_volume will contain the volume at the end of the
* function (muted => 0).
*****************************************************************************/
int __aout_ToggleMute( vlc_object_t * p_object, audio_volume_t * pi_volume )
int aout_ToggleMute( vlc_object_t * p_object, audio_volume_t * pi_volume )
{
return doVolumeChanges( TOGGLE_MUTE, p_object, 1, 0, pi_volume, true );
}
......
......@@ -22,15 +22,15 @@ aout_FormatPrepare
aout_FormatPrint
aout_FormatPrintChannels
aout_OutputNextBuffer
__aout_VolumeDown
__aout_VolumeGet
__aout_ToggleMute
aout_VolumeDown
aout_VolumeGet
aout_ToggleMute
aout_IsMuted
aout_SetMute
aout_VolumeNoneInit
__aout_VolumeSet
aout_VolumeSet
aout_VolumeSoftInit
__aout_VolumeUp
aout_VolumeUp
block_Alloc
block_FifoCount
block_FifoEmpty
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment