- revert "spdif", "force-dolby-surround" and "headphone-dim" to

  basic options

diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index dee963aab4e5cc34892534c4cc436fb51dc4e623..e36ed615cacc09675d9f9ad87472d1d367600573 100644 (file)
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -76,7 +76,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_AUDIO_AFILTER );
 
     add_integer( "headphone-dim", 10, NULL, HEADPHONE_DIM_TEXT,
-                 HEADPHONE_DIM_LONGTEXT, VLC_TRUE );
+                 HEADPHONE_DIM_LONGTEXT, VLC_FALSE );
     add_bool( "headphone-compensate", 0, NULL, HEADPHONE_COMPENSATE_TEXT,
               HEADPHONE_COMPENSATE_LONGTEXT, VLC_TRUE );
     add_bool( "headphone-dolby", 0, NULL, HEADPHONE_DOLBY_TEXT,

diff --git a/src/libvlc.h b/src/libvlc.h
index 1ec91240501969fa77c7ff82b2503160ac5f7b7d..ab30c8162a996bed3ab934e832e336dfcdda1728 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -961,9 +961,9 @@ vlc_module_begin();
     add_bool( "hq-resampling", 1, NULL, AOUT_RESAMP_TEXT,
               AOUT_RESAMP_LONGTEXT, VLC_TRUE );
 #endif
-    add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_TRUE );
+    add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_FALSE );
     add_integer( "force-dolby-surround", 0, NULL, FORCE_DOLBY_TEXT,
-                 FORCE_DOLBY_LONGTEXT, VLC_TRUE );
+                 FORCE_DOLBY_LONGTEXT, VLC_FALSE );
         change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, 0 );
     add_integer( "audio-desync", 0, NULL, DESYNC_TEXT,
                  DESYNC_LONGTEXT, VLC_TRUE );