Remove never used aout_output_t.pf_volume_get

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index f78970cbb52cdfb7c3f385790cc22cc044597706..20bc45586ce5ed2c51b27a8661d340e45c7ff097 100644 (file)
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -198,7 +198,6 @@ typedef struct aout_output_t
     struct module_t *       p_module;
     struct aout_sys_t *     p_sys;
     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                     i_nb_samples;
 

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index f5276dce4d5add6ef3ba9d8288e051b3bdbc2ccd..809f0f626b6d838fba3766b3c2c5462c077e5a86 100644 (file)
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -258,15 +258,6 @@ static void Play(aout_instance_t *aout)
     pa_threaded_mainloop_unlock(sys->mainloop);
 }
 
-static int VolumeGet(aout_instance_t *aout, audio_volume_t *volp)
-{
-    aout_sys_t *sys = aout->output.p_sys;
-    pa_volume_t volume = pa_cvolume_max(&sys->cvolume);
-
-    *volp = pa_sw_volume_to_linear(volume) * AOUT_VOLUME_DEFAULT;
-    return 0;
-}
-
 static int VolumeSet(aout_instance_t *aout, audio_volume_t vol)
 {
     aout_sys_t *sys = aout->output.p_sys;
@@ -492,7 +483,6 @@ static int Open(vlc_object_t *obj)
     pa_threaded_mainloop_unlock(mainloop);
 
     aout->output.pf_play = Play;
-    aout->output.pf_volume_get = VolumeGet;
     aout->output.pf_volume_set = VolumeSet;
     return VLC_SUCCESS;
 

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 402e580eb5e97cc6a9ac1729f551bb08d4788cd1..287cb02f827e8ef83f5668358315de8ea2c0e194 100644 (file)
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -68,7 +68,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 VolumeGet( aout_instance_t *, audio_volume_t * );
 static int VolumeSet( aout_instance_t *, audio_volume_t );
 
 static int WaveOutClearDoneBuffers(aout_sys_t *p_sys);
@@ -305,7 +304,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_get = VolumeGet;
                 p_aout->output.pf_volume_set = VolumeSet;
             }
         }
@@ -1021,22 +1019,6 @@ static void* WaveOutThread( vlc_object_t *p_this )
     return NULL;
 }
 
-static int VolumeGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
-{
-    DWORD i_waveout_vol;
-
-#ifdef UNDER_CE
-    waveOutGetVolume( 0, &i_waveout_vol );
-#else
-    waveOutGetVolume( p_aout->output.p_sys->h_waveout, &i_waveout_vol );
-#endif
-
-    i_waveout_vol &= 0xFFFF;
-    *pi_volume = p_aout->output.i_volume =
-        (i_waveout_vol * AOUT_VOLUME_MAX + 0xFFFF /*rounding*/) / 2 / 0xFFFF;
-    return 0;
-}
-
 static int VolumeSet( aout_instance_t * p_aout, audio_volume_t i_volume )
 {
     unsigned long i_waveout_vol = i_volume * 0xFFFF * 2 / AOUT_VOLUME_MAX;

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 810cadd8f487285c17c4336cbdca41c6de41a055..f89b064eb98ade3447474cb750d9f3ff26d0a5ea 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -243,7 +243,6 @@ void aout_VolumeSoftInit( aout_instance_t * p_aout )
 {
     int i_volume;
 
-    p_aout->output.pf_volume_get = aout_VolumeSoftGet;
     p_aout->output.pf_volume_set = aout_VolumeSoftSet;
 
     i_volume = config_GetInt( p_aout, "volume" );
@@ -259,14 +258,6 @@ void aout_VolumeSoftInit( aout_instance_t * p_aout )
     aout_VolumeSoftSet( p_aout, (audio_volume_t)i_volume );
 }
 
-/* Placeholder for pf_volume_get(). */
-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 )
 {
@@ -283,17 +274,9 @@ 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_get = aout_VolumeNoneGet;
     p_aout->output.pf_volume_set = aout_VolumeNoneSet;
 }
 
-/* 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 )
 {