mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2024-11-10 04:37:37 +01:00
more work on the new recorder
This commit is contained in:
parent
f4bd483410
commit
34b0577f3b
@ -98,7 +98,7 @@ public:
|
||||
}
|
||||
|
||||
void postInit() {
|
||||
selectStream("Radio");
|
||||
selectStream(selectedStreamName);
|
||||
}
|
||||
|
||||
void enable() {
|
||||
@ -179,26 +179,6 @@ public:
|
||||
recording = false;
|
||||
}
|
||||
|
||||
void selectStream(std::string name) {
|
||||
std::lock_guard<std::recursive_mutex> lck(recMtx);
|
||||
deselectStream();
|
||||
audioStream = sigpath::sinkManager.bindStream(name);
|
||||
if (!audioStream) { return; }
|
||||
selectedStreamName = name;
|
||||
volume.setInput(audioStream);
|
||||
startAudioPath();
|
||||
}
|
||||
|
||||
void deselectStream() {
|
||||
std::lock_guard<std::recursive_mutex> lck(recMtx);
|
||||
if (selectedStreamName.empty() || !audioStream) { return; }
|
||||
if (recording && recMode == RECORDER_MODE_AUDIO) { stop(); }
|
||||
stopAudioPath();
|
||||
sigpath::sinkManager.unbindStream(selectedStreamName, audioStream);
|
||||
selectedStreamName = "";
|
||||
audioStream = NULL;
|
||||
}
|
||||
|
||||
private:
|
||||
static void menuHandler(void* ctx) {
|
||||
RecorderModule* _this = (RecorderModule*)ctx;
|
||||
@ -303,6 +283,26 @@ private:
|
||||
}
|
||||
}
|
||||
|
||||
void selectStream(std::string name) {
|
||||
std::lock_guard<std::recursive_mutex> lck(recMtx);
|
||||
deselectStream();
|
||||
audioStream = sigpath::sinkManager.bindStream(name);
|
||||
if (!audioStream) { return; }
|
||||
selectedStreamName = name;
|
||||
volume.setInput(audioStream);
|
||||
startAudioPath();
|
||||
}
|
||||
|
||||
void deselectStream() {
|
||||
std::lock_guard<std::recursive_mutex> lck(recMtx);
|
||||
if (selectedStreamName.empty() || !audioStream) { return; }
|
||||
if (recording && recMode == RECORDER_MODE_AUDIO) { stop(); }
|
||||
stopAudioPath();
|
||||
sigpath::sinkManager.unbindStream(selectedStreamName, audioStream);
|
||||
selectedStreamName = "";
|
||||
audioStream = NULL;
|
||||
}
|
||||
|
||||
void startAudioPath() {
|
||||
volume.start();
|
||||
splitter.start();
|
||||
|
Loading…
Reference in New Issue
Block a user