fixed Test button destructor, thanks David T

git-svn-id: https://svn.code.sf.net/p/freetel/code@3317 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/freedv-dev/src/dlg_ptt.cpp b/freedv-dev/src/dlg_ptt.cpp
index 1a04c9c4e5034aaafc545ddd3b5be4451395e60e..588802e584773273c1bc58debd768bd63e696b24 100644 (file)
--- a/freedv-dev/src/dlg_ptt.cpp
+++ b/freedv-dev/src/dlg_ptt.cpp
@@ -212,7 +212,7 @@ ComPortsDlg::~ComPortsDlg()
     m_buttonOK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnOK), NULL, this);
     m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnCancel), NULL, this);
     m_buttonApply->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnApply), NULL, this);
-    m_buttonTest->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnTest), NULL, this);
+    m_buttonTest->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnTest), NULL, this);
 }
 
 //-------------------------------------------------------------------------

diff --git a/freedv-dev/src/fdmdv2_main.cpp b/freedv-dev/src/fdmdv2_main.cpp
index 506406c140525579faa4bfeb27b1dc534fb8aac5..d5db227731e5c12dc238cc09a6b64216e22a9da2 100644 (file)
--- a/freedv-dev/src/fdmdv2_main.cpp
+++ b/freedv-dev/src/fdmdv2_main.cpp
@@ -130,7 +130,7 @@ SpeexPreprocessState *g_speex_st;
 // WxWidgets - initialize the application
 IMPLEMENT_APP(MainApp);
 
-//FILE *ftest;
+FILE *ftest;
 FILE *g_logfile;
 
 //-------------------------------------------------------------------------
@@ -636,6 +636,7 @@ MainFrame::MainFrame(wxString plugInName, wxWindow *parent) : TopFrame(plugInNam
 
     //ftest = fopen("ftest.raw", "wb");
     //assert(ftest != NULL);
+
 }
 
 //-------------------------------------------------------------------------
@@ -2984,6 +2985,7 @@ void MainFrame::startRxStream()
     }
 }
 
+#ifdef __UDP_EPERIMENTAL__
 
 void MainFrame::processTxtEvent(char event[]) {
     int rule = 0;
@@ -3063,6 +3065,7 @@ void MainFrame::processTxtEvent(char event[]) {
         optionsDlg->updateEventLog(wxString(event), _("<no match>"));                     
     }
 }
+#endif
 
 
 #define SBQ_MAX_ARGS 4
@@ -3511,6 +3514,7 @@ void txRxProcessing()
             nout = resample(cbData->outsrc1, out48k_short, out8k_short, g_soundCard1SampleRate, samplerate, N48*4, n_samples);
             g_mutexProtectingCallbackData.Lock();
             ret = fifo_write(cbData->outfifo1, out48k_short, nout);
+            //fwrite(out48k_short, nout, sizeof(short), ftest);
             //fprintf(stderr,"nout: %d ret: %d N48*4: %d\n", nout, ret, N48*4);
 
             assert(ret != -1);