[vlc-commits] aout: remove legacy aout_EnableFilter() and aout_VolumeUp()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Nov  1 19:06:10 2012 +0200| [6bec434181c10d514c3416d00cc756eb697c0f58] | committer: Rémi Denis-Courmont

aout: remove legacy aout_EnableFilter() and aout_VolumeUp()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6bec434181c10d514c3416d00cc756eb697c0f58
---

 include/vlc_aout_intf.h |    7 -------
 src/audio_output/intf.c |   46 ----------------------------------------------
 src/libvlccore.sym      |    2 --
 3 files changed, 55 deletions(-)

diff --git a/include/vlc_aout_intf.h b/include/vlc_aout_intf.h
index 88076aa..248d7f3 100644
--- a/include/vlc_aout_intf.h
+++ b/include/vlc_aout_intf.h
@@ -33,9 +33,6 @@ VLC_API float aout_VolumeGet( vlc_object_t * );
 #define aout_VolumeGet(a) aout_VolumeGet(VLC_OBJECT(a))
 VLC_API int aout_VolumeSet( vlc_object_t *, float );
 #define aout_VolumeSet(a, b) aout_VolumeSet(VLC_OBJECT(a), b)
-VLC_API int aout_VolumeUp( vlc_object_t *, int, float * );
-#define aout_VolumeUp(a, b, c) aout_VolumeUp(VLC_OBJECT(a), b, c)
-#define aout_VolumeDown(a, b, c) aout_VolumeUp(a, -(b), c)
 VLC_API int aout_MuteSet( vlc_object_t *, bool );
 #define aout_MuteSet(a, b) aout_MuteSet(VLC_OBJECT(a), b)
 VLC_API int aout_MuteGet( vlc_object_t * );
@@ -50,8 +47,4 @@ static inline int aout_MuteToggle (vlc_object_t *obj)
 }
 #define aout_MuteToggle(a) aout_MuteToggle(VLC_OBJECT(a))
 
-VLC_API void aout_EnableFilter( vlc_object_t *, const char *, bool );
-#define aout_EnableFilter( o, n, b ) \
-        aout_EnableFilter( VLC_OBJECT(o), n, b )
-
 #endif /* _VLC_AOUT_H */
diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 2323052..63848c9 100644
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -95,31 +95,6 @@ int aout_VolumeSet (vlc_object_t *obj, float vol)
     return ret;
 }
 
-#undef aout_VolumeUp
-/**
- * Raises the volume.
- * \param value how much to increase (> 0) or decrease (< 0) the volume
- * \param volp if non-NULL, will contain contain the resulting volume
- */
-int aout_VolumeUp (vlc_object_t *obj, int value, float *volp)
-{
-    value *= var_InheritInteger (obj, "volume-step");
-
-    float vol = aout_VolumeGet (obj);
-    if (vol < 0.)
-        return -1;
-
-    vol += value / (float)AOUT_VOLUME_DEFAULT;
-    if (vol < 0.)
-        vol = 0.;
-    if (vol > 2.)
-        vol = 2.;
-    if (volp != NULL)
-        *volp = vol;
-
-    return aout_VolumeSet (obj, vol);
-}
-
 #undef aout_MuteGet
 /**
  * Gets the output mute status.
@@ -179,24 +154,3 @@ int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable,
     aout_RequestRestart (p_aout);
     return 0;
 }
-
-#undef aout_EnableFilter
-/** 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 )
-{
-    audio_output_t *p_aout = findAout( p_this );
-
-    if( aout_ChangeFilterString( p_this, VLC_OBJECT(p_aout), "audio-filter", psz_name, b_add ) )
-    {
-        if( p_aout )
-            aout_InputRequestRestart( p_aout );
-    }
-
-    if( p_aout )
-        vlc_object_release( p_aout );
-}
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 93cda49..3851189 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -6,14 +6,12 @@ aout_ChannelReorder
 aout_ChannelsRestart
 aout_CheckChannelExtraction
 aout_CheckChannelReorder
-aout_EnableFilter
 aout_filter_RequestVout
 aout_FormatPrepare
 aout_FormatPrint
 aout_FormatPrintChannels
 aout_VolumeGet
 aout_VolumeSet
-aout_VolumeUp
 aout_MuteSet
 aout_MuteGet
 block_Alloc