more work on the new recorder

misc_modules/recorder/src/main.cpp

@@ -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();