mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2025-04-01 21:05:40 +02:00
Merge branch 'master' of https://github.com/AlexandreRouma/SDRPlusPlus
This commit is contained in:
commit
acd9ad9781
@ -690,6 +690,11 @@ private:
|
|||||||
"0\n" /* RIG_PARM_NONE */;
|
"0\n" /* RIG_PARM_NONE */;
|
||||||
client->write(resp.size(), (uint8_t*)resp.c_str());
|
client->write(resp.size(), (uint8_t*)resp.c_str());
|
||||||
}
|
}
|
||||||
|
// This get_powerstat stuff is a wordaround for WSJT-X 2.7.0
|
||||||
|
else if (parts[0] == "\\get_powerstat") {
|
||||||
|
resp = "1\n";
|
||||||
|
client->write(resp.size(), (uint8_t*)resp.c_str());
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
// If command is not recognized, return error
|
// If command is not recognized, return error
|
||||||
flog::error("Rigctl client sent invalid command: '{0}'", cmd);
|
flog::error("Rigctl client sent invalid command: '{0}'", cmd);
|
||||||
|
@ -45,6 +45,7 @@ public:
|
|||||||
int count = audio.getDeviceCount();
|
int count = audio.getDeviceCount();
|
||||||
RtAudio::DeviceInfo info;
|
RtAudio::DeviceInfo info;
|
||||||
for (int i = 0; i < count; i++) {
|
for (int i = 0; i < count; i++) {
|
||||||
|
try {
|
||||||
info = audio.getDeviceInfo(i);
|
info = audio.getDeviceInfo(i);
|
||||||
if (!info.probed) { continue; }
|
if (!info.probed) { continue; }
|
||||||
if (info.outputChannels == 0) { continue; }
|
if (info.outputChannels == 0) { continue; }
|
||||||
@ -54,7 +55,10 @@ public:
|
|||||||
txtDevList += info.name;
|
txtDevList += info.name;
|
||||||
txtDevList += '\0';
|
txtDevList += '\0';
|
||||||
}
|
}
|
||||||
|
catch (std::exception e) {
|
||||||
|
flog::error("AudioSinkModule Error getting audio device info: {0}", e.what());
|
||||||
|
}
|
||||||
|
}
|
||||||
selectByName(device);
|
selectByName(device);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user