mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-12-26 02:48:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compile bug on linux

Browse Source
This commit is contained in:
Ryzerth 2020-11-30 16:30:45 +01:00
parent e5dbac4345
commit 5bb2f9bf05
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plutosdr_source/CMakeLists.txt
View File

@ -25,9 +25,14 @@ if (MSVC)
else (MSVC) else (MSVC)
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(SOAPY REQUIRED iio) pkg_check_modules(SOAPY REQUIRED libiio)
pkg_check_modules(SOAPY REQUIRED libad9361)
target_include_directories(plutosdr_source PUBLIC ${IIO_INCLUDE_DIRS}) target_include_directories(plutosdr_source PUBLIC ${LIBIIO_INCLUDE_DIRS})
target_link_directories(plutosdr_source PUBLIC ${IIO_LIBRARY_DIRS}) target_link_directories(plutosdr_source PUBLIC ${LIBIIO_LIBRARY_DIRS})
target_link_libraries(plutosdr_source PUBLIC ${IIO_LIBRARIES}) target_link_libraries(plutosdr_source PUBLIC ${LIBIIO_LIBRARIES})
target_include_directories(plutosdr_source PUBLIC ${LIBAD9361_INCLUDE_DIRS})
target_link_directories(plutosdr_source PUBLIC ${LIBAD9361_LIBRARY_DIRS})
target_link_libraries(plutosdr_source PUBLIC ${LIBAD9361_LIBRARIES})
endif (MSVC) endif (MSVC)

10
recorder/src/main.cpp
View File

@ -79,8 +79,8 @@ private:
ImGui::BeginGroup(); ImGui::BeginGroup();
// TODO: Change VFO ref in signal path // TODO: Change VFO ref in signal path
// TODO: Add VFO record
ImGui::Columns(3, CONCAT("RecordModeColumns##_", _this->name), false); ImGui::Columns(2, CONCAT("RecordModeColumns##_", _this->name), false);
if (ImGui::RadioButton(CONCAT("Baseband##_", _this->name), _this->recMode == 0) && _this->recMode != 0) { if (ImGui::RadioButton(CONCAT("Baseband##_", _this->name), _this->recMode == 0) && _this->recMode != 0) {
_this->recMode = 0; _this->recMode = 0;
} }
@ -88,10 +88,6 @@ private:
if (ImGui::RadioButton(CONCAT("Audio##_", _this->name), _this->recMode == 1) && _this->recMode != 1) { if (ImGui::RadioButton(CONCAT("Audio##_", _this->name), _this->recMode == 1) && _this->recMode != 1) {
_this->recMode = 1; _this->recMode = 1;
} }
ImGui::NextColumn();
if (ImGui::RadioButton(CONCAT("VFO##_", _this->name), _this->recMode == 2) && _this->recMode != 2) {
_this->recMode = 2;
}
ImGui::Columns(1, CONCAT("EndRecordModeColumns##_", _this->name), false); ImGui::Columns(1, CONCAT("EndRecordModeColumns##_", _this->name), false);
ImGui::EndGroup(); ImGui::EndGroup();
@ -209,6 +205,7 @@ private:
dsp::stream<dsp::stereo_t>* audioStream; dsp::stream<dsp::stereo_t>* audioStream;
dsp::stream<dsp::complex_t>* iqStream; dsp::stream<dsp::complex_t>* iqStream;
WavWriter* writer; WavWriter* writer;
VFOManager::VFO* vfo;
std::thread workerThread; std::thread workerThread;
bool recording; bool recording;
time_t startTime; time_t startTime;
@ -217,6 +214,7 @@ private:
int selectedStreamId; int selectedStreamId;
uint64_t samplesWritten; uint64_t samplesWritten;
float sampleRate; float sampleRate;
float vfoSampleRate = 200000;
int recMode = 0; int recMode = 0;
}; };