changed labels on audo config test, fifo header file change

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

diff --git a/fdmdv2/src/dlg_audiooptions.cpp b/fdmdv2/src/dlg_audiooptions.cpp
index 99a1257eec9c5194c454cafd06efa4dbec1db284..703e888af2aca5ae391c0b4ad70b39e93f647099 100644 (file)
--- a/fdmdv2/src/dlg_audiooptions.cpp
+++ b/fdmdv2/src/dlg_audiooptions.cpp
@@ -40,7 +40,8 @@ void AudioOptsDialog::Pa_Init(void)
 }
 
 
-void AudioOptsDialog::buildTestControls(PlotScalar **plotScalar, wxButton **btnTest, wxPanel *parentPanel, wxBoxSizer *bSizer)
+void AudioOptsDialog::buildTestControls(PlotScalar **plotScalar, wxButton **btnTest, 
+                                        wxPanel *parentPanel, wxBoxSizer *bSizer, char buttonLabel[])
 {
     wxBoxSizer* bSizer1 = new wxBoxSizer(wxVERTICAL);
 
@@ -49,7 +50,7 @@ void AudioOptsDialog::buildTestControls(PlotScalar **plotScalar, wxButton **btnT
     (*plotScalar)->SetClientSize(wxSize(TEST_WAVEFORM_X,TEST_WAVEFORM_Y));
     bSizer1->Add(panel, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 8);
 
-    *btnTest = new wxButton(parentPanel, wxID_ANY, _("Test"), wxDefaultPosition, wxDefaultSize);
+    *btnTest = new wxButton(parentPanel, wxID_ANY, wxString(buttonLabel), wxDefaultPosition, wxDefaultSize);
     bSizer1->Add(*btnTest, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 0);
 
     bSizer->Add(bSizer1, 0, wxALIGN_CENTER_HORIZONTAL |wxALIGN_CENTER_VERTICAL );
@@ -102,7 +103,7 @@ AudioOptsDialog::AudioOptsDialog(wxWindow* parent, wxWindowID id, const wxString
     bSizer811a->Add(bSizer811, 0, wxEXPAND, 5);
 
     sbSizer2->Add(bSizer811a, 1, wxEXPAND, 2);
-    buildTestControls(&m_plotScalarRxIn, &m_btnRxInTest, m_panelRx, sbSizer2);
+    buildTestControls(&m_plotScalarRxIn, &m_btnRxInTest, m_panelRx, sbSizer2, "Rec 2s");
 
     gSizer4->Add(sbSizer2, 1, wxEXPAND, 5);
 
@@ -132,7 +133,7 @@ AudioOptsDialog::AudioOptsDialog(wxWindow* parent, wxWindowID id, const wxString
     bSizer81a->Add(bSizer81, 0, wxEXPAND, 5);
 
     sbSizer3->Add(bSizer81a, 1, wxEXPAND, 2);
-    buildTestControls(&m_plotScalarRxOut, &m_btnRxOutTest, m_panelRx, sbSizer3);
+    buildTestControls(&m_plotScalarRxOut, &m_btnRxOutTest, m_panelRx, sbSizer3, "Play 2s");
  
     gSizer4->Add(sbSizer3, 1, wxEXPAND, 2);
     bSizer20->Add(gSizer4, 1, wxEXPAND, 1);
@@ -174,7 +175,7 @@ AudioOptsDialog::AudioOptsDialog(wxWindow* parent, wxWindowID id, const wxString
     bSizer83a->Add(bSizer83, 0, wxEXPAND, 5);
 
     sbSizer22->Add(bSizer83a, 1, wxEXPAND, 2);
-    buildTestControls(&m_plotScalarTxIn, &m_btnTxInTest, m_panelTx, sbSizer22);
+    buildTestControls(&m_plotScalarTxIn, &m_btnTxInTest, m_panelTx, sbSizer22, "Rec 2s");
 
     gSizer2->Add(sbSizer22, 1, wxEXPAND, 5);
 
@@ -203,7 +204,7 @@ AudioOptsDialog::AudioOptsDialog(wxWindow* parent, wxWindowID id, const wxString
     bSizer82a->Add(bSizer82, 0, wxEXPAND, 5);
 
     sbSizer21->Add(bSizer82a, 1, wxEXPAND, 2);
-    buildTestControls(&m_plotScalarTxOut, &m_btnTxOutTest, m_panelTx, sbSizer21);
+    buildTestControls(&m_plotScalarTxOut, &m_btnTxOutTest, m_panelTx, sbSizer21, "Play 2s");
 
     gSizer2->Add(sbSizer21, 1, wxEXPAND, 5);
     bSizer18->Add(gSizer2, 1, wxEXPAND, 1);

diff --git a/fdmdv2/src/dlg_audiooptions.h b/fdmdv2/src/dlg_audiooptions.h
index 410d9bbab71cad4d0dc79833b9f93905e25c2ea5..e83f3a8e37b2e06f20a164d1fcfb9551cbc185a9 100644 (file)
--- a/fdmdv2/src/dlg_audiooptions.h
+++ b/fdmdv2/src/dlg_audiooptions.h
@@ -55,7 +55,8 @@ class AudioOptsDialog : public wxDialog
         int             txInAudioDeviceNum;
         int             txOutAudioDeviceNum;
 
-        void buildTestControls(PlotScalar **plotScalar, wxButton **btnTest, wxPanel *parentPanel, wxBoxSizer *bSizer);
+        void buildTestControls(PlotScalar **plotScalar, wxButton **btnTest, 
+                               wxPanel *parentPanel, wxBoxSizer *bSizer,char buttonLabel[]);
         void plotDeviceInputForAFewSecs(int devNum, PlotScalar *plotScalar);
         void plotDeviceOutputForAFewSecs(int devNum, PlotScalar *plotScalar);
 

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index 86174ce4dbc809d42feb84cad7896d71431b2366..090b17b0ae71c5c92099aeec9466626f148ae344 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -1127,10 +1127,9 @@ void MainFrame::stopRxStream()
 void MainFrame::OnTogBtnLoopRx( wxCommandEvent& event )
 {
     if (mute_mic == 0)
-    mute_mic = 1;
+        mute_mic = 1;
     else
-    mute_mic = 0;
-
+        mute_mic = 0;
 }
 
 //----------------------------------------------------------
@@ -1139,10 +1138,9 @@ void MainFrame::OnTogBtnLoopRx( wxCommandEvent& event )
 void MainFrame::OnTogBtnLoopTx( wxCommandEvent& event )
 {
     if (read_file == 0)
-    read_file = 1;
+        read_file = 1;
     else
-    read_file = 0;
-
+        read_file = 0;
 }
 
 void MainFrame::destroy_fifos(void)
@@ -1600,7 +1598,7 @@ void txRxProcessing()
         // between this sound card and sound card 2.
 
         g_mutexProtectingCallbackData.Lock();
-        while((unsigned)fifo_n(cbData->outfifo1) < 6*N48) {
+        while((unsigned)fifo_used(cbData->outfifo1) < 6*N48) {
             g_mutexProtectingCallbackData.Unlock();
 
             int   nsam = g_soundCard2SampleRate * (float)codec2_samples_per_frame(g_pCodec2)/FS;