mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-01-24 08:44:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'AlexandreRouma:master' into patch-1

Browse Source
This commit is contained in:
Dr. Rubisco 2021-07-27 12:20:12 -04:00 committed by GitHub
commit a4240ab8a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/gui/menus/source.cpp
View File

@ -76,6 +76,7 @@ namespace sourecmenu {
auto it = std::find(sourceNames.begin(), sourceNames.end(), name); auto it = std::find(sourceNames.begin(), sourceNames.end(), name);
if (it == sourceNames.end()) { if (it == sourceNames.end()) {
selectSource(sourceNames[0]); selectSource(sourceNames[0]);
return;
} }
sourceId = std::distance(sourceNames.begin(), it); sourceId = std::distance(sourceNames.begin(), it);
selectedSource = sourceNames[sourceId]; selectedSource = sourceNames[sourceId];

2
core/src/version.h
View File

@ -1,3 +1,3 @@
#pragma once #pragma once
#define VERSION_STR "0.3.0_beta" #define VERSION_STR "1.0.0_rc1"

6
sdrplay_source/src/main.cpp
View File

@ -116,7 +116,11 @@ public:
cbFuncs.StreamACbFn = streamCB; cbFuncs.StreamACbFn = streamCB;
cbFuncs.StreamBCbFn = streamCB; cbFuncs.StreamBCbFn = streamCB;
sdrplay_api_Open(); sdrplay_api_ErrT err = sdrplay_api_Open();
if (err != sdrplay_api_Success) {
spdlog::error("Could not intiatialized the SDRplay API. Make sure that the service is running.");
return;
}
sampleRate = 2000000.0; sampleRate = 2000000.0;
srId = 0; srId = 0;