From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 18 Aug 2016 17:03:08 +0000 (+0200)
Subject: Ask for the right number of channels when creating an ALSA device.
X-Git-Tag: 1.4.0~96
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=d9babea9e8b67a7ccbfa931c16b2c7ca38b84c5a

Ask for the right number of channels when creating an ALSA device.
---

diff --git a/audio_mixer.cpp b/audio_mixer.cpp
index afff6f3..769dabf 100644
--- a/audio_mixer.cpp
+++ b/audio_mixer.cpp
@@ -185,7 +185,8 @@ void AudioMixer::reset_alsa_mutex_held(DeviceSpec device_spec)
 	if (device->interesting_channels.empty()) {
 		device->alsa_device.reset();
 	} else {
-		device->alsa_device.reset(new ALSAInput(available_alsa_cards[card_index].address.c_str(), OUTPUT_FREQUENCY, 2, bind(&AudioMixer::add_audio, this, device_spec, _1, _2, _3, _4)));
+		const ALSAInput::Device &alsa_dev = available_alsa_cards[card_index];
+		device->alsa_device.reset(new ALSAInput(alsa_dev.address.c_str(), OUTPUT_FREQUENCY, alsa_dev.num_channels, bind(&AudioMixer::add_audio, this, device_spec, _1, _2, _3, _4)));
 		device->capture_frequency = device->alsa_device->get_sample_rate();
 		device->alsa_device->start_capture_thread();
 	}