mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-11-12 21:42:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AlexandreRouma/SDRPlusPlus

Browse Source
This commit is contained in:
AlexandreRouma 2023-07-10 04:41:41 +02:00
commit acd9ad9781
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
misc_modules/rigctl_server/src/main.cpp
View File

@ -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);

24
sink_modules/audio_sink/src/main.cpp
View File

@ -45,16 +45,20 @@ 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++) {
info = audio.getDeviceInfo(i); try {
if (!info.probed) { continue; } info = audio.getDeviceInfo(i);
if (info.outputChannels == 0) { continue; } if (!info.probed) { continue; }
if (info.isDefaultOutput) { defaultDevId = devList.size(); } if (info.outputChannels == 0) { continue; }
devList.push_back(info); if (info.isDefaultOutput) { defaultDevId = devList.size(); }
deviceIds.push_back(i); devList.push_back(info);
txtDevList += info.name; deviceIds.push_back(i);
txtDevList += '\0'; txtDevList += info.name;
txtDevList += '\0';
}
catch (std::exception e) {
flog::error("AudioSinkModule Error getting audio device info: {0}", e.what());
}
} }
selectByName(device); selectByName(device);
} }
@ -290,4 +294,4 @@ MOD_EXPORT void _DELETE_INSTANCE_(void* instance) {
MOD_EXPORT void _END_() { MOD_EXPORT void _END_() {
config.disableAutoSave(); config.disableAutoSave();
config.save(); config.save();
} }