made sure UDP code disabled, trapped use of carrier attn feature outside of 700C...

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

diff --git a/freedv-dev/src/dlg_options.cpp b/freedv-dev/src/dlg_options.cpp
index 499ca5659eeceabc97b39513221a0f9ff69c47b4..79b6c87f2ca93cd05c03acbfd00b9ce48bd11aed 100644 (file)
--- a/freedv-dev/src/dlg_options.cpp
+++ b/freedv-dev/src/dlg_options.cpp
@@ -566,13 +566,19 @@ void OptionsDlg::OnAttnCarrierEn(wxScrollEvent& event) {
     /* uncheck -> checked, attenuate selected carrier */
 
     if (m_ckboxAttnCarrierEn->GetValue() && !wxGetApp().m_attn_carrier_en) {
-        freedv_set_carrier_ampl(g_pfreedv, wxGetApp().m_attn_carrier, 0.25);
+        if (freedv_get_mode(g_pfreedv) == FREEDV_MODE_700C) {
+            freedv_set_carrier_ampl(g_pfreedv, wxGetApp().m_attn_carrier, 0.25);
+        } else {
+            wxMessageBox("Carrier attenuation feature only works on 700C", wxT("Warning"), wxOK | wxICON_WARNING, this);
+        }
     }
 
     /* checked -> unchecked, reset selected carrier */
 
     if (!m_ckboxAttnCarrierEn->GetValue() && wxGetApp().m_attn_carrier_en) {
-        freedv_set_carrier_ampl(g_pfreedv, wxGetApp().m_attn_carrier, 1.0);
+        if (freedv_get_mode(g_pfreedv) == FREEDV_MODE_700C) {
+            freedv_set_carrier_ampl(g_pfreedv, wxGetApp().m_attn_carrier, 1.0);
+        }
     }
         
     wxGetApp().m_attn_carrier_en = m_ckboxAttnCarrierEn->GetValue();    

diff --git a/freedv-dev/src/fdmdv2_main.cpp b/freedv-dev/src/fdmdv2_main.cpp
index 8e1ac046d745ca7b9f599918f4a00adb1873be3a..506406c140525579faa4bfeb27b1dc534fb8aac5 100644 (file)
--- a/freedv-dev/src/fdmdv2_main.cpp
+++ b/freedv-dev/src/fdmdv2_main.cpp
@@ -3864,6 +3864,8 @@ void MainFrame::CloseSerialPort(void)
 }
 
 
+#ifdef __UDP_SUPPORT__
+
 //----------------------------------------------------------------
 // PollUDP() - see if any commands on UDP port
 //----------------------------------------------------------------
@@ -3976,6 +3978,7 @@ void *UDPThread::Entry() {
     return NULL;
 }
 
+#endif
 
 char my_get_next_tx_char(void *callback_state) {
     short ch = 0;