From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Mon, 1 Jun 2020 19:24:43 +0000 (+0200)
Subject: When hotplugging cards, reset resampler only after the device name and number of... 
X-Git-Tag: 2.0.0~9
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=c2a16bd46ae760b88345f13e4bdc6f7ab27670b0

When hotplugging cards, reset resampler only after the device name and number of channels are set.
---

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 827ab9f..e61ece2 100644
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -633,7 +633,6 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
 
 	DeviceSpec device;
 	device = DeviceSpec{InputSourceType::CAPTURE_CARD, card_index};
-	audio_mixer->reset_resampler(device);
 	unsigned num_channels = card_type == CardType::LIVE_CARD ? 8 : 2;
 	if (is_active) {
 		audio_mixer->set_device_parameters(device, card->capture->get_description(), card_type, num_channels, /*active=*/true);
@@ -643,6 +642,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
 		snprintf(name, sizeof(name), "Fake card %u", card_index + 1);
 		audio_mixer->set_device_parameters(device, name, card_type, num_channels, /*active=*/false);
 	}
+	audio_mixer->reset_resampler(device);
 	audio_mixer->trigger_state_changed_callback();
 
 	// Unregister old metrics, if any.