From 608e0bc0d0f101b0c58ad847714b4e436c467b10 Mon Sep 17 00:00:00 2001
From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Wed, 19 Jul 2017 22:18:22 +0000
Subject: [PATCH] fixed Test button destructor, thanks David T
git-svn-id: https://svn.code.sf.net/p/freetel/code@3317 01035d8c-6547-0410-b346-abe4f91aad63
---
freedv-dev/src/dlg_ptt.cpp | 2 +-
freedv-dev/src/fdmdv2_main.cpp | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/freedv-dev/src/dlg_ptt.cpp b/freedv-dev/src/dlg_ptt.cpp
index 1a04c9c4..588802e5 100644
--- 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 506406c1..d5db2277 100644
--- 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);
--
2.25.1