[vlc-devel] commit: Removed unused aout_VolumeInfos. (Laurent Aimar )
git version control
git at videolan.org
Thu Aug 13 21:42:40 CEST 2009
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Aug 13 18:26:19 2009 +0200| [09d375d4451c139097d95e152e3da09352ae381e] | committer: Laurent Aimar
Removed unused aout_VolumeInfos.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=09d375d4451c139097d95e152e3da09352ae381e
---
include/vlc_aout.h | 3 --
modules/audio_output/waveout.c | 8 -------
src/audio_output/intf.c | 44 ----------------------------------------
src/libvlccore.sym | 1 -
4 files changed, 0 insertions(+), 56 deletions(-)
diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index d9c3124..ae957e5 100644
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -326,7 +326,6 @@ typedef struct aout_output_t
void (* pf_play)( aout_instance_t * );
int (* pf_volume_get )( aout_instance_t *, audio_volume_t * );
int (* pf_volume_set )( aout_instance_t *, audio_volume_t );
- int (* pf_volume_infos )( aout_instance_t *, audio_volume_t * );
int i_nb_samples;
/* Current volume for the output - it's just a placeholder, the plug-in
@@ -445,8 +444,6 @@ VLC_EXPORT( void, aout_VolumeNoneInit, ( aout_instance_t * ) );
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_VolumeInfos(a, b) __aout_VolumeInfos(VLC_OBJECT(a), b)
-VLC_EXPORT( int, __aout_VolumeInfos, ( 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)
diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 27f2561..e95689c 100644
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -132,7 +132,6 @@ static int PlayWaveOut ( aout_instance_t *, HWAVEOUT, WAVEHDR *,
static void CALLBACK WaveOutCallback ( HWAVEOUT, UINT, DWORD, DWORD, DWORD );
static void* WaveOutThread( vlc_object_t * );
-static int VolumeInfos( aout_instance_t *, audio_volume_t * );
static int VolumeGet( aout_instance_t *, audio_volume_t * );
static int VolumeSet( aout_instance_t *, audio_volume_t );
@@ -392,7 +391,6 @@ static int Open( vlc_object_t *p_this )
if( waveOutGetVolume( p_aout->output.p_sys->h_waveout, &i_dummy )
== MMSYSERR_NOERROR )
{
- p_aout->output.pf_volume_infos = VolumeInfos;
p_aout->output.pf_volume_get = VolumeGet;
p_aout->output.pf_volume_set = VolumeSet;
}
@@ -1110,12 +1108,6 @@ static void* WaveOutThread( vlc_object_t *p_this )
return NULL;
}
-static int VolumeInfos( aout_instance_t * p_aout, audio_volume_t * pi_soft )
-{
- *pi_soft = AOUT_VOLUME_MAX / 2;
- return 0;
-}
-
static int VolumeGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
{
DWORD i_waveout_vol;
diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index ed0c78b..95e20b8 100644
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -123,33 +123,6 @@ int __aout_VolumeSet( vlc_object_t * p_object, audio_volume_t i_volume )
}
/*****************************************************************************
- * aout_VolumeInfos : get the boundary 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;
-
- if ( p_aout == NULL ) return 0;
-
- aout_lock_mixer( p_aout );
- if ( p_aout->mixer.b_error )
- {
- /* The output module is destroyed. */
- i_result = -1;
- }
- else
- {
- i_result = p_aout->output.pf_volume_infos( p_aout, pi_soft );
- }
- aout_unlock_mixer( p_aout );
-
- vlc_object_release( p_aout );
- return i_result;
-}
-
-/*****************************************************************************
* aout_VolumeUp : raise the output volume
*****************************************************************************
* If pi_volume != NULL, *pi_volume will contain the volume at the end of the
@@ -228,7 +201,6 @@ void aout_VolumeSoftInit( aout_instance_t * p_aout )
{
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;
@@ -245,14 +217,6 @@ void aout_VolumeSoftInit( aout_instance_t * p_aout )
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_soft )
-{
- (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 )
{
@@ -277,18 +241,10 @@ int aout_VolumeSoftSet( aout_instance_t * p_aout, audio_volume_t i_volume )
/* Meant to be called by the output plug-in's Open(). */
void aout_VolumeNoneInit( aout_instance_t * p_aout )
{
- p_aout->output.pf_volume_infos = aout_VolumeNoneInfos;
p_aout->output.pf_volume_get = aout_VolumeNoneGet;
p_aout->output.pf_volume_set = aout_VolumeNoneSet;
}
-/* 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 )
{
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index d629a9d..47e21c7 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -28,7 +28,6 @@ aout_FormatPrintChannels
aout_OutputNextBuffer
__aout_VolumeDown
__aout_VolumeGet
-__aout_VolumeInfos
__aout_ToggleMute
aout_VolumeNoneInit
__aout_VolumeSet
More information about the vlc-devel
mailing list