[vlc-commits] oss: add own configuration item for passthrough

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Apr  8 12:47:03 2018 +0300| [157e09bcfe395341081c04be1ded5cdad67a0dbb] | committer: Rémi Denis-Courmont

oss: add own configuration item for passthrough

Also use the old description. The new one is misleading in the context
of OSSv4 (or ALSA)4 (or ALSA)4 (or ALSA)4 (or ALSA).

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

 modules/audio_output/oss.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 5944f1444b..0c3e6af25a 100644
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -69,6 +69,11 @@ static void Close (vlc_object_t *);
 #define AUDIO_DEV_TEXT N_("Audio output device")
 #define AUDIO_DEV_LONGTEXT N_("OSS device node path.")
 
+#define SPDIF_TEXT N_("Use S/PDIF when available")
+#define SPDIF_LONGTEXT N_( \
+    "S/PDIF can be used by default when " \
+    "your hardware supports it as well as the audio stream being played.")
+
 vlc_module_begin ()
     set_shortname( "OSS" )
     set_description (N_("Open Sound System audio output"))
@@ -76,6 +81,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_AUDIO_AOUT )
     add_string ("oss-audio-device", "",
                 AUDIO_DEV_TEXT, AUDIO_DEV_LONGTEXT, false)
+    add_bool("oss-spdif", false, SPDIF_TEXT, SPDIF_LONGTEXT, true)
     add_sw_gain ()
     set_capability( "audio output", 100 )
     set_callbacks (Open, Close)
@@ -132,7 +138,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
             break;
         default:
             if (AOUT_FMT_SPDIF(fmt))
-                spdif = var_InheritBool (aout, "spdif");
+                spdif = var_InheritBool(aout, "oss-spdif");
             if (spdif)
                 format = AFMT_AC3;
 #ifdef AFMT_FLOAT