From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Fri, 4 May 2018 22:15:35 +0000 (+0000)
Subject: some GUI tweaks after interleaver testing with stored files
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=930a7fe95cd73fe986be1d17006e99d7dd8cf8ce;p=freetel-svn-tracking.git

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 faed0576..a042c444 100644
--- 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 ba158118..c1c49a6d 100644
--- 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);