fix: recursive device selection in CaptureConsoleMode

momentarylapse · Oct 26, 2024 · 246ffaa · 246ffaa
1 parent f1b095b
commit 246ffaa
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/src/device/backend-portaudio/AudioInputStreamPort.cpp b/src/device/backend-portaudio/AudioInputStreamPort.cpp
@@ -30,13 +30,13 @@ AudioInputStreamPort::AudioInputStreamPort(Session *session, Device *device, Aud
 		                                   &portaudio_stream_request_callback, this);
 		_portaudio_test_error(err, "Pa_OpenDefaultStream");
 	} else {
-		session->i(format("open stream %d  %d", _sample_rate, num_channels));
-		PaStreamParameters params;
+		session->i(format("open stream %d  %d    %d", _sample_rate, num_channels, device->index_in_lib));
+		PaStreamParameters params{};
 		params.channelCount = num_channels;
 		params.sampleFormat = paFloat32;
 		params.device = device->index_in_lib;
 		params.hostApiSpecificStreamInfo = nullptr;
-		params.suggestedLatency = 0;
+		params.suggestedLatency = 0;//Pa_GetDeviceInfo(device->index_in_lib)->defaultLowInputLatency;
 		PaError err = Pa_OpenStream(&portaudio_stream, &params, nullptr, _sample_rate, chunk_size,
 		                            paNoFlag, &portaudio_stream_request_callback, this);
 		_portaudio_test_error(err, "Pa_OpenStream");

diff --git a/src/device/backend-portaudio/DeviceContextPort.h b/src/device/backend-portaudio/DeviceContextPort.h
@@ -15,8 +15,8 @@ namespace tsunami {
 
 class DeviceContextPort : public DeviceContext {
 public:
-	DeviceContextPort(Session* session);
-	~DeviceContextPort();
+	explicit DeviceContextPort(Session* session);
+	~DeviceContextPort() override;
 
 	bool init(Session* session) override;
 	void update_device(DeviceManager* device_manager, bool serious) override;

diff --git a/src/module/stream/AudioInput.cpp b/src/module/stream/AudioInput.cpp
@@ -104,6 +104,8 @@ Device *AudioInput::get_device() {
 }
 
 void AudioInput::set_device(Device *device) {
+	if (device == config.device)
+		return;
 	config.device = device;
 	changed();
 }

diff --git a/src/view/sidebar/captureconsolemodes/CaptureConsoleMode.cpp b/src/view/sidebar/captureconsolemodes/CaptureConsoleMode.cpp
@@ -121,7 +121,7 @@ void CaptureConsoleMode::update_device_list() {
 		// add all
 		c.panel->reset(c.id_source);
 		for (Device *d: sources)
-			c.panel->set_string(c.id_source, shorten(d->get_name(), 42));
+			c.panel->add_string(c.id_source, shorten(d->get_name(), 42));
 
 		// select current
 		foreachi(Device *d, sources, i)

diff --git a/src/view/sidebar/captureconsolemodes/CaptureConsoleModeAudio.cpp b/src/view/sidebar/captureconsolemodes/CaptureConsoleModeAudio.cpp
@@ -10,7 +10,6 @@
 #include "../CaptureConsole.h"
 #include "../../audioview/AudioView.h"
 #include "../../mode/ViewModeCapture.h"
-#include "../../../data/Song.h"
 #include "../../../data/Track.h"
 #include "../../../data/base.h"
 #include "../../../module/SignalChain.h"
@@ -57,7 +56,9 @@ void CaptureConsoleModeAudio::enter() {
 
 	update_data_from_items();
 
-	event_ids.add(console->event("source", [this] { on_source(); }));
+	event_ids.add(console->event("source", [this] {
+		on_source();
+	}));
 
 
 	auto &c = items()[0];

diff --git a/src/view/sidebar/captureconsolemodes/CaptureTrackData.cpp b/src/view/sidebar/captureconsolemodes/CaptureTrackData.cpp
@@ -163,7 +163,6 @@ void CaptureTrackData::set_map(const Array<int> &_map) {
 }
 
 void CaptureTrackData::set_device(Device *device) {
-
 	if (type() == SignalType::Audio) {
 		audio_input()->set_device(device);
 		set_map(create_default_channel_map(device->channels, track->channels));