some GUI tweaks after interleaver testing with stored files

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

diff --git a/freedv-dev/src/fdmdv2_main.cpp b/freedv-dev/src/fdmdv2_main.cpp
index faed0576db00c054dd27e6e3cf1387d2ced2cbbe..a042c44461308d6b080c45026b5e35601c90822b 100644 (file)
--- a/freedv-dev/src/fdmdv2_main.cpp
+++ b/freedv-dev/src/fdmdv2_main.cpp
@@ -511,7 +511,7 @@ MainFrame::MainFrame(wxString plugInName, wxWindow *parent) : TopFrame(plugInNam
 
     wxGetApp().m_FreeDV700txClip = (float)pConfig->Read(wxT("/FreeDV700/txClip"), t);
     wxGetApp().m_FreeDV700Combine = 1;
-    wxGetApp().m_FreeDV700Interleave = (int)pConfig->Read(wxT("/FreeDV700/ninterleave"), 1);
+    wxGetApp().m_FreeDV700Interleave = (int)pConfig->Read(wxT("/FreeDV700/interleave"), 1);
     wxGetApp().m_FreeDV700ManualUnSync = (float)pConfig->Read(wxT("/FreeDV700/manualUnSync"), f);
 
     wxGetApp().m_noise_snr = (float)pConfig->Read(wxT("/Noise/noise_snr"), 2);
@@ -2301,6 +2301,9 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event)
         if (m_rbPlugIn != NULL)
             m_rbPlugIn->Disable();
 
+        m_textSync->Enable();
+        m_textInterleaverSync->Enable();
+        
         // determine what mode we are using
 
         if (m_rb1600->GetValue()) {
@@ -2358,7 +2361,12 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event)
                 struct freedv_advanced adv;
                 adv.interleave_frames = wxGetApp().m_FreeDV700Interleave;
                 g_pfreedv = freedv_open_advanced(g_mode, &adv);
-                m_textInterleaverSync->SetLabel("Interleaver");
+                m_textInterleaverSync->SetLabel("Intrlvr ("+wxString::Format(wxT("%i"),wxGetApp().m_FreeDV700Interleave)+")");
+                if (wxGetApp().m_FreeDV700ManualUnSync) {
+                    freedv_set_sync(g_pfreedv, FREEDV_SYNC_MANUAL);
+                } else {
+                    freedv_set_sync(g_pfreedv, FREEDV_SYNC_AUTO);
+                }
             } else {
                 g_pfreedv = freedv_open(g_mode);
                 m_textInterleaverSync->SetLabel("");
@@ -2402,7 +2410,7 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event)
         }
 
         modem_stats_open(&g_stats);
-        g_State = g_prev_State = 0;
+        g_State = g_prev_State = g_interleaverSyncState = 0;
         g_snr = 0.0;
         g_half_duplex = wxGetApp().m_boolHalfDuplex;
 
@@ -2510,6 +2518,9 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event)
 
         m_newMicInFilter = m_newSpkOutFilter = true;
 
+        m_textSync->Disable();
+        m_textInterleaverSync->Disable();
+        
         m_togBtnSplit->Disable();
         //m_togRxID->Disable();
         //m_togTxID->Disable();

diff --git a/freedv-dev/src/topFrame.cpp b/freedv-dev/src/topFrame.cpp
index ba158118a1fae17b9ba4df21a4c9719385ed282a..c1c49a6db65a5a35d1d6a3421cf7f8dc956aa23d 100644 (file)
--- a/freedv-dev/src/topFrame.cpp
+++ b/freedv-dev/src/topFrame.cpp
@@ -149,9 +149,11 @@ TopFrame::TopFrame(wxString plugInName, wxWindow* parent, wxWindowID id, const w
 
     m_textInterleaverSync = new wxStaticText(this, wxID_ANY, wxT("Interleaver"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE);
     sbSizer3_33->Add(m_textInterleaverSync, 0, wxALIGN_CENTER_HORIZONTAL , 1);
+    m_textSync->Disable();
 
     m_BtnReSync = new wxButton(this, wxID_ANY, _("ReSync"), wxDefaultPosition, wxDefaultSize, 0);
     sbSizer3_33->Add(m_BtnReSync, 0, wxALIGN_CENTRE , 1);
+    m_textInterleaverSync->Disable();
 
     leftSizer->Add(sbSizer3_33,0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 3);