Remove dependencies in Icon files in dlg_audiooptions.*. Eliminated use of icons...

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

diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk
index 1b4accd3c25b7dbc379f052b145259b1004adf03..7bbbf745f1e5d92f6055f440b3d7f536ede047db 100644 (file)
--- a/fdmdv2/build/fdmdv2.mk
+++ b/fdmdv2/build/fdmdv2.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=OFA-Staff\r
-Date                   :=11/6/2012\r
+Date                   :=11/7/2012\r
 CodeLitePath           :="C:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
@@ -52,8 +52,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/Project
 AR       := ar rcus\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"937\"  $(Preprocessors)\r
-CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"937\"  $(Preprocessors)\r
+CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"938\"  $(Preprocessors)\r
+CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"938\"  $(Preprocessors)\r
 \r
 \r
 ##\r

diff --git a/fdmdv2/build/fdmdv2_wsp.mk b/fdmdv2/build/fdmdv2_wsp.mk
index e920a49f92d611834cd057fddc19ad80c7942a1c..ba22ce2d75b388f7fba2cb51ffe248da72e1825d 100644 (file)
--- a/fdmdv2/build/fdmdv2_wsp.mk
+++ b/fdmdv2/build/fdmdv2_wsp.mk
@@ -1,8 +1,8 @@
 .PHONY: clean All
 
 All:
-       @echo "----------Building project:[ fdmdv2 - Release ]----------"
-       @"$(MAKE)" -f "fdmdv2.mk"
+       @echo "----------Building project:[ rawbits - Release ]----------"
+       @cd "C:\bin\Projects\Radio\fdmdv2\tests\image" && "$(MAKE)" -f "rawbits.mk"
 clean:
-       @echo "----------Cleaning project:[ fdmdv2 - Release ]----------"
-       @"$(MAKE)" -f "fdmdv2.mk" clean
+       @echo "----------Cleaning project:[ rawbits - Release ]----------"
+       @cd "C:\bin\Projects\Radio\fdmdv2\tests\image" && "$(MAKE)" -f "rawbits.mk" clean

diff --git a/fdmdv2/src/dlg_audiooptions.cpp b/fdmdv2/src/dlg_audiooptions.cpp
index c90ac40449216ce7879640f157f084b267edf734..c120249d8737df3e7f9ffa9d3d21e0eedc96c34d 100644 (file)
--- a/fdmdv2/src/dlg_audiooptions.cpp
+++ b/fdmdv2/src/dlg_audiooptions.cpp
@@ -22,37 +22,6 @@ AudioOptsDialog::AudioOptsDialog(wxWindow* parent, wxWindowID id, const wxString
 \r
     m_isPaInitialized = false;\r
 \r
-    // Make an image list containing large icons\r
-    m_imageListNormal = new wxImageList(32, 32, true);\r
-    m_imageListSmall  = new wxImageList(16, 16, true);\r
-\r
-#ifdef __WXMSW__\r
-    // Give it an icon\r
-    SetIcon(wxICON("bitmaps/sample.ico"));\r
-\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchec.ico"),       wxBITMAP_TYPE_ICO));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/transparent.ico"),    wxBITMAP_TYPE_ICO));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchar.ico"),       wxBITMAP_TYPE_ICO));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/tooldata.ico"),       wxBITMAP_TYPE_ICO));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolgame.ico"),       wxBITMAP_TYPE_ICO));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolnote.ico"),       wxBITMAP_TYPE_ICO));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/tooltime.ico"),       wxBITMAP_TYPE_ICO));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/inArrow16x16.ico"),   wxBITMAP_TYPE_ICO));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/outArrow16x16.ico"),  wxBITMAP_TYPE_ICO));\r
-#else\r
-    // Give it an icon\r
-    SetIcon(wxICON("bitmaps/sample.xpm"));\r
-\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchec.xpm"),       wxBITMAP_TYPE_XPM, -1, -1));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/transparent.xpm"),    wxBITMAP_TYPE_XPM, -1, -1));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchar.xpm"),       wxBITMAP_TYPE_XPM, -1, -1));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/tooldata.xpm"),       wxBITMAP_TYPE_XPM, -1, -1));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolgame.xpm"),       wxBITMAP_TYPE_XPM, -1, -1));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolnote.xpm"),       wxBITMAP_TYPE_XPM, -1, -1));\r
-    m_imageListSmall->Add(wxIcon(wxT("bitmaps/tooltime.xpm"),       wxBITMAP_TYPE_XPM, -1, -1));\r
-//    m_imageListSmall->Add(wxIcon(wxT("bitmaps/inArrow16x16.xpm"),     wxBITMAP_TYPE_XPM));\r
-//    m_imageListSmall->Add(wxIcon(wxT("bitmaps/outArrow16x16.xpm"),    wxBITMAP_TYPE_XPM));\r
- #endif\r
     if(!m_isPaInitialized)\r
     {\r
         if((pa_err = Pa_Initialize()) == paNoError)\r
@@ -348,6 +317,7 @@ void AudioOptsDialog::ExchangeData(int inout)
     delete wxConfigBase::Set((wxConfigBase *) NULL);
 }
 \r
