mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-06-25 12:07:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Recorder bugfix + rewrote RTL-TCP source to use new network lib

Browse Source
This commit is contained in:
AlexandreRouma
2023-02-03 02:38:08 +01:00
parent 31ff7f3224
commit 8a2d0fe56b
4 changed files with 106 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
misc_modules/recorder/src/main.cpp
View File

@ -95,11 +95,11 @@ public:
splitter.init(&volume.out);
splitter.bindStream(&meterStream);
meter.init(&meterStream);
s2m.init(NULL);
s2m.init(&stereoStream);
// Init sinks
basebandSink.init(NULL, complexHandler, this);
stereoSink.init(NULL, stereoHandler, this);
stereoSink.init(&stereoStream, stereoHandler, this);
monoSink.init(&s2m.out, monoHandler, this);
gui::menu.registerEntry(name, menuHandler, this);
@ -178,17 +178,15 @@ public:
// Open audio stream or baseband
if (recMode == RECORDER_MODE_AUDIO) {
// TODO: Select the stereo to mono converter if needed
stereoStream = sigpath::sinkManager.bindStream(selectedStreamName);
// Start correct path depending on
if (stereo) {
stereoSink.setInput(stereoStream);
stereoSink.start();
}
else {
s2m.setInput(stereoStream);
s2m.start();
monoSink.start();
}
splitter.bindStream(&stereoStream);
}
else {
// Create and bind IQ stream
@ -207,11 +205,11 @@ public:
// Close audio stream or baseband
if (recMode == RECORDER_MODE_AUDIO) {
// NOTE: Has to be done before the unbind since the stream is deleted...
splitter.unbindStream(&stereoStream);
monoSink.stop();
stereoSink.stop();
s2m.stop();
sigpath::sinkManager.unbindStream(selectedStreamName, stereoStream);
}
else {
// Unbind and destroy IQ stream
@ -535,7 +533,7 @@ private:
wav::Writer writer;
std::recursive_mutex recMtx;
dsp::stream<dsp::complex_t>* basebandStream;
dsp::stream<dsp::stereo_t>* stereoStream;
dsp::stream<dsp::stereo_t> stereoStream;
dsp::sink::Handler<dsp::complex_t> basebandSink;
dsp::sink::Handler<dsp::stereo_t> stereoSink;
dsp::sink::Handler<float> monoSink;