Move code out of frame, proper thread termination

src/AppFrame.h

@@ -2,14 +2,11 @@
 
 #include "wx/frame.h"
 #include "PrimaryGLContext.h"
-#include "SDRThread.h"
-#include "AudioThread.h"
-#include "DemodulatorMgr.h"
+
 
 #include "ScopeCanvas.h"
 #include "SpectrumCanvas.h"
 #include "WaterfallCanvas.h"
-#include "ThreadQueue.h"
 
 // Define a new frame type
 class AppFrame: public wxFrame {
@@ -19,8 +16,6 @@ public:
     void OnThread(wxCommandEvent& event);
     void OnEventInput(wxThreadEvent& event);
 
-    void setFrequency(unsigned int freq);
-    int getFrequency();
 
 private:
     void OnClose(wxCommandEvent& event);
@@ -31,23 +26,6 @@ private:
     SpectrumCanvas *spectrumCanvas;
     WaterfallCanvas *waterfallCanvas;
 
-    DemodulatorMgr demodMgr;
-
-    wxCriticalSection m_pThreadCS;
-    unsigned int frequency;
-
-    DemodulatorInstance *demodulatorTest;
-
-    AudioThreadInputQueue *audioInputQueue;
-    AudioThread *audioThread;
-
-    SDRThread *sdrThread;
-    SDRThreadCommandQueue* threadCmdQueueSDR;
-    SDRThreadIQDataQueue* iqVisualQueue;
-    DemodulatorThreadOutputQueue* audioVisualQueue;
-
-    std::thread *threadAudio;
-    std::thread *threadSDR;
 
 // event table
 wxDECLARE_EVENT_TABLE();