+/*\r
 //-------------------------------------------------------------------------\r
 // OnDeviceSelect()\r
 //-------------------------------------------------------------------------\r
@@ -358,6 +328,7 @@ void AudioOptsDialog::OnDeviceSelect(wxListEvent& event)
     item = m_listCtrlRxInDevices->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);\r
     wxMessageBox(m_listCtrlRxInDevices->GetItemText(item, 2), wxT("Item"), wxOK);\r
 }\r
+*/\r
 \r
 //-------------------------------------------------------------------------\r
 // DisplaySupportedSampleRates()\r
@@ -456,6 +427,7 @@ void AudioOptsDialog::populateParams(AudioInfoDisplay ai)
     wxListItem  listItem;\r
     wxString    buf;\r
     int         devn;\r
+    int         col = 0;\r
 \r
     numDevices = Pa_GetDeviceCount();\r
 \r
@@ -463,52 +435,45 @@ void AudioOptsDialog::populateParams(AudioInfoDisplay ai)
     {\r
         ctrl->ClearAll();\r
     }\r
-    //ctrl->SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);\r
-\r
-    listItem.SetAlign(wxLIST_FORMAT_CENTRE);\r
-    listItem.SetText(wxT("Sel"));\r
-    idx = ctrl->InsertColumn(0, listItem);\r
-    ctrl->SetColumnWidth(0, 37);\r
-\r
     listItem.SetAlign(wxLIST_FORMAT_CENTRE);\r
     listItem.SetText(wxT("Dflt"));\r
-    idx = ctrl->InsertColumn(1, listItem);\r
-    ctrl->SetColumnWidth(1, 37);\r
+    idx = ctrl->InsertColumn(col, listItem);\r
+    ctrl->SetColumnWidth(col++, 37);\r
 \r
     listItem.SetAlign(wxLIST_FORMAT_LEFT);\r
     listItem.SetText(wxT("Device"));\r
-    idx = ctrl->InsertColumn(2, listItem);\r
-    ctrl->SetColumnWidth(2, 190);\r
+    idx = ctrl->InsertColumn(col, listItem);\r
+    ctrl->SetColumnWidth(col++, 190);\r
 \r
     listItem.SetAlign(wxLIST_FORMAT_LEFT);\r
     listItem.SetText(wxT("API"));\r
-    idx = ctrl->InsertColumn(3, listItem);\r
-    ctrl->SetColumnWidth(3, 190);\r
+    idx = ctrl->InsertColumn(col, listItem);\r
+    ctrl->SetColumnWidth(col++, 190);\r
 \r
     if(in_out == AUDIO_IN)\r
     {\r
         listItem.SetAlign(wxLIST_FORMAT_CENTRE);\r
         listItem.SetText(wxT("# Inputs"));\r
-        idx = ctrl->InsertColumn(4, listItem);\r
-        ctrl->SetColumnWidth(4, 75);\r
+        idx = ctrl->InsertColumn(col, listItem);\r
+        ctrl->SetColumnWidth(col++, 75);\r
     }\r
     else if(in_out == AUDIO_OUT)\r
     {\r
         listItem.SetAlign(wxLIST_FORMAT_CENTRE);\r
         listItem.SetText(wxT("# Outputs"));\r
-        idx = ctrl->InsertColumn(4, listItem);\r
-        ctrl->SetColumnWidth(4, 75);\r
+        idx = ctrl->InsertColumn(col, listItem);\r
+        ctrl->SetColumnWidth(col++, 75);\r
     }\r
 \r
     listItem.SetAlign(wxLIST_FORMAT_CENTRE);\r
     listItem.SetText(wxT("Min Latency"));\r
-    ctrl->InsertColumn(5, listItem);\r
-    ctrl->SetColumnWidth(5, 100);\r
+    ctrl->InsertColumn(col, listItem);\r
+    ctrl->SetColumnWidth(col++, 100);\r
 \r
     listItem.SetAlign(wxLIST_FORMAT_CENTRE);\r
     listItem.SetText(wxT("Max Latency"));\r
