From cfd3e90270e7a54da32665374c7b8cddce826efa Mon Sep 17 00:00:00 2001
From: Matthias Braendli <matthias.braendli@u-blox.com>
Date: Mon, 23 Mar 2015 13:26:59 +0100
Subject: The -c option should also work for libvlc input

---
 src/VLCInput.cpp    | 2 +-
 src/VLCInput.h      | 3 ++-
 src/dabplus-enc.cpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/VLCInput.cpp b/src/VLCInput.cpp
index 99f86f1..1c84a50 100644
--- a/src/VLCInput.cpp
+++ b/src/VLCInput.cpp
@@ -56,7 +56,7 @@ void handleStream(
 {
     VLCInput* in = (VLCInput*)p_audio_data;
 
-    assert(channels == 2);
+    assert(channels == m_channels);
     assert(rate == in->getRate());
     assert(bits_per_sample == 8*BYTES_PER_SAMPLE);
 
diff --git a/src/VLCInput.h b/src/VLCInput.h
index e387044..f9cf783 100644
--- a/src/VLCInput.h
+++ b/src/VLCInput.h
@@ -41,10 +41,11 @@ class VLCInput
     public:
         VLCInput(const std::string& uri,
                  int rate,
+                 unsigned channels,
                  unsigned verbosity) :
             m_uri(uri),
             m_verbosity(verbosity),
-            m_channels(2),
+            m_channels(channels),
             m_rate(rate),
             m_vlc(NULL) { }
 
diff --git a/src/dabplus-enc.cpp b/src/dabplus-enc.cpp
index bdd4c58..9e8bd00 100644
--- a/src/dabplus-enc.cpp
+++ b/src/dabplus-enc.cpp
@@ -570,7 +570,7 @@ int main(int argc, char *argv[])
     JackInput         jack_in(jack_name, channels, sample_rate, queue);
 #endif
 #if HAVE_VLC
-    VLCInput          vlc_in(vlc_uri, sample_rate, verbosity);
+    VLCInput          vlc_in(vlc_uri, sample_rate, channels, verbosity);
 #endif
 
     if (infile) {
-- 
cgit v1.2.3