Trivial updates, looking for uninitialized variables and other loose ends.

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

diff --git a/fdmdv2/build/codelite/fdmdv2.mk b/fdmdv2/build/codelite/fdmdv2.mk
index d5ef007c599f151f85457890a3601e17f06839fe..eb4d452d4f852f8663b8a3acb4f3aea5cd16a0f8 100644 (file)
--- a/fdmdv2/build/codelite/fdmdv2.mk
+++ b/fdmdv2/build/codelite/fdmdv2.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=wittend\r
-Date                   :=12/29/2012\r
+Date                   :=12/30/2012\r
 CodeLitePath           :="D:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r

diff --git a/fdmdv2/build/codelite/fdmdv2.project b/fdmdv2/build/codelite/fdmdv2.project
index f02253d5ff3459b75a620084622af9e8a06c8d4c..e446b832e060630281f0d442297814d9d59c925e 100644 (file)
--- a/fdmdv2/build/codelite/fdmdv2.project
+++ b/fdmdv2/build/codelite/fdmdv2.project
@@ -65,7 +65,7 @@
     <Configuration Name="Debug" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
       <Compiler Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=yes)" C_Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=yes)" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
         <IncludePath Value="/bin/MinGW-4.6.1/msys/1.0/local/include"/>
-        <IncludePath Value="../../codec2-dev/src"/>
+        <IncludePath Value="../../../codec2-dev/src"/>
         <IncludePath Value="/bin/Projects/Audio/libsndfile/include"/>
         <Preprocessor Value="__WX__"/>
         <Preprocessor Value="_NO_AUTOTOOLS_=1"/>

diff --git a/fdmdv2/build/codelite/libCTB/libCTB.mk b/fdmdv2/build/codelite/libCTB/libCTB.mk
index 4fe13f214dfd163d22b551aaef00440351b5cf92..1f1c5844c4d6a75a07e5da562db0366295af2c16 100644 (file)
--- a/fdmdv2/build/codelite/libCTB/libCTB.mk
+++ b/fdmdv2/build/codelite/libCTB/libCTB.mk
@@ -2,18 +2,18 @@
 ## Auto Generated makefile by CodeLite IDE\r
 ## any manual changes will be erased      \r
 ##\r
-## Release\r
+## Debug\r
 ProjectName            :=libCTB\r
-ConfigurationName      :=Release\r
+ConfigurationName      :=Debug\r
 WorkspacePath          := "D:\Projects\Radio\fdmdv2\build\codelite"\r
 ProjectPath            := "D:\Projects\Radio\fdmdv2\build\codelite\libCTB"\r
-IntermediateDirectory  :=./Release\r
+IntermediateDirectory  :=./Debug\r
 OutDir                 := $(IntermediateDirectory)\r
 CurrentFileName        :=\r
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=wittend\r
-Date                   :=12/29/2012\r
+Date                   :=12/30/2012\r
 CodeLitePath           :="D:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
@@ -52,8 +52,8 @@ LibPath                := $(LibraryPathSwitch).
 AR       := ar rcus\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=    -DSVN_REVISION=\"1152\"  $(Preprocessors)\r
-CFLAGS   :=    -DSVN_REVISION=\"1152\"  $(Preprocessors)\r
+CXXFLAGS :=  -g  -DSVN_REVISION=\"1152\"  $(Preprocessors)\r
+CFLAGS   :=  -g  -DSVN_REVISION=\"1152\"  $(Preprocessors)\r
 \r
 \r
 ##\r
@@ -78,11 +78,11 @@ $(OutputFile): $(Objects)
        @echo "" > $(IntermediateDirectory)/.d\r
        @echo $(Objects) > $(ObjectsFileList)\r
        $(AR) $(ArchiveOutputSwitch)$(OutputFile) @$(ObjectsFileList) $(ArLibs)\r
-       @$(MakeDirCommand) "D:\Projects\Radio\fdmdv2\build\codelite\.build-release"\r
-       @echo rebuilt > "D:\Projects\Radio\fdmdv2\build\codelite\.build-release\libCTB"\r
+       @$(MakeDirCommand) "D:\Projects\Radio\fdmdv2\build\codelite\.build-debug"\r
+       @echo rebuilt > "D:\Projects\Radio\fdmdv2\build\codelite\.build-debug\libCTB"\r
 \r
-./Release:\r
-       @$(MakeDirCommand) "./Release"\r
+./Debug:\r
+       @$(MakeDirCommand) "./Debug"\r
 \r
 PreBuild:\r
 \r
@@ -208,6 +208,6 @@ clean:
        $(RM) $(IntermediateDirectory)/win32_timer$(PreprocessSuffix)\r
        $(RM) $(OutputFile)\r
        $(RM) $(OutputFile)\r
-       $(RM) "D:\Projects\Radio\fdmdv2\build\codelite\.build-release\libCTB"\r
+       $(RM) "D:\Projects\Radio\fdmdv2\build\codelite\.build-debug\libCTB"\r
 \r
 \r

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index 0d5db73e6f1801e27dc987da9ea4ae6496224a78..63ec85ecaaa7cc398b15eba9c9ba06da145a05dd 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -718,16 +718,6 @@ void MainFrame::OnCloseFrame(wxCloseEvent& event)
     Pa_Terminate();
     Destroy();
 }