-    ctrl->InsertColumn(6, listItem);\r
-    ctrl->SetColumnWidth(6, 100);\r
+    ctrl->InsertColumn(col, listItem);\r
+    ctrl->SetColumnWidth(col++, 100);\r
 \r
     for(devn = 0; devn < numDevices; devn++)\r
     {\r
@@ -518,87 +483,86 @@ void AudioOptsDialog::populateParams(AudioInfoDisplay ai)
         {\r
             if(deviceInfo->maxInputChannels > 0)\r
             {\r
-                idx = ctrl->InsertItem(j, ICON_TRANSPARENT);\r
+                col = 0;\r
                 defaultDisplayed = false;\r
                 if(devn == Pa_GetDefaultInputDevice())\r
                 {\r
                     buf.Printf("->>");\r
-                    ctrl->SetItem(idx, 1, buf);\r
                     defaultDisplayed = true;\r
                 }\r
                 else if(devn == Pa_GetHostApiInfo(deviceInfo->hostApi)->defaultInputDevice)\r
                 {\r
                     buf.Printf("-->");\r
-                    ctrl->SetItem(idx, 1, buf);\r
                     defaultDisplayed = true;\r
                 }\r
                 else\r
                 {\r
                     buf.Printf("---");\r
-                    ctrl->SetItem(idx, 1, buf);\r
                     defaultDisplayed = false;\r
                 }\r
+                idx = ctrl->InsertItem(idx, buf);\r
+                col++;\r
                 buf.Printf(wxT("%s"), deviceInfo->name);\r
-                ctrl->SetItem(idx, 2, buf);\r
+                ctrl->SetItem(idx, col++, buf);\r
                 if(defaultDisplayed)\r
                 {\r
                     ai.m_textDevice->SetValue(buf);\r
                 }\r
 \r
                 buf.Printf(wxT("%s"), Pa_GetHostApiInfo(deviceInfo->hostApi)->name);\r
-                ctrl->SetItem(idx, 3, buf);\r
+                ctrl->SetItem(idx, col++, buf);\r
 \r
                 buf.Printf(wxT("%i"), deviceInfo->maxInputChannels);\r
-                ctrl->SetItem(idx, 4, buf);\r
+                ctrl->SetItem(idx, col++, buf);\r
 \r
                 buf.Printf(wxT("%8.4f"), deviceInfo->defaultLowInputLatency);\r
-                ctrl->SetItem(idx, 5, buf);\r
+                ctrl->SetItem(idx, col++, buf);\r
 \r
                 buf.Printf(wxT("%8.4f"), deviceInfo->defaultHighInputLatency);\r
-                ctrl->SetItem(idx, 6, buf);\r
+                ctrl->SetItem(idx, col++, buf);\r
             }\r
         }\r
         else if(in_out == AUDIO_OUT)\r
         {\r
+            col = 0;\r
             if(deviceInfo->maxOutputChannels > 0)\r
             {\r
-                idx = ctrl->InsertItem(j, ICON_TRANSPARENT);\r
                 defaultDisplayed = false;\r
                 if(devn == Pa_GetDefaultOutputDevice())\r
                 {\r
                     buf.Printf("<<-");\r
-                    ctrl->SetItem(idx, 1, buf);\r
                     defaultDisplayed = true;\r
                 }\r
                 else if(devn == Pa_GetHostApiInfo(deviceInfo->hostApi)->defaultOutputDevice)\r
                 {\r
                     buf.Printf("<--");\r
-                    ctrl->SetItem(idx, 1, buf);\r
                     defaultDisplayed = true;\r
                 }\r
                 else\r
                 {\r
                     buf.Printf("---");\r
-                    ctrl->SetItem(idx, 1, buf);\r
+                    defaultDisplayed = false;\r
                 }\r
+                idx = ctrl->InsertItem(idx, buf);\r
+                col++;\r
                 buf.Printf(wxT("%s"), deviceInfo->name);\r
-                ctrl->SetItem(idx, 2, buf);\r
+                ctrl->SetItem(idx, col++, buf);\r
                 if(defaultDisplayed)\r
                 {\r
                     ai.m_textDevice->SetValue(buf);\r
                 }\r
 \r
                 buf.Printf(wxT("%s"), Pa_GetHostApiInfo(deviceInfo->hostApi)->name);\r
-                ctrl->SetItem(idx, 3, buf);\r
+                ctrl->SetItem(idx, col++, buf);\r
 \r
                 buf.Printf(wxT("%i"), deviceInfo->maxOutputChannels);\r
-                ctrl->SetItem(idx, 4, buf);\r
+                ctrl->SetItem(idx, col++, buf);\r
 \r
                 buf.Printf(wxT("%8.4f"), deviceInfo->defaultLowOutputLatency);\r
-                ctrl->SetItem(idx, 5, buf);\r
+                ctrl->SetItem(idx, col++, buf);\r
 \r
                 buf.Printf(wxT("%8.4f"), deviceInfo->defaultHighOutputLatency);\r
-                ctrl->SetItem(idx, 6, buf);\r
+                ctrl->SetItem(idx, col++, buf);\r
             }\r
         }\r
         j++;\r
@@ -614,7 +578,7 @@ void AudioOptsDialog::OnRxInDeviceSelect(wxListEvent& evt)
     wxString str;\r
     int index = evt.GetIndex();\r
 \r
-    str = m_listCtrlRxInDevices->GetItemText(index, 2);\r
+    str = m_listCtrlRxInDevices->GetItemText(index, 1);\r
     m_textCtrlRxIn->SetValue(str);\r
 }\r
 \r
