shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Audio stops when selected midi device is missing.

Browse Source
This commit is contained in:
Robin Davies
2024-10-09 13:10:13 -04:00
parent 453301ab38
commit 5e757ae604
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AlsaDriver.cpp
+19 -12
View File
@@ -191,10 +191,12 @@ namespace pipedal
void validate_capture_handle() { // leftover debugging for a buffer overrun :-/ void validate_capture_handle() { // leftover debugging for a buffer overrun :-/
// if (snd_pcm_type(captureHandle) != SND_PCM_TYPE_HW) #ifdef DEBUG
// { if (snd_pcm_type(captureHandle) != SND_PCM_TYPE_HW)
// throw std::runtime_error("Capture handle has been overwritten"); {
// } throw std::runtime_error("Capture handle has been overwritten");
}
#endif
} }
public: public:
AlsaDriverImpl(AudioDriverHost *driverHost) AlsaDriverImpl(AudioDriverHost *driverHost)
@@ -1934,10 +1936,15 @@ namespace pipedal
for (size_t i = 0; i < devices.size(); ++i) for (size_t i = 0; i < devices.size(); ++i)
{ {
const auto &device = devices[i]; try {
auto midiDevice = std::make_unique<AlsaMidiDeviceImpl>(); const auto &device = devices[i];
midiDevice->Open(device); auto midiDevice = std::make_unique<AlsaMidiDeviceImpl>();
midiDevices.push_back(std::move(midiDevice)); midiDevice->Open(device);
midiDevices.push_back(std::move(midiDevice));
} catch (const std::exception &e)
{
Lv2Log::error(e.what());
}
} }
} }
@@ -2016,11 +2023,11 @@ namespace pipedal
if (jackServerSettings.IsDummyAudioDevice()) if (jackServerSettings.IsDummyAudioDevice())
{ {
inputAudioPorts.clear(); inputAudioPorts.clear();
inputAudioPorts.push_back("system::capture_0"); inputAudioPorts.push_back(std::string("system::capture_0"));
inputAudioPorts.push_back("system::capture_1"); inputAudioPorts.push_back(std::string("system::capture_1"));
outputAudioPorts.clear(); outputAudioPorts.clear();
outputAudioPorts.push_back("system::playback_0"); outputAudioPorts.push_back(std::string("system::playback_0"));
outputAudioPorts.push_back("system::playback_1"); outputAudioPorts.push_back(std::string("system::playback_1"));
return true; return true;
} }