From: drowe67 Date: Sat, 1 Dec 2012 08:38:43 +0000 (+0000) Subject: fixed some registry probs on Win32, read & write formats were different. Think its... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=3d27b0331f5bc4293f0daffcca067a453386beab;p=freetel-svn-tracking.git fixed some registry probs on Win32, read & write formats were different. Think its OK now git-svn-id: https://svn.code.sf.net/p/freetel/code@1106 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/src/dlg_filter.cpp b/fdmdv2/src/dlg_filter.cpp index f81dc4e9..eba53af2 100644 --- a/fdmdv2/src/dlg_filter.cpp +++ b/fdmdv2/src/dlg_filter.cpp @@ -252,7 +252,7 @@ void FilterDlg::ExchangeData(int inout) m_beta = wxGetApp().m_codec2LPCPostFilterBeta; setBeta(); m_gamma = wxGetApp().m_codec2LPCPostFilterGamma; setGamma(); - // Mic In Equaliser + // Mic In Equaliser m_MicInBass.freqHz = wxGetApp().m_MicInBassFreqHz; setFreq(&m_MicInBass); m_MicInBass.freqHz = limit(m_MicInBass.freqHz, 1.0, MAX_FREQ_BASS); @@ -272,13 +272,13 @@ void FilterDlg::ExchangeData(int inout) pConfig->Write(wxT("/Filter/codec2LPCPostFilterEnable"), wxGetApp().m_codec2LPCPostFilterEnable); pConfig->Write(wxT("/Filter/codec2LPCPostFilterBassBoost"), wxGetApp().m_codec2LPCPostFilterBassBoost); - pConfig->Write(wxT("/Filter/codec2LPCPostFilterBeta"), m_beta*100.0); - pConfig->Write(wxT("/Filter/codec2LPCPostFilterGamma"), m_gamma*100.0); + pConfig->Write(wxT("/Filter/codec2LPCPostFilterBeta"), (int)(m_beta*100.0)); + pConfig->Write(wxT("/Filter/codec2LPCPostFilterGamma"), (int)(m_gamma*100.0)); // Mic In Equaliser wxGetApp().m_MicInBassFreqHz = m_MicInBass.freqHz; - pConfig->Write(wxT("/Filter/MicInBassFreqHz"), m_MicInBass.freqHz); + pConfig->Write(wxT("/Filter/MicInBassFreqHz"), (int)m_MicInBass.freqHz); pConfig->Flush(); } diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp index 14671c07..b758ff3b 100644 --- a/fdmdv2/src/fdmdv2_main.cpp +++ b/fdmdv2/src/fdmdv2_main.cpp @@ -330,7 +330,7 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent) wxGetApp().m_codec2LPCPostFilterBeta = (float)pConfig->Read(wxT("/Filter/codec2LPCPostFilterBeta"), CODEC2_LPC_PF_BETA*100)/100.0; //printf("main(): m_codec2LPCPostFilterBeta: %f\n", wxGetApp().m_codec2LPCPostFilterBeta); - wxGetApp().m_MicInBassFreqHz = pConfig->Read(wxT("/Filter/MicInBassFreqHz"), 1.0); + wxGetApp().m_MicInBassFreqHz = (float)pConfig->Read(wxT("/Filter/MicInBassFreqHz"), 1); wxGetApp().m_callSign = pConfig->Read("/Data/CallSign", wxT(""));