Remove aout_VolumeNoneInit()

This was really just a glorified manner to set a pointer to NULL
(actually to a dummy function but whatever).

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index e2ef66812dbb553a7cddf587413add64d61a228a..870d77f0aae6a7d2a3e77f5e68af6cdd1797312e 100644 (file)
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -219,7 +219,6 @@ VLC_API void aout_FormatPrint(vlc_object_t *, const char *,
 #define aout_FormatPrint(o, t, f) aout_FormatPrint(VLC_OBJECT(o), t, f)
 VLC_API const char * aout_FormatPrintChannels( const audio_sample_format_t * ) VLC_USED;
 
-VLC_API void aout_VolumeNoneInit( audio_output_t * );
 VLC_API void aout_VolumeSoftInit( audio_output_t * );
 VLC_API void aout_VolumeHardInit( audio_output_t *, aout_volume_cb, bool );
 VLC_API void aout_VolumeHardSet( audio_output_t *, float, bool );

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 018e7f56d6787b725621fef8f3238cb704cc4fb2..18648787b50131712070f3bcdf7d0f8ad31a1d2d 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -526,7 +526,7 @@ static int Open (vlc_object_t *obj)
     {
         aout->format.i_bytes_per_frame = AOUT_SPDIF_SIZE;
         aout->format.i_frame_length = A52_FRAME_NB;
-        aout_VolumeNoneInit (aout);
+        aout->pf_volume_set = NULL;
     }
     else
     {

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 292995dd959c7a5ba82f44d29d364adf6d01f40e..09e92936e248b00ed7584fe68b9170037f0ad634 100644 (file)
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -787,7 +787,7 @@ static int OpenSPDIF( audio_output_t * p_aout )
     p_aout->format.i_rate = (unsigned int)p_sys->stream_format.mSampleRate;
     aout_FormatPrepare( &p_aout->format );
     aout_PacketInit( p_aout, &p_sys->packet, A52_FRAME_NB );
-    aout_VolumeNoneInit( p_aout );
+    p_aout->pf_volume_set = NULL;
 
     /* Add IOProc callback */
     err = AudioDeviceCreateIOProcID( p_sys->i_selected_dev,

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 7b36f97727206e415c65e33f67724c511af27849..fa0b4d2f37218ea0b792a56f9f705ca7e0c4057d 100644 (file)
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -233,7 +233,7 @@ static int OpenAudio( vlc_object_t *p_this )
 
         aout_PacketInit( p_aout, &p_aout->sys->packet, A52_FRAME_NB );
         p_aout->sys->volume = -1;
-        aout_VolumeNoneInit( p_aout );
+        p_aout->pf_volume_set = NULL;
     }
     else
     {

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index e2c4e3100c04cfac898df655372b69c6d678c592..0b731a25397f8ce92941df961e0c30cc4a8b9f6b 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -194,7 +194,7 @@ static int Open( vlc_object_t * p_this )
         p_aout->format.i_bytes_per_frame = AOUT_SPDIF_SIZE;
         p_aout->format.i_frame_length = A52_FRAME_NB;
     }
-    aout_VolumeNoneInit( p_aout );
+    p_aout->pf_volume_set = NULL;
 
     /* Channels number */
     i_channels = var_CreateGetInteger( p_this, "audiofile-channels" );

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index b605d262297f4c45ce4d49aa80b11f487b725f96..b4ec37328cdf397ca1b389db87c08d075605c412 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -370,7 +370,7 @@ static int Open( vlc_object_t *p_this )
         p_aout->format.i_frame_length = A52_FRAME_NB;
 
         aout_PacketInit( p_aout, &p_sys->packet, A52_FRAME_NB );
-        aout_VolumeNoneInit( p_aout );
+        p_aout->pf_volume_set = NULL;
     }
     else
     {

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index ef12c49ae8bcc6854d028ef8d851c7341855f7bd..e2f18afc14dddd77d95428f02a0f4c26fea9de21 100644 (file)
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -246,7 +246,7 @@ static int Open( vlc_object_t *p_this )
             p_aout->format.i_bytes_per_frame;
 
         aout_PacketInit( p_aout, &p_aout->sys->packet, A52_FRAME_NB );
-        aout_VolumeNoneInit( p_aout );
+        p_aout->pf_volume_set = NULL;
     }
     else
     {

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index d0baa2a613c5f1c9c4868e0d14841134b69e7385..17504a9dc408786fe41b82fe884d0068452383ef 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -66,7 +66,7 @@ audio_output_t *aout_New( vlc_object_t * p_parent )
     owner->volume.mixer = NULL;
 
     aout->pf_play = aout_DecDeleteBuffer;
-    aout_VolumeNoneInit (aout);
+    aout->pf_volume_set = NULL;
     vlc_object_set_destructor (aout, aout_Destructor);
 
     /*

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 3a89d2bc8d43f480a54e72bbad3cf34c2bd1dd6a..1794134d3ccfbaf0ebab0c810671acae2bd44c68 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -97,7 +97,7 @@ static int commitVolume (vlc_object_t *obj, audio_output_t *aout,
 
         /* apply volume to the pipeline */
         aout_lock (aout);
-        if (owner->module != NULL)
+        if (aout->pf_volume_set != NULL)
             ret = aout->pf_volume_set (aout, vol, mute);
         aout_unlock (aout);
 

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index ef8a80cd769c962756ad8d815a373957070e1f82..712a0aa564df98e0f4ea5257bbcd2f6200846e5d 100644 (file)
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -211,7 +211,7 @@ void aout_OutputDelete (audio_output_t *aout)
     aout->pf_play = aout_DecDeleteBuffer; /* gruik */
     aout->pf_pause = NULL;
     aout->pf_flush = NULL;
-    aout_VolumeNoneInit (aout);
+    aout->pf_volume_set = NULL;
     owner->module = NULL;
     aout_FiltersDestroyPipeline (owner->filters, owner->nb_filters);
 }
@@ -266,28 +266,6 @@ void aout_OutputFlush( audio_output_t *aout, bool wait )
 
 /*** Volume handling ***/
 
-/**
- * Dummy volume setter. This is the default volume setter.
- */
-static int aout_VolumeNoneSet (audio_output_t *aout, float volume, bool mute)
-{
-    (void)aout; (void)volume; (void)mute;
-    return -1;
-}
-
-/**
- * Configures the dummy volume setter.
- * @note Audio output plugins for which volume is irrelevant
- * should call this function during activation.
- */
-void aout_VolumeNoneInit (audio_output_t *aout)
-{
-    /* aout_New() -safely- calls this function without the lock, before any
-     * other thread knows of this audio output instance.
-    aout_assert_locked (aout); */
-    aout->pf_volume_set = aout_VolumeNoneSet;
-}
-
 /**
  * Volume setter for software volume.
  */

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 5b130d03f5533cd0106736469fc798e0c48bb933..3645925e4369d38bf7c11f3f8b85df03c3a4dc1c 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -21,7 +21,6 @@ aout_ToggleMute
 aout_IsMuted
 aout_SetMute
 aout_TimeReport
-aout_VolumeNoneInit
 aout_VolumeSoftInit
 aout_VolumeHardInit
 aout_VolumeHardSet