From ca4b1433aabc4083e833ae8fcea9ed72ef5b14d0 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Mon, 7 Nov 2022 20:19:43 -0800 Subject: [PATCH] Default to 2020/2020B/2020C on next start if used last time. --- src/main.cpp | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 2bdab8dc..3f267f2d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -546,7 +546,9 @@ void MainFrame::loadConfiguration_() // Time in seconds after losing sync before we reset the stats area wxGetApp().m_statsResetTimeSec = (int)pConfig->Read(wxT("/Stats/ResetTime"), (int)10); - int mode = pConfig->Read(wxT("/Audio/mode"), (long)4); + int defaultMode = 4; + int mode = pConfig->Read(wxT("/Audio/mode"), (long)defaultMode); +setDefaultMode: if (mode == 0) m_rb1600->SetValue(1); if (mode == 3) @@ -561,6 +563,32 @@ void MainFrame::loadConfiguration_() m_rb2400b->SetValue(1); if ((mode == 9) && wxGetApp().m_2020Allowed) m_rb2020->SetValue(1); + else if (mode == 9) + { + // Default to 700D otherwise + mode = defaultMode; + goto setDefaultMode; + } +#if defined(FREEDV_MODE_2020B) + if ((mode == 10) && wxGetApp().m_2020Allowed) + m_rb2020b->SetValue(1); + else if (mode == 10) + { + // Default to 700D otherwise + mode = defaultMode; + goto setDefaultMode; + } +#endif // defined(FREEDV_MODE_2020B) +#if defined(FREEDV_MODE_2020C) + if ((mode == 11) && wxGetApp().m_2020Allowed) + m_rb2020c->SetValue(1); + else if (mode == 11) + { + // Default to 700D otherwise + mode = defaultMode; + goto setDefaultMode; + } +#endif // defined(FREEDV_MODE_2020B) pConfig->SetPath(wxT("/")); m_togBtnSplit->Disable(); @@ -917,6 +945,14 @@ MainFrame::~MainFrame() mode = 7; if (m_rb2020->GetValue()) mode = 9; +#if defined(FREEDV_MODE_2020B) + if (m_rb2020b->GetValue()) + mode = 10; +#endif // defined(FREEDV_MODE_2020B) +#if defined(FREEDV_MODE_2020C) + if (m_rb2020c->GetValue()) + mode = 11; +#endif // defined(FREEDV_MODE_2020C) pConfig->Write(wxT("/Audio/mode"), mode); pConfig->Flush();