[vlc-commits] Mark hq-resampling obsolete

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb 27 20:23:23 2013 +0200| [296debcc472a86a4776a5e677aa90689ccc6d6d1] | committer: Rémi Denis-Courmont

Mark hq-resampling obsolete

This option has not had any effects since VLC 1.1.8.

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

 modules/audio_filter/resampler/bandlimited.c |    7 -------
 src/libvlc-module.c                          |   13 +------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index 9e9adbb..f5c5c55 100644
--- a/modules/audio_filter/resampler/bandlimited.c
+++ b/modules/audio_filter/resampler/bandlimited.c
@@ -300,13 +300,6 @@ static int OpenFilter( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-#if !defined( SYS_DARWIN )
-    if( !var_InheritBool( p_this, "hq-resampling" ) )
-    {
-        return VLC_EGENERIC;
-    }
-#endif
-
     /* Allocate the memory needed to store the module's structure */
     p_filter->p_sys = p_sys = malloc( sizeof(struct filter_sys_t) );
     if( p_sys == NULL )
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 5c624a1..86cee40 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -154,14 +154,6 @@ static const char *const ppsz_snap_formats[] =
     "The volume can be recorded and automatically restored next time " \
     "VLC is used." )
 
-#if !defined( __APPLE__ )
-#define AOUT_RESAMP_TEXT N_("High quality audio resampling")
-#define AOUT_RESAMP_LONGTEXT N_( \
-    "This uses a high quality audio resampling algorithm. High quality " \
-    "audio resampling can be processor intensive so you can " \
-    "disable it and a cheaper resampling algorithm will be used instead.")
-#endif
-
 #define DESYNC_TEXT N_("Audio desynchronization compensation")
 #define DESYNC_LONGTEXT N_( \
     "This delays the audio output. The delay must be given in milliseconds. " \
@@ -1476,10 +1468,7 @@ vlc_module_begin ()
         change_integer_range( 1, AOUT_VOLUME_DEFAULT )
     add_bool( "volume-save", true, VOLUME_SAVE_TEXT, VOLUME_SAVE_TEXT, true )
     add_obsolete_integer( "aout-rate" ) /* since 2.0.0 */
-#if HAVE_FPU && !defined( __APPLE__ )
-    add_bool( "hq-resampling", 1, AOUT_RESAMP_TEXT,
-              AOUT_RESAMP_LONGTEXT, true )
-#endif
+    add_obsolete_bool( "hq-resampling" ) /* since 1.1.8 */
     add_bool( "spdif", 0, SPDIF_TEXT, SPDIF_LONGTEXT, false )
     add_integer( "force-dolby-surround", 0, FORCE_DOLBY_TEXT,
                  FORCE_DOLBY_LONGTEXT, false )