@@ -626,7 +590,7 @@ void AudioOptsDialog::OnRxOutDeviceSelect(wxListEvent& evt)
     wxString str;\r
     int index = evt.GetIndex();\r
 \r
-    str = m_listCtrlRxOutDevices->GetItemText(index, 2);\r
+    str = m_listCtrlRxOutDevices->GetItemText(index, 1);\r
     m_textCtrlRxOut->SetValue(str);\r
 }\r
 \r
@@ -638,7 +602,7 @@ void AudioOptsDialog::OnTxInDeviceSelect(wxListEvent& evt)
     wxString str;\r
     int index = evt.GetIndex();\r
 \r
-    str = m_listCtrlTxInDevices->GetItemText(index, 2);\r
+    str = m_listCtrlTxInDevices->GetItemText(index, 1);\r
     m_textCtrlTxIn->SetValue(str);\r
 }\r
 \r
@@ -650,7 +614,7 @@ void AudioOptsDialog::OnTxOutDeviceSelect(wxListEvent& evt)
     wxString str;\r
     int index = evt.GetIndex();\r
 \r
-    str = m_listCtrlTxOutDevices->GetItemText(index, 2);\r
+    str = m_listCtrlTxOutDevices->GetItemText(index, 1);\r
     m_textCtrlTxOut->SetValue(str);\r
 }\r
 \r

diff --git a/fdmdv2/src/dlg_audiooptions.h b/fdmdv2/src/dlg_audiooptions.h
index 0a08e853faf73054bc36a7090b18fcc97a60106f..0daa8088c01b2db23027114a403d4397a2613282 100644 (file)
--- a/fdmdv2/src/dlg_audiooptions.h
+++ b/fdmdv2/src/dlg_audiooptions.h
@@ -19,21 +19,6 @@
 #define AUDIO_IN            0\r
 #define AUDIO_OUT           1\r
 \r
-#define ICON_TRANSPARENT    1\r
-#define ICON_CHECK          0\r
-#define ICON_toolchar       2\r
-#define ICON_tooldata       3\r
-#define ICON_toolgame       4\r
-#define ICON_toolnote       5\r
-#define ICON_TOOLTIME       6\r
-#define ICON_INARROW        7\r
-#define ICON_OUTARROW       8\r
-#define EXCHANGE_DATA_IN    0
-#define EXCHANGE_DATA_OUT   1
-
-// gui classes generated by wxFormBuilder
-//#include "gui.h"\r
-
 #include "portaudio.h"\r
 #ifdef WIN32
 #if PA_USE_ASIO
@@ -63,14 +48,7 @@ class AudioOptsDialog : public wxDialog
     protected:\r
         PaError         pa_err;
         bool            m_isPaInitialized;\r
-        wxImageList     *m_imageListNormal;
-        wxImageList     *m_imageListSmall;
-
-        // protected event handlers
-        //void OnCloseFrame( wxCloseEvent& event );
-        void OnDeviceSelect( wxListEvent& event );\r
-
-        //void OnExitClick( wxCommandEvent& event );
+\r
         //void DisplaySupportedSampleRates(const PaStreamParameters *inputParameters, const PaStreamParameters *outputParameters);\r
         void DisplaySupportedSampleRates(AudioInfoDisplay ai);\r
         void populateParams(AudioInfoDisplay);

diff --git a/fdmdv2/tests/pa_enum/pa_enum.mk b/fdmdv2/tests/pa_enum/pa_enum.mk
index 91b80584367905b025b0cd9fe699854d72f0a62a..1cf0edf1d4168706f7b02bb2517eab30c79f5626 100644 (file)
--- a/fdmdv2/tests/pa_enum/pa_enum.mk
+++ b/fdmdv2/tests/pa_enum/pa_enum.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=OFA-Staff\r
-Date                   :=11/6/2012\r
+Date                   :=11/7/2012\r
 CodeLitePath           :="C:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
@@ -52,8 +52,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW-4
 AR       := ar rcus\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"937\"  $(Preprocessors)\r
-CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"937\"  $(Preprocessors)\r
+CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"938\"  $(Preprocessors)\r
+CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"938\"  $(Preprocessors)\r
 \r
 \r
 ##\r