[vlc-devel] [PATCH] libvlc: change "spdif" option

[Thomas Guillem]

This option should not be used anymore with recent audio outputs (pulse audio,
mmdevice).

This option is now an advanced one.
---
 src/libvlc-module.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index ee9566d..98182b3 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -169,10 +169,12 @@ static const char *ppsz_roles_text[] = {
     "Sets the audio output channels mode that will be used by default " \
     "if your hardware and the audio stream are compatible.")
 
-#define SPDIF_TEXT N_("Use S/PDIF when available")
+#define SPDIF_TEXT N_("Force S/PDIF support")
 #define SPDIF_LONGTEXT N_( \
-    "S/PDIF can be used by default when " \
-    "your hardware supports it as well as the audio stream being played.")
+    "This option should be used when the audio output (like ALSA, OSS, or "\
+    "DirectSound) can't negotiate S/PDIF support."\
+    "Even if forced, S/PDIF can only be used if your hardware supports it "\
+    "as well as the audio stream being played.")
 
 #define FORCE_DOLBY_TEXT N_("Force detection of Dolby Surround")
 #define FORCE_DOLBY_LONGTEXT N_( \
@@ -1459,7 +1461,7 @@ vlc_module_begin ()
     add_bool( "volume-save", true, VOLUME_SAVE_TEXT, VOLUME_SAVE_TEXT, true )
     add_obsolete_integer( "aout-rate" ) /* since 2.0.0 */
     add_obsolete_bool( "hq-resampling" ) /* since 1.1.8 */
-    add_bool( "spdif", 0, SPDIF_TEXT, SPDIF_LONGTEXT, false )
+    add_bool( "spdif", false, SPDIF_TEXT, SPDIF_LONGTEXT, true )
     add_integer( "force-dolby-surround", 0, FORCE_DOLBY_TEXT,
                  FORCE_DOLBY_LONGTEXT, false )
         change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions )
-- 
2.8.1