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

added frequency in recording + fixed SDRplay typo

Browse Source
This commit is contained in:
Ryzerth 2021-03-12 22:22:14 +01:00
parent 20ee982e3d
commit f55d591cba
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/core.cpp
View File

@ -39,6 +39,7 @@ namespace core {
void setInputSampleRate(double samplerate) { void setInputSampleRate(double samplerate) {
// NOTE: Zoom controls won't work // NOTE: Zoom controls won't work
spdlog::info("New DSP samplerate: {0}", samplerate);
gui::waterfall.setBandwidth(samplerate); gui::waterfall.setBandwidth(samplerate);
gui::waterfall.setViewOffset(0); gui::waterfall.setViewOffset(0);
gui::waterfall.setViewBandwidth(samplerate); gui::waterfall.setViewBandwidth(samplerate);

12
recorder/src/main.cpp
View File

@ -33,11 +33,15 @@ std::string expandString(std::string input) {
return std::regex_replace(input, std::regex("//"), "/"); return std::regex_replace(input, std::regex("//"), "/");
} }
std::string genFileName(std::string prefix) { std::string genFileName(std::string prefix, bool isVfo, std::string name = "") {
time_t now = time(0); time_t now = time(0);
tm *ltm = localtime(&now); tm *ltm = localtime(&now);
char buf[1024]; char buf[1024];
sprintf(buf, "%02d-%02d-%02d_%02d-%02d-%02d.wav", ltm->tm_hour, ltm->tm_min, ltm->tm_sec, ltm->tm_mday, ltm->tm_mon + 1, ltm->tm_year + 1900); double freq = gui::waterfall.getCenterFrequency();;
if (isVfo) {
freq += gui::waterfall.vfos[name]->generalOffset;
}
sprintf(buf, "_%.0lfHz_%02d-%02d-%02d_%02d-%02d-%02d.wav", freq, ltm->tm_hour, ltm->tm_min, ltm->tm_sec, ltm->tm_mday, ltm->tm_mon + 1, ltm->tm_year + 1900);
return prefix + buf; return prefix + buf;
} }
@ -159,7 +163,7 @@ private:
if (ImGui::Button(CONCAT("Record##_recorder_rec_", name), ImVec2(menuColumnWidth, 0))) { if (ImGui::Button(CONCAT("Record##_recorder_rec_", name), ImVec2(menuColumnWidth, 0))) {
recording = true; recording = true;
samplesWritten = 0; samplesWritten = 0;
std::string expandedPath = expandString(recPath + genFileName("/baseband_")); std::string expandedPath = expandString(recPath + genFileName("/baseband_", false));
sampleRate = sigpath::signalPath.getSampleRate(); sampleRate = sigpath::signalPath.getSampleRate();
basebandWriter = new WavWriter(expandedPath, 16, 2, sigpath::signalPath.getSampleRate()); basebandWriter = new WavWriter(expandedPath, 16, 2, sigpath::signalPath.getSampleRate());
basebandHandler.start(); basebandHandler.start();
@ -212,7 +216,7 @@ private:
if (ImGui::Button(CONCAT("Record##_recorder_rec_", name), ImVec2(menuColumnWidth, 0))) { if (ImGui::Button(CONCAT("Record##_recorder_rec_", name), ImVec2(menuColumnWidth, 0))) {
recording = true; recording = true;
samplesWritten = 0; samplesWritten = 0;
std::string expandedPath = expandString(recPath + genFileName("/audio_")); std::string expandedPath = expandString(recPath + genFileName("/audio_", true, selectedStreamName));
sampleRate = sigpath::sinkManager.getStreamSampleRate(selectedStreamName); sampleRate = sigpath::sinkManager.getStreamSampleRate(selectedStreamName);
audioWriter = new WavWriter(expandedPath, 16, 2, sigpath::sinkManager.getStreamSampleRate(selectedStreamName)); audioWriter = new WavWriter(expandedPath, 16, 2, sigpath::sinkManager.getStreamSampleRate(selectedStreamName));
audioHandler.start(); audioHandler.start();

2
sdrplay_source/src/main.cpp
View File

@ -14,7 +14,7 @@
SDRPP_MOD_INFO { SDRPP_MOD_INFO {
/* Name: */ "sdrplay_source", /* Name: */ "sdrplay_source",
/* Description: */ "Airspy source module for SDR++", /* Description: */ "SDRplay source module for SDR++",
/* Author: */ "Ryzerth", /* Author: */ "Ryzerth",
/* Version: */ 0, 1, 0, /* Version: */ 0, 1, 0,
/* Max instances */ 1 /* Max instances */ 1