-/*
-//-------------------------------------------------------------------------
-// OnExitClick()
-//-------------------------------------------------------------------------
-void MainFrame::OnExitClick(wxCommandEvent& event)
-{
-    Pa_Terminate();
-    Destroy();
-}
-*/
 
 //-------------------------------------------------------------------------
 // OnTop()
@@ -906,7 +896,6 @@ void MainFrame::OnTogBtnPTT (wxCommandEvent& event)
     m_maxLevel = 0;
     m_textLevel->SetLabel(wxT(""));
     m_gaugeLevel->SetValue(0);
-
     event.Skip();
 }
 

diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h
index ef5a9de472dca4bada65843164f7bbb638a3be36..5635c00a4ff9a9a89fc01fbedbc4003e24aee486 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.h
+++ b/fdmdv2/src/fdmdv2_main.h
@@ -154,7 +154,6 @@ class MainApp : public wxApp
         bool                m_snrSlow;
 
         // LPC Post Filter
-
         bool                m_codec2LPCPostFilterEnable;
         bool                m_codec2LPCPostFilterBassBoost;
         float               m_codec2LPCPostFilterGamma;
@@ -224,19 +223,16 @@ typedef struct
     struct FIFO    *outfifo1;
 
     // FIFOs attached to second sound card
-
     struct FIFO    *infifo2;
     struct FIFO    *outfifo2;
 
     // FIFOs for rx process
-
     struct FIFO    *rxinfifo;
     struct FIFO    *rxoutfifo;
 
     int             inputChannels1, inputChannels2;
 
     // EQ filter states
-
     void           *sbqMicInBass;
     void           *sbqMicInTreble;
     void           *sbqMicInMid;
@@ -269,11 +265,13 @@ class MyExtraRecFilePanel : public wxPanel
 {
 public:
     MyExtraRecFilePanel(wxWindow *parent);
-    ~MyExtraRecFilePanel() {
+    ~MyExtraRecFilePanel() 
+    {
         wxLogDebug("Destructor\n");
     }
     void setSecondsToRecord(wxString value) { m_secondsToRecord->SetValue(value); }
-    wxString getSecondsToRecord(void) { 
+    wxString getSecondsToRecord(void) 
+    { 
         wxLogDebug("getSecondsToRecord: %s\n",m_secondsToRecord->GetValue());
         return m_secondsToRecord->GetValue(); 
     }

diff --git a/fdmdv2/src/fdmdv2_plot_waterfall_linux.cpp b/fdmdv2/src/fdmdv2_plot_waterfall_linux.cpp
index f2368a51fbad67adca006cfcbb8dcfa587f27560..34cd316404bdfb532244a18fe12157ef1689689a 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot_waterfall_linux.cpp
+++ b/fdmdv2/src/fdmdv2_plot_waterfall_linux.cpp
@@ -338,15 +338,17 @@ void PlotWaterfall::plotPixelData()
     dy_blocks = m_rGrid.GetHeight()/ dy;
 
     // update min and max amplitude estimates
-
     float max_mag = MIN_MAG_DB;
 
     int min_fft_bin=((float)200/FDMDV_MAX_F_HZ)*FDMDV_NSPEC;
     int max_fft_bin=((float)2800/FDMDV_MAX_F_HZ)*FDMDV_NSPEC;
 
-    for(int i=min_fft_bin; i<max_fft_bin; i++) {
+    for(int i=min_fft_bin; i<max_fft_bin; i++) 
+    {
         if (g_avmag[i] > max_mag)
+        {
             max_mag = g_avmag[i];
+        }
     }
 
     m_max_mag = BETA*m_max_mag + (1 - BETA)*max_mag;
@@ -363,7 +365,6 @@ void PlotWaterfall::plotPixelData()
     */
 
     // Shift previous bit map up one row of blocks ----------------------------
-
     wxNativePixelData data(*m_pBmp);
     assert(data != NULL);
     wxNativePixelData::Iterator bitMapStart(data);

diff --git a/fdmdv2/src/topFrame.h b/fdmdv2/src/topFrame.h
index 4c319c0b9a8319db378bc35b2a323a2358b882a6..9195fd632295d84feb0a8a9d3b40e4b0f9211114 100644 (file)
--- a/fdmdv2/src/topFrame.h
+++ b/fdmdv2/src/topFrame.h
@@ -152,13 +152,11 @@ class TopFrame : public wxFrame
         wxToggleButton* m_btnTogPTT;
         wxToggleButton* m_togBtnLoopRx;
         wxToggleButton* m_togBtnLoopTx;
-
         wxAuiNotebook* m_auiNbookCtrl;
 
         TopFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("FreeDV ") + _(FREEDV_VERSION), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 761,500 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
 
         ~TopFrame();
-
 };
 
 #endif //__TOPFRAME_H__