git-svn-id: https://svn.code.sf.net/p/freetel/code@812 01035d8c-6547-0410-b346-abe4f9...
authorwittend99 <wittend99@01035d8c-6547-0410-b346-abe4f91aad63>
Thu, 25 Oct 2012 18:39:14 +0000 (18:39 +0000)
committerwittend99 <wittend99@01035d8c-6547-0410-b346-abe4f91aad63>
Thu, 25 Oct 2012 18:39:14 +0000 (18:39 +0000)
15 files changed:
fdmdv2/build/fdmdv2.mk
fdmdv2/build/fdmdv2.workspace
fdmdv2/build/fdmdv2_wsp.mk
fdmdv2/tests/pa_enum/Debug/pa_enum.exe
fdmdv2/tests/pa_enum/Release/pa_enum.exe
fdmdv2/tests/pa_enum/gui.cpp
fdmdv2/tests/pa_enum/gui.fbp
fdmdv2/tests/pa_enum/gui.h
fdmdv2/tests/pa_enum/gui.py
fdmdv2/tests/pa_enum/gui.xrc
fdmdv2/tests/pa_enum/main.cpp
fdmdv2/tests/pa_enum/main.h
fdmdv2/tests/pa_enum/pa_enum.mk
fdmdv2/tests/pa_enum/pa_enum.project
fdmdv2/tests/pa_enum/pa_enum.txt

index 6cdc525301cdb6868a55b71aa7479668ea540df5..01de3a337ae303bba0d6e6805d0fed0d67d9cc65 100644 (file)
@@ -2,18 +2,18 @@
 ## Auto Generated makefile by CodeLite IDE\r
 ## any manual changes will be erased      \r
 ##\r
-## Release\r
+## Debug\r
 ProjectName            :=fdmdv2\r
-ConfigurationName      :=Release\r
+ConfigurationName      :=Debug\r
 WorkspacePath          := "C:\bin\Projects\Radio\fdmdv2\build"\r
 ProjectPath            := "C:\bin\Projects\Radio\fdmdv2\build"\r
-IntermediateDirectory  :=./Release\r
+IntermediateDirectory  :=./Debug\r
 OutDir                 := $(IntermediateDirectory)\r
 CurrentFileName        :=\r
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=OFA-Staff\r
-Date                   :=10/24/2012\r
+Date                   :=10/25/2012\r
 CodeLitePath           :="C:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
@@ -35,8 +35,8 @@ PreprocessOnlySwitch   :=-E
 ObjectsFileList        :="C:\bin\Projects\Radio\fdmdv2\build\fdmdv2.txt"\r
 PCHCompileFlags        :=\r
 MakeDirCommand         :=makedir\r
-LinkOptions            :=  -mwindows -s $(shell wx-config --debug=no --libs --unicode=yes)\r
-IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.6.1/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/ \r
+LinkOptions            :=  -mwindows $(shell wx-config --debug=yes --libs --unicode=yes)\r
+IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.6.1/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/include \r
 IncludePCH             := \r
 RcIncludePath          := \r
 Libs                   := $(LibrarySwitch)sndfile-1 $(LibrarySwitch)codec2 $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp \r
@@ -50,8 +50,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=\"803\"  $(Preprocessors)\r
-CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"803\"  $(Preprocessors)\r
+CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"810\"  $(Preprocessors)\r
+CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"810\"  $(Preprocessors)\r
 \r
 \r
 ##\r
@@ -78,7 +78,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects)
        $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)\r
 \r
 $(IntermediateDirectory)/.d:\r
-       @$(MakeDirCommand) "./Release"\r
+       @$(MakeDirCommand) "./Debug"\r
 \r
 PreBuild:\r
 \r
@@ -237,6 +237,6 @@ clean:
        $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(PreprocessSuffix)\r
        $(RM) $(OutputFile)\r
        $(RM) $(OutputFile).exe\r
-       $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-release\fdmdv2"\r
+       $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-debug\fdmdv2"\r
 \r
 \r
index 9d2905da4e44d270e3f9e3c39c57379665c91d56..6e5a683038955db0d5e6c842079663da569dd674 100644 (file)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Workspace Name="fdmdv2" Database="./fdmdv2.tags">
-  <Project Name="fdmdv2" Path="fdmdv2.project" Active="Yes"/>
+  <Project Name="fdmdv2" Path="fdmdv2.project" Active="No"/>
   <Environment>
     <![CDATA[]]>
   </Environment>
   <Project Name="rawbits" Path="../tests/image/rawbits.project" Active="No"/>
+  <Project Name="pa_enum" Path="../tests/pa_enum/pa_enum.project" Active="Yes"/>
   <BuildMatrix>
-    <WorkspaceConfiguration Name="Debug" Selected="no">
+    <WorkspaceConfiguration Name="Debug" Selected="yes">
       <Project Name="fdmdv2" ConfigName="Debug"/>
       <Project Name="rawbits" ConfigName="Debug"/>
+      <Project Name="pa_enum" ConfigName="Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="yes">
+    <WorkspaceConfiguration Name="Release" Selected="no">
       <Project Name="fdmdv2" ConfigName="Release"/>
       <Project Name="rawbits" ConfigName="Release"/>
+      <Project Name="pa_enum" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
 </CodeLite_Workspace>
index 59fb53ea6a70e2d3e0e9130c933698d6a46b4b21..e7ba3f481f187b8ecabe9112bd3523a3f0e6af49 100644 (file)
@@ -1,8 +1,8 @@
 .PHONY: clean All
 
 All:
-       @echo ----------Building project:[ fdmdv2 - Release ]----------
-       @"$(MAKE)" -f "fdmdv2.mk"
+       @echo ----------Building project:[ pa_enum - Debug ]----------
+       @cd "C:\bin\Projects\Radio\fdmdv2\tests\pa_enum" && "$(MAKE)" -f "pa_enum.mk"
 clean:
-       @echo ----------Cleaning project:[ fdmdv2 - Release ]----------
-       @"$(MAKE)" -f "fdmdv2.mk" clean
+       @echo ----------Cleaning project:[ pa_enum - Debug ]----------
+       @cd "C:\bin\Projects\Radio\fdmdv2\tests\pa_enum" && "$(MAKE)" -f "pa_enum.mk" clean
index f2c7699660c58e21b011734d4b2a354dc4436ee9..040490a56df0057f9b154adbd7df0f4167700909 100644 (file)
Binary files a/fdmdv2/tests/pa_enum/Debug/pa_enum.exe and b/fdmdv2/tests/pa_enum/Debug/pa_enum.exe differ
index f38b510e42d41835fd73ce3f16eea087908606ea..ba26986b6ef4e50ef08d766385928bca4cafceca 100644 (file)
Binary files a/fdmdv2/tests/pa_enum/Release/pa_enum.exe and b/fdmdv2/tests/pa_enum/Release/pa_enum.exe differ
index 35cbda2b1049bdf41e8be84c0abad4bc3fbef2ac..2ba6be53bc0b3105a59a12b284f62859546b5af3 100644 (file)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////\r
-// C++ code generated with wxFormBuilder (version Mar 17 2012)\r
+// C++ code generated with wxFormBuilder (version Apr 10 2012)\r
 // http://www.wxformbuilder.org/\r
 //\r
 // PLEASE DO "NOT" EDIT THIS FILE!\r
 MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )\r
 {\r
        this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
-       \r
+       this->SetSizeHints( wxDefaultSize, wxDefaultSize );\r
+\r
        wxBoxSizer* mainSizer;\r
        mainSizer = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_panel1 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxBoxSizer* bSizer4;\r
        bSizer4 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_notebook1 = new wxNotebook( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM );\r
        m_panelRx = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxBoxSizer* bSizer20;\r
        bSizer20 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        wxGridSizer* gSizer4;\r
        gSizer4 = new wxGridSizer( 2, 1, 0, 0 );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer2;\r
        sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_panelRx, wxID_ANY, _("Rx Radio Device") ), wxVERTICAL );\r
-       \r
+\r
        m_listCtrlRxInDevices = new wxListCtrl( m_panelRx, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES );\r
        sbSizer2->Add( m_listCtrlRxInDevices, 1, wxALL|wxEXPAND, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer811;\r
        bSizer811 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
+\r
        m_staticText51 = new wxStaticText( m_panelRx, wxID_ANY, _("Device:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText51->Wrap( -1 );\r
        bSizer811->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
+\r
        m_textCtrlRxIn = new wxTextCtrl( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer811->Add( m_textCtrlRxIn, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
-       \r
+\r
        m_staticText6 = new wxStaticText( m_panelRx, wxID_ANY, _("Sample Rate:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText6->Wrap( -1 );\r
        bSizer811->Add( m_staticText6, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
-       m_cbSampleRateRxIn = new wxComboBox( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); \r
+\r
+       m_cbSampleRateRxIn = new wxComboBox( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN );\r
        bSizer811->Add( m_cbSampleRateRxIn, 0, wxALL, 1 );\r
-       \r
-       \r
+\r
+\r
        sbSizer2->Add( bSizer811, 0, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        gSizer4->Add( sbSizer2, 1, wxEXPAND, 5 );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer3;\r
        sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_panelRx, wxID_ANY, _("Rx Speaker Stream") ), wxVERTICAL );\r
-       \r
+\r
        m_listCtrlRxOutDevices = new wxListCtrl( m_panelRx, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES );\r
        sbSizer3->Add( m_listCtrlRxOutDevices, 1, wxALL|wxEXPAND, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer81;\r
        bSizer81 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
+\r
        m_staticText9 = new wxStaticText( m_panelRx, wxID_ANY, _("Device:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText9->Wrap( -1 );\r
        bSizer81->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );\r
-       \r
-       m_textRxOut = new wxTextCtrl( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer81->Add( m_textRxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
-       \r
+\r
+       m_textCtrlRxOut = new wxTextCtrl( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer81->Add( m_textCtrlRxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
+\r
        m_staticText10 = new wxStaticText( m_panelRx, wxID_ANY, _("Sample Rate:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText10->Wrap( -1 );\r
        bSizer81->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
-       m_cbSampleRateRxOut = new wxComboBox( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); \r
+\r
+       m_cbSampleRateRxOut = new wxComboBox( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN );\r
        bSizer81->Add( m_cbSampleRateRxOut, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
-       \r
-       \r
+\r
+\r
        sbSizer3->Add( bSizer81, 0, wxEXPAND, 2 );\r
-       \r
-       \r
+\r
+\r
        gSizer4->Add( sbSizer3, 1, wxEXPAND, 2 );\r
-       \r
-       \r
+\r
+\r
        bSizer20->Add( gSizer4, 1, wxEXPAND, 1 );\r
-       \r
-       \r
+\r
+\r
        m_panelRx->SetSizer( bSizer20 );\r
        m_panelRx->Layout();\r
        bSizer20->Fit( m_panelRx );\r
@@ -97,72 +98,72 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        m_panelTx = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxBoxSizer* bSizer18;\r
        bSizer18 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        wxGridSizer* gSizer2;\r
        gSizer2 = new wxGridSizer( 2, 1, 0, 0 );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer22;\r
        sbSizer22 = new wxStaticBoxSizer( new wxStaticBox( m_panelTx, wxID_ANY, _("Tx Microphone Stream") ), wxVERTICAL );\r
-       \r
+\r
        m_listCtrlTxInDevices = new wxListCtrl( m_panelTx, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES );\r
        sbSizer22->Add( m_listCtrlTxInDevices, 1, wxALL|wxEXPAND, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer83;\r
        bSizer83 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
+\r
        m_staticText12 = new wxStaticText( m_panelTx, wxID_ANY, _("Device:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText12->Wrap( -1 );\r
        bSizer83->Add( m_staticText12, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
+\r
        m_textCtrlTxIn = new wxTextCtrl( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer83->Add( m_textCtrlTxIn, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
-       \r
+\r
        m_staticText11 = new wxStaticText( m_panelTx, wxID_ANY, _("Sample Rate:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText11->Wrap( -1 );\r
        bSizer83->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
-       m_cbSampleRateTxIn = new wxComboBox( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); \r
+\r
+       m_cbSampleRateTxIn = new wxComboBox( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN );\r
        bSizer83->Add( m_cbSampleRateTxIn, 0, wxALL, 1 );\r
-       \r
-       \r
+\r
+\r
        sbSizer22->Add( bSizer83, 0, wxEXPAND, 2 );\r
-       \r
-       \r
+\r
+\r
        gSizer2->Add( sbSizer22, 1, wxEXPAND, 5 );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer21;\r
        sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_panelTx, wxID_ANY, _("Tx Radio Stream") ), wxVERTICAL );\r
-       \r
+\r
        m_listCtrlTxOutDevices = new wxListCtrl( m_panelTx, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES );\r
        sbSizer21->Add( m_listCtrlTxOutDevices, 1, wxALL|wxEXPAND, 2 );\r
-       \r
+\r
        wxBoxSizer* bSizer82;\r
        bSizer82 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
+\r
        m_staticText81 = new wxStaticText( m_panelTx, wxID_ANY, _("Device:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText81->Wrap( -1 );\r
        bSizer82->Add( m_staticText81, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );\r
-       \r
-       m_textCtrTxOut = new wxTextCtrl( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer82->Add( m_textCtrTxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
-       \r
+\r
+       m_textCtrlTxOut = new wxTextCtrl( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer82->Add( m_textCtrlTxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
+\r
        m_staticText71 = new wxStaticText( m_panelTx, wxID_ANY, _("Sample Rate:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText71->Wrap( -1 );\r
        bSizer82->Add( m_staticText71, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );\r
-       \r
-       m_cbSampleRateTxOut = new wxComboBox( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); \r
+\r
+       m_cbSampleRateTxOut = new wxComboBox( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN );\r
        bSizer82->Add( m_cbSampleRateTxOut, 0, wxALL, 1 );\r
-       \r
-       \r
+\r
+\r
        sbSizer21->Add( bSizer82, 0, wxEXPAND, 2 );\r
-       \r
-       \r
+\r
+\r
        gSizer2->Add( sbSizer21, 1, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer18->Add( gSizer2, 1, wxEXPAND, 1 );\r
-       \r
-       \r
+\r
+\r
        m_panelTx->SetSizer( bSizer18 );\r
        m_panelTx->Layout();\r
        bSizer18->Fit( m_panelTx );\r
@@ -170,107 +171,107 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        m_panelAPI = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxBoxSizer* bSizer12;\r
        bSizer12 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
+\r
        wxGridSizer* gSizer31;\r
        gSizer31 = new wxGridSizer( 2, 1, 0, 0 );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer1;\r
        sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_panelAPI, wxID_ANY, _("PortAudio") ), wxVERTICAL );\r
-       \r
+\r
        wxGridSizer* gSizer3;\r
        gSizer3 = new wxGridSizer( 4, 2, 0, 0 );\r
-       \r
+\r
        m_staticText7 = new wxStaticText( m_panelAPI, wxID_ANY, _("PortAudio Version String:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText7->Wrap( -1 );\r
        gSizer3->Add( m_staticText7, 0, wxALIGN_RIGHT|wxALL|wxALIGN_CENTER_VERTICAL, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer151;\r
        bSizer151 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_textStringVer = new wxTextCtrl( m_panelAPI, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );\r
        bSizer151->Add( m_textStringVer, 0, wxALL|wxEXPAND, 1 );\r
-       \r
-       \r
+\r
+\r
        gSizer3->Add( bSizer151, 1, wxEXPAND, 2 );\r
-       \r
+\r
        m_staticText8 = new wxStaticText( m_panelAPI, wxID_ANY, _("PortAudio Int Version:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText8->Wrap( -1 );\r
        gSizer3->Add( m_staticText8, 0, wxALIGN_RIGHT|wxALL|wxALIGN_CENTER_VERTICAL, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer13;\r
        bSizer13 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_textIntVer = new wxTextCtrl( m_panelAPI, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );\r
        bSizer13->Add( m_textIntVer, 0, wxALL|wxALIGN_CENTER_VERTICAL, 1 );\r
-       \r
-       \r
+\r
+\r
        gSizer3->Add( bSizer13, 1, wxEXPAND, 5 );\r
-       \r
+\r
        m_staticText5 = new wxStaticText( m_panelAPI, wxID_ANY, _("Device Count:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText5->Wrap( -1 );\r
        gSizer3->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer14;\r
        bSizer14 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_textCDevCount = new wxTextCtrl( m_panelAPI, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 45,-1 ), wxTE_READONLY );\r
        m_textCDevCount->SetMaxSize( wxSize( 45,-1 ) );\r
-       \r
+\r
        bSizer14->Add( m_textCDevCount, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
-       \r
-       \r
+\r
+\r
        gSizer3->Add( bSizer14, 1, wxEXPAND, 5 );\r
-       \r
+\r
        m_staticText4 = new wxStaticText( m_panelAPI, wxID_ANY, _("API Count:"), wxDefaultPosition, wxDefaultSize, 0 );\r
        m_staticText4->Wrap( -1 );\r
        gSizer3->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer15;\r
        bSizer15 = new wxBoxSizer( wxVERTICAL );\r
-       \r
+\r
        m_textAPICount = new wxTextCtrl( m_panelAPI, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 45,-1 ), wxTE_READONLY );\r
        m_textAPICount->SetMaxSize( wxSize( 45,-1 ) );\r
-       \r
+\r
        bSizer15->Add( m_textAPICount, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1 );\r
-       \r
-       \r
+\r
+\r
        gSizer3->Add( bSizer15, 1, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        sbSizer1->Add( gSizer3, 1, wxEXPAND, 2 );\r
-       \r
-       \r
+\r
+\r
        gSizer31->Add( sbSizer1, 1, wxEXPAND, 2 );\r
-       \r
+\r
        wxStaticBoxSizer* sbSizer6;\r
        sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( m_panelAPI, wxID_ANY, _("Other") ), wxVERTICAL );\r
-       \r
-       \r
+\r
+\r
        gSizer31->Add( sbSizer6, 1, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        bSizer12->Add( gSizer31, 1, wxEXPAND, 5 );\r
-       \r
-       \r
+\r
+\r
        m_panelAPI->SetSizer( bSizer12 );\r
        m_panelAPI->Layout();\r
        bSizer12->Fit( m_panelAPI );\r
        m_notebook1->AddPage( m_panelAPI, _("API Info"), false );\r
-       \r
+\r
        bSizer4->Add( m_notebook1, 1, wxEXPAND | wxALL, 0 );\r
-       \r
-       \r
+\r
+\r
        m_panel1->SetSizer( bSizer4 );\r
        m_panel1->Layout();\r
        bSizer4->Fit( m_panel1 );\r
        mainSizer->Add( m_panel1, 1, wxEXPAND | wxALL, 1 );\r
-       \r
+\r
        wxBoxSizer* bSizer6;\r
        bSizer6 = new wxBoxSizer( wxHORIZONTAL );\r
-       \r
+\r
        m_btnRefresh = new wxButton( this, wxID_ANY, _("Refresh"), wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer6->Add( m_btnRefresh, 0, wxALIGN_CENTER|wxALL, 2 );\r
-       \r
+\r
        m_sdbSizer1 = new wxStdDialogButtonSizer();\r
        m_sdbSizer1OK = new wxButton( this, wxID_OK );\r
        m_sdbSizer1->AddButton( m_sdbSizer1OK );\r
@@ -279,21 +280,22 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
        m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );\r
        m_sdbSizer1->AddButton( m_sdbSizer1Cancel );\r
        m_sdbSizer1->Realize();\r
-       \r
+\r
        bSizer6->Add( m_sdbSizer1, 1, wxALIGN_CENTER_VERTICAL, 2 );\r
-       \r
-       \r
+\r
+\r
        mainSizer->Add( bSizer6, 0, wxEXPAND, 2 );\r
-       \r
-       \r
+\r
+\r
        this->SetSizer( mainSizer );\r
        this->Layout();\r
-       \r
+\r
        this->Centre( wxBOTH );\r
-       \r
+       this->Centre( wxBOTH );\r
+\r
        // Connect Events\r
-       this->Connect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) );\r
-       this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );\r
+       this->Connect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) );this->Connect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) );\r
+       this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );\r
        m_listCtrlRxInDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnRxInDeviceSelect ), NULL, this );\r
        m_listCtrlRxOutDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnRxOutDeviceSelect ), NULL, this );\r
        m_listCtrlTxInDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnTxInDeviceSelect ), NULL, this );\r
@@ -307,8 +309,8 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 MainFrameBase::~MainFrameBase()\r
 {\r
        // Disconnect Events\r
-       this->Disconnect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) );\r
-       this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );\r
+       this->Disconnect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) );this->Disconnect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) );\r
+       this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );\r
        m_listCtrlRxInDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnRxInDeviceSelect ), NULL, this );\r
        m_listCtrlRxOutDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnRxOutDeviceSelect ), NULL, this );\r
        m_listCtrlTxInDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnTxInDeviceSelect ), NULL, this );\r
@@ -317,5 +319,5 @@ MainFrameBase::~MainFrameBase()
        m_sdbSizer1Apply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnApplyAudioParameters ), NULL, this );\r
        m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnCancelAudioParameters ), NULL, this );\r
        m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnOkAudioParameters ), NULL, this );\r
-       \r
+\r
 }\r
index 4f69c823246993ec6bd914ef3d984cc2799c3fea..97f7182c8ff030a70360fd8c40a6fb83a0f87b6c 100644 (file)
         <property name="use_enum">0</property>\r
         <property name="use_microsoft_bom">0</property>\r
         <object class="Frame" expanded="1">\r
-            <property name="BottomDockable">1</property>\r
-            <property name="LeftDockable">1</property>\r
-            <property name="RightDockable">1</property>\r
-            <property name="TopDockable">1</property>\r
-            <property name="aui_layer"></property>\r
             <property name="aui_managed">0</property>\r
-            <property name="aui_name"></property>\r
-            <property name="aui_position"></property>\r
-            <property name="aui_row"></property>\r
-            <property name="best_size"></property>\r
             <property name="bg"></property>\r
-            <property name="caption"></property>\r
-            <property name="caption_visible">1</property>\r
             <property name="center">wxBOTH</property>\r
-            <property name="center_pane">0</property>\r
-            <property name="close_button">1</property>\r
             <property name="context_help"></property>\r
             <property name="context_menu">1</property>\r
-            <property name="default_pane">0</property>\r
-            <property name="dock">Dock</property>\r
-            <property name="dock_fixed">0</property>\r
-            <property name="docking">Left</property>\r
             <property name="enabled">1</property>\r
             <property name="event_handler">impl_virtual</property>\r
             <property name="extra_style"></property>\r
             <property name="fg"></property>\r
-            <property name="floatable">1</property>\r
             <property name="font"></property>\r
-            <property name="gripper">0</property>\r
             <property name="hidden">0</property>\r
             <property name="id">wxID_ANY</property>\r
-            <property name="max_size"></property>\r
-            <property name="maximize_button">0</property>\r
             <property name="maximum_size"></property>\r
-            <property name="min_size"></property>\r
-            <property name="minimize_button">0</property>\r
             <property name="minimum_size"></property>\r
-            <property name="moveable">1</property>\r
             <property name="name">MainFrameBase</property>\r
-            <property name="pane_border">1</property>\r
-            <property name="pane_position"></property>\r
-            <property name="pane_size"></property>\r
-            <property name="pin_button">1</property>\r
             <property name="pos"></property>\r
-            <property name="resize">Resizable</property>\r
-            <property name="show">1</property>\r
-            <property name="size">790,400</property>\r
+            <property name="size">690,400</property>\r
             <property name="style">wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER</property>\r
             <property name="subclass"></property>\r
             <property name="title">PortAudio Device Enumeration</property>\r
-            <property name="toolbar_pane">0</property>\r
             <property name="tooltip"></property>\r
-            <property name="validator_data_type"></property>\r
-            <property name="validator_style">wxFILTER_NONE</property>\r
-            <property name="validator_type">wxDefaultValidator</property>\r
-            <property name="validator_variable"></property>\r
             <property name="window_extra_style"></property>\r
             <property name="window_name"></property>\r
             <property name="window_style">wxTAB_TRAVERSAL</property>\r
                         <property name="subclass"></property>\r
                         <property name="toolbar_pane">0</property>\r
                         <property name="tooltip"></property>\r
-                        <property name="validator_data_type"></property>\r
-                        <property name="validator_style">wxFILTER_NONE</property>\r
-                        <property name="validator_type">wxDefaultValidator</property>\r
-                        <property name="validator_variable"></property>\r
                         <property name="window_extra_style"></property>\r
                         <property name="window_name"></property>\r
                         <property name="window_style">wxTAB_TRAVERSAL</property>\r
                                     <property name="subclass"></property>\r
                                     <property name="toolbar_pane">0</property>\r
                                     <property name="tooltip"></property>\r
-                                    <property name="validator_data_type"></property>\r
-                                    <property name="validator_style">wxFILTER_NONE</property>\r
-                                    <property name="validator_type">wxDefaultValidator</property>\r
-                                    <property name="validator_variable"></property>\r
                                     <property name="window_extra_style"></property>\r
                                     <property name="window_name"></property>\r
                                     <property name="window_style"></property>\r
                                         <property name="bitmap"></property>\r
                                         <property name="label">Receive</property>\r
                                         <property name="select">1</property>\r
-                                        <object class="wxPanel" expanded="1">\r
+                                        <object class="wxPanel" expanded="0">\r
                                             <property name="BottomDockable">1</property>\r
                                             <property name="LeftDockable">1</property>\r
                                             <property name="RightDockable">1</property>\r
                                             <property name="subclass"></property>\r
                                             <property name="toolbar_pane">0</property>\r
                                             <property name="tooltip"></property>\r
-                                            <property name="validator_data_type"></property>\r
-                                            <property name="validator_style">wxFILTER_NONE</property>\r
-                                            <property name="validator_type">wxDefaultValidator</property>\r
-                                            <property name="validator_variable"></property>\r
                                             <property name="window_extra_style"></property>\r
                                             <property name="window_name"></property>\r
                                             <property name="window_style">wxTAB_TRAVERSAL</property>\r
                                             <event name="OnSetFocus"></event>\r
                                             <event name="OnSize"></event>\r
                                             <event name="OnUpdateUI"></event>\r
-                                            <object class="wxBoxSizer" expanded="1">\r
+                                            <object class="wxBoxSizer" expanded="0">\r
                                                 <property name="minimum_size"></property>\r
                                                 <property name="name">bSizer20</property>\r
                                                 <property name="orient">wxVERTICAL</property>\r
                                                 <property name="permission">none</property>\r
-                                                <object class="sizeritem" expanded="1">\r
+                                                <object class="sizeritem" expanded="0">\r
                                                     <property name="border">1</property>\r
                                                     <property name="flag">wxEXPAND</property>\r
                                                     <property name="proportion">1</property>\r
-                                                    <object class="wxGridSizer" expanded="1">\r
+                                                    <object class="wxGridSizer" expanded="0">\r
                                                         <property name="cols">1</property>\r
                                                         <property name="hgap">0</property>\r
                                                         <property name="minimum_size"></property>\r
                                                         <property name="permission">none</property>\r
                                                         <property name="rows">2</property>\r
                                                         <property name="vgap">0</property>\r
-                                                        <object class="sizeritem" expanded="1">\r
+                                                        <object class="sizeritem" expanded="0">\r
                                                             <property name="border">5</property>\r
                                                             <property name="flag">wxEXPAND</property>\r
                                                             <property name="proportion">1</property>\r
-                                                            <object class="wxStaticBoxSizer" expanded="1">\r
+                                                            <object class="wxStaticBoxSizer" expanded="0">\r
                                                                 <property name="id">wxID_ANY</property>\r
                                                                 <property name="label">Rx Radio Device</property>\r
                                                                 <property name="minimum_size"></property>\r
                                                                         <event name="OnUpdateUI"></event>\r
                                                                     </object>\r
                                                                 </object>\r
-                                                                <object class="sizeritem" expanded="1">\r
+                                                                <object class="sizeritem" expanded="0">\r
                                                                     <property name="border">5</property>\r
                                                                     <property name="flag">wxEXPAND</property>\r
                                                                     <property name="proportion">0</property>\r
-                                                                    <object class="wxBoxSizer" expanded="1">\r
+                                                                    <object class="wxBoxSizer" expanded="0">\r
                                                                         <property name="minimum_size"></property>\r
                                                                         <property name="name">bSizer811</property>\r
                                                                         <property name="orient">wxHORIZONTAL</property>\r
                                                                         <property name="permission">none</property>\r
-                                                                        <object class="sizeritem" expanded="1">\r
+                                                                        <object class="sizeritem" expanded="0">\r
                                                                             <property name="border">5</property>\r
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
                                                                             <property name="proportion">0</property>\r
-                                                                            <object class="wxStaticText" expanded="1">\r
+                                                                            <object class="wxStaticText" expanded="0">\r
                                                                                 <property name="BottomDockable">1</property>\r
                                                                                 <property name="LeftDockable">1</property>\r
                                                                                 <property name="RightDockable">1</property>\r
                                                                                 <property name="subclass"></property>\r
                                                                                 <property name="toolbar_pane">0</property>\r
                                                                                 <property name="tooltip"></property>\r
-                                                                                <property name="validator_data_type"></property>\r
-                                                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                                                <property name="validator_variable"></property>\r
                                                                                 <property name="window_extra_style"></property>\r
                                                                                 <property name="window_name"></property>\r
                                                                                 <property name="window_style"></property>\r
                                                                                 <event name="OnUpdateUI"></event>\r
                                                                             </object>\r
                                                                         </object>\r
-                                                                        <object class="sizeritem" expanded="1">\r
+                                                                        <object class="sizeritem" expanded="0">\r
                                                                             <property name="border">5</property>\r
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
                                                                             <property name="proportion">0</property>\r
-                                                                            <object class="wxStaticText" expanded="1">\r
+                                                                            <object class="wxStaticText" expanded="0">\r
                                                                                 <property name="BottomDockable">1</property>\r
                                                                                 <property name="LeftDockable">1</property>\r
                                                                                 <property name="RightDockable">1</property>\r
                                                                                 <property name="subclass"></property>\r
                                                                                 <property name="toolbar_pane">0</property>\r
                                                                                 <property name="tooltip"></property>\r
-                                                                                <property name="validator_data_type"></property>\r
-                                                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                                                <property name="validator_variable"></property>\r
                                                                                 <property name="window_extra_style"></property>\r
                                                                                 <property name="window_name"></property>\r
                                                                                 <property name="window_style"></property>\r
                                                                                 <event name="OnUpdateUI"></event>\r
                                                                             </object>\r
                                                                         </object>\r
-                                                                        <object class="sizeritem" expanded="1">\r
+                                                                        <object class="sizeritem" expanded="0">\r
                                                                             <property name="border">1</property>\r
                                                                             <property name="flag">wxALL</property>\r
                                                                             <property name="proportion">0</property>\r
-                                                                            <object class="wxComboBox" expanded="1">\r
+                                                                            <object class="wxComboBox" expanded="0">\r
                                                                                 <property name="BottomDockable">1</property>\r
                                                                                 <property name="LeftDockable">1</property>\r
                                                                                 <property name="RightDockable">1</property>\r
                                                                 </object>\r
                                                             </object>\r
                                                         </object>\r
-                                                        <object class="sizeritem" expanded="1">\r
+                                                        <object class="sizeritem" expanded="0">\r
                                                             <property name="border">2</property>\r
                                                             <property name="flag">wxEXPAND</property>\r
                                                             <property name="proportion">1</property>\r
-                                                            <object class="wxStaticBoxSizer" expanded="1">\r
+                                                            <object class="wxStaticBoxSizer" expanded="0">\r
                                                                 <property name="id">wxID_ANY</property>\r
                                                                 <property name="label">Rx Speaker Stream</property>\r
                                                                 <property name="minimum_size"></property>\r
                                                                         <event name="OnUpdateUI"></event>\r
                                                                     </object>\r
                                                                 </object>\r
-                                                                <object class="sizeritem" expanded="1">\r
+                                                                <object class="sizeritem" expanded="0">\r
                                                                     <property name="border">2</property>\r
                                                                     <property name="flag">wxEXPAND</property>\r
                                                                     <property name="proportion">0</property>\r
-                                                                    <object class="wxBoxSizer" expanded="1">\r
+                                                                    <object class="wxBoxSizer" expanded="0">\r
                                                                         <property name="minimum_size"></property>\r
                                                                         <property name="name">bSizer81</property>\r
                                                                         <property name="orient">wxHORIZONTAL</property>\r
                                                                         <property name="permission">none</property>\r
-                                                                        <object class="sizeritem" expanded="1">\r
+                                                                        <object class="sizeritem" expanded="0">\r
                                                                             <property name="border">5</property>\r
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>\r
                                                                             <property name="proportion">0</property>\r
-                                                                            <object class="wxStaticText" expanded="1">\r
+                                                                            <object class="wxStaticText" expanded="0">\r
                                                                                 <property name="BottomDockable">1</property>\r
                                                                                 <property name="LeftDockable">1</property>\r
                                                                                 <property name="RightDockable">1</property>\r
                                                                                 <property name="subclass"></property>\r
                                                                                 <property name="toolbar_pane">0</property>\r
                                                                                 <property name="tooltip"></property>\r
-                                                                                <property name="validator_data_type"></property>\r
-                                                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                                                <property name="validator_variable"></property>\r
                                                                                 <property name="window_extra_style"></property>\r
                                                                                 <property name="window_name"></property>\r
                                                                                 <property name="window_style"></property>\r
                                                                                 <event name="OnUpdateUI"></event>\r
                                                                             </object>\r
                                                                         </object>\r
-                                                                        <object class="sizeritem" expanded="1">\r
+                                                                        <object class="sizeritem" expanded="0">\r
                                                                             <property name="border">5</property>\r
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
                                                                             <property name="proportion">0</property>\r
-                                                                            <object class="wxStaticText" expanded="1">\r
+                                                                            <object class="wxStaticText" expanded="0">\r
                                                                                 <property name="BottomDockable">1</property>\r
                                                                                 <property name="LeftDockable">1</property>\r
                                                                                 <property name="RightDockable">1</property>\r
                                                                                 <property name="subclass"></property>\r
                                                                                 <property name="toolbar_pane">0</property>\r
                                                                                 <property name="tooltip"></property>\r
-                                                                                <property name="validator_data_type"></property>\r
-                                                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                                                <property name="validator_variable"></property>\r
                                                                                 <property name="window_extra_style"></property>\r
                                                                                 <property name="window_name"></property>\r
                                                                                 <property name="window_style"></property>\r
                                                                                 <event name="OnUpdateUI"></event>\r
                                                                             </object>\r
                                                                         </object>\r
-                                                                        <object class="sizeritem" expanded="1">\r
+                                                                        <object class="sizeritem" expanded="0">\r
                                                                             <property name="border">1</property>\r
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>\r
                                                                             <property name="proportion">0</property>\r
-                                                                            <object class="wxComboBox" expanded="1">\r
+                                                                            <object class="wxComboBox" expanded="0">\r
                                                                                 <property name="BottomDockable">1</property>\r
                                                                                 <property name="LeftDockable">1</property>\r
                                                                                 <property name="RightDockable">1</property>\r
                                         <property name="bitmap"></property>\r
                                         <property name="label">Transmit</property>\r
                                         <property name="select">0</property>\r
-                                        <object class="wxPanel" expanded="1">\r
+                                        <object class="wxPanel" expanded="0">\r
                                             <property name="BottomDockable">1</property>\r
                                             <property name="LeftDockable">1</property>\r
                                             <property name="RightDockable">1</property>\r
                                             <property name="subclass"></property>\r
                                             <property name="toolbar_pane">0</property>\r
                                             <property name="tooltip"></property>\r
-                                            <property name="validator_data_type"></property>\r
-                                            <property name="validator_style">wxFILTER_NONE</property>\r
-                                            <property name="validator_type">wxDefaultValidator</property>\r
-                                            <property name="validator_variable"></property>\r
                                             <property name="window_extra_style"></property>\r
                                             <property name="window_name"></property>\r
                                             <property name="window_style">wxTAB_TRAVERSAL</property>\r
                                             <event name="OnSetFocus"></event>\r
                                             <event name="OnSize"></event>\r
                                             <event name="OnUpdateUI"></event>\r
-                                            <object class="wxBoxSizer" expanded="1">\r
+                                            <object class="wxBoxSizer" expanded="0">\r
                                                 <property name="minimum_size"></property>\r
                                                 <property name="name">bSizer18</property>\r
                                                 <property name="orient">wxVERTICAL</property>\r
                                                 <property name="permission">none</property>\r
-                                                <object class="sizeritem" expanded="1">\r
+                                                <object class="sizeritem" expanded="0">\r
                                                     <property name="border">1</property>\r
                                                     <property name="flag">wxEXPAND</property>\r
                                                     <property name="proportion">1</property>\r
-                                                    <object class="wxGridSizer" expanded="1">\r
+                                                    <object class="wxGridSizer" expanded="0">\r
                                                         <property name="cols">1</property>\r
                                                         <property name="hgap">0</property>\r
                                                         <property name="minimum_size"></property>\r
                                                                         <property name="name">bSizer83</property>\r
                                                                         <property name="orient">wxHORIZONTAL</property>\r
                                                                         <property name="permission">none</property>\r
-                                                                        <object class="sizeritem" expanded="1">\r
+                                                                        <object class="sizeritem" expanded="0">\r
                                                                             <property name="border">5</property>\r
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
                                                                             <property name="proportion">0</property>\r
-                                                                            <object class="wxStaticText" expanded="1">\r
+                                                                            <object class="wxStaticText" expanded="0">\r
                                                                                 <property name="BottomDockable">1</property>\r
                                                                                 <property name="LeftDockable">1</property>\r
                                                                                 <property name="RightDockable">1</property>\r
                                                                                 <property name="subclass"></property>\r
                                                                                 <property name="toolbar_pane">0</property>\r
                                                                                 <property name="tooltip"></property>\r
-                                                                                <property name="validator_data_type"></property>\r
-                                                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                                                <property name="validator_variable"></property>\r
                                                                                 <property name="window_extra_style"></property>\r
                                                                                 <property name="window_name"></property>\r
                                                                                 <property name="window_style"></property>\r
                                                                                 <event name="OnUpdateUI"></event>\r
                                                                             </object>\r
                                                                         </object>\r
-                                                                        <object class="sizeritem" expanded="1">\r
+                                                                        <object class="sizeritem" expanded="0">\r
                                                                             <property name="border">5</property>\r
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
                                                                             <property name="proportion">0</property>\r
-                                                                            <object class="wxStaticText" expanded="1">\r
+                                                                            <object class="wxStaticText" expanded="0">\r
                                                                                 <property name="BottomDockable">1</property>\r
                                                                                 <property name="LeftDockable">1</property>\r
                                                                                 <property name="RightDockable">1</property>\r
                                                                                 <property name="subclass"></property>\r
                                                                                 <property name="toolbar_pane">0</property>\r
                                                                                 <property name="tooltip"></property>\r
-                                                                                <property name="validator_data_type"></property>\r
-                                                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                                                <property name="validator_variable"></property>\r
                                                                                 <property name="window_extra_style"></property>\r
                                                                                 <property name="window_name"></property>\r
                                                                                 <property name="window_style"></property>\r
                                                                                 <event name="OnUpdateUI"></event>\r
                                                                             </object>\r
                                                                         </object>\r
-                                                                        <object class="sizeritem" expanded="1">\r
+                                                                        <object class="sizeritem" expanded="0">\r
                                                                             <property name="border">1</property>\r
                                                                             <property name="flag">wxALL</property>\r
                                                                             <property name="proportion">0</property>\r
-                                                                            <object class="wxComboBox" expanded="1">\r
+                                                                            <object class="wxComboBox" expanded="0">\r
                                                                                 <property name="BottomDockable">1</property>\r
                                                                                 <property name="LeftDockable">1</property>\r
                                                                                 <property name="RightDockable">1</property>\r
                                                                 </object>\r
                                                             </object>\r
                                                         </object>\r
-                                                        <object class="sizeritem" expanded="1">\r
+                                                        <object class="sizeritem" expanded="0">\r
                                                             <property name="border">5</property>\r
                                                             <property name="flag">wxEXPAND</property>\r
                                                             <property name="proportion">1</property>\r
-                                                            <object class="wxStaticBoxSizer" expanded="1">\r
+                                                            <object class="wxStaticBoxSizer" expanded="0">\r
                                                                 <property name="id">wxID_ANY</property>\r
                                                                 <property name="label">Tx Radio Stream</property>\r
                                                                 <property name="minimum_size"></property>\r
                                                                         <event name="OnUpdateUI"></event>\r
                                                                     </object>\r
                                                                 </object>\r
-                                                                <object class="sizeritem" expanded="1">\r
+                                                                <object class="sizeritem" expanded="0">\r
                                                                     <property name="border">2</property>\r
                                                                     <property name="flag">wxEXPAND</property>\r
                                                                     <property name="proportion">0</property>\r
-                                                                    <object class="wxBoxSizer" expanded="1">\r
+                                                                    <object class="wxBoxSizer" expanded="0">\r
                                                                         <property name="minimum_size"></property>\r
                                                                         <property name="name">bSizer82</property>\r
                                                                         <property name="orient">wxHORIZONTAL</property>\r
                                                                         <property name="permission">none</property>\r
-                                                                        <object class="sizeritem" expanded="1">\r
+                                                                        <object class="sizeritem" expanded="0">\r
                                                                             <property name="border">5</property>\r
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>\r
                                                                             <property name="proportion">0</property>\r
-                                                                            <object class="wxStaticText" expanded="1">\r
+                                                                            <object class="wxStaticText" expanded="0">\r
                                                                                 <property name="BottomDockable">1</property>\r
                                                                                 <property name="LeftDockable">1</property>\r
                                                                                 <property name="RightDockable">1</property>\r
                                                                                 <property name="subclass"></property>\r
                                                                                 <property name="toolbar_pane">0</property>\r
                                                                                 <property name="tooltip"></property>\r
-                                                                                <property name="validator_data_type"></property>\r
-                                                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                                                <property name="validator_variable"></property>\r
                                                                                 <property name="window_extra_style"></property>\r
                                                                                 <property name="window_name"></property>\r
                                                                                 <property name="window_style"></property>\r
                                                                                 <event name="OnUpdateUI"></event>\r
                                                                             </object>\r
                                                                         </object>\r
-                                                                        <object class="sizeritem" expanded="1">\r
+                                                                        <object class="sizeritem" expanded="0">\r
                                                                             <property name="border">5</property>\r
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL</property>\r
                                                                             <property name="proportion">0</property>\r
-                                                                            <object class="wxStaticText" expanded="1">\r
+                                                                            <object class="wxStaticText" expanded="0">\r
                                                                                 <property name="BottomDockable">1</property>\r
                                                                                 <property name="LeftDockable">1</property>\r
                                                                                 <property name="RightDockable">1</property>\r
                                                                                 <property name="subclass"></property>\r
                                                                                 <property name="toolbar_pane">0</property>\r
                                                                                 <property name="tooltip"></property>\r
-                                                                                <property name="validator_data_type"></property>\r
-                                                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                                                <property name="validator_variable"></property>\r
                                                                                 <property name="window_extra_style"></property>\r
                                                                                 <property name="window_name"></property>\r
                                                                                 <property name="window_style"></property>\r
                                                                                 <event name="OnUpdateUI"></event>\r
                                                                             </object>\r
                                                                         </object>\r
-                                                                        <object class="sizeritem" expanded="1">\r
+                                                                        <object class="sizeritem" expanded="0">\r
                                                                             <property name="border">1</property>\r
                                                                             <property name="flag">wxALL</property>\r
                                                                             <property name="proportion">0</property>\r
-                                                                            <object class="wxComboBox" expanded="1">\r
+                                                                            <object class="wxComboBox" expanded="0">\r
                                                                                 <property name="BottomDockable">1</property>\r
                                                                                 <property name="LeftDockable">1</property>\r
                                                                                 <property name="RightDockable">1</property>\r
                                         <property name="bitmap"></property>\r
                                         <property name="label">API Info</property>\r
                                         <property name="select">0</property>\r
-                                        <object class="wxPanel" expanded="1">\r
+                                        <object class="wxPanel" expanded="0">\r
                                             <property name="BottomDockable">1</property>\r
                                             <property name="LeftDockable">1</property>\r
                                             <property name="RightDockable">1</property>\r
                                             <property name="subclass"></property>\r
                                             <property name="toolbar_pane">0</property>\r
                                             <property name="tooltip"></property>\r
-                                            <property name="validator_data_type"></property>\r
-                                            <property name="validator_style">wxFILTER_NONE</property>\r
-                                            <property name="validator_type">wxDefaultValidator</property>\r
-                                            <property name="validator_variable"></property>\r
                                             <property name="window_extra_style"></property>\r
                                             <property name="window_name"></property>\r
                                             <property name="window_style">wxTAB_TRAVERSAL</property>\r
                                             <event name="OnSetFocus"></event>\r
                                             <event name="OnSize"></event>\r
                                             <event name="OnUpdateUI"></event>\r
-                                            <object class="wxBoxSizer" expanded="1">\r
+                                            <object class="wxBoxSizer" expanded="0">\r
                                                 <property name="minimum_size"></property>\r
                                                 <property name="name">bSizer12</property>\r
                                                 <property name="orient">wxHORIZONTAL</property>\r
                                                 <property name="permission">none</property>\r
-                                                <object class="sizeritem" expanded="1">\r
+                                                <object class="sizeritem" expanded="0">\r
                                                     <property name="border">5</property>\r
                                                     <property name="flag">wxEXPAND</property>\r
                                                     <property name="proportion">1</property>\r
-                                                    <object class="wxGridSizer" expanded="1">\r
+                                                    <object class="wxGridSizer" expanded="0">\r
                                                         <property name="cols">1</property>\r
                                                         <property name="hgap">0</property>\r
                                                         <property name="minimum_size"></property>\r
                                                         <property name="permission">none</property>\r
                                                         <property name="rows">2</property>\r
                                                         <property name="vgap">0</property>\r
-                                                        <object class="sizeritem" expanded="1">\r
+                                                        <object class="sizeritem" expanded="0">\r
                                                             <property name="border">2</property>\r
                                                             <property name="flag">wxEXPAND</property>\r
                                                             <property name="proportion">1</property>\r
-                                                            <object class="wxStaticBoxSizer" expanded="1">\r
+                                                            <object class="wxStaticBoxSizer" expanded="0">\r
                                                                 <property name="id">wxID_ANY</property>\r
                                                                 <property name="label">PortAudio</property>\r
                                                                 <property name="minimum_size"></property>\r
                                                                 <property name="orient">wxVERTICAL</property>\r
                                                                 <property name="permission">none</property>\r
                                                                 <event name="OnUpdateUI"></event>\r
-                                                                <object class="sizeritem" expanded="1">\r
+                                                                <object class="sizeritem" expanded="0">\r
                                                                     <property name="border">2</property>\r
                                                                     <property name="flag">wxEXPAND</property>\r
                                                                     <property name="proportion">1</property>\r
-                                                                    <object class="wxGridSizer" expanded="1">\r
+                                                                    <object class="wxGridSizer" expanded="0">\r
                                                                         <property name="cols">2</property>\r
                                                                         <property name="hgap">0</property>\r
                                                                         <property name="minimum_size"></property>\r
                                                                                 <property name="subclass"></property>\r
                                                                                 <property name="toolbar_pane">0</property>\r
                                                                                 <property name="tooltip"></property>\r
-                                                                                <property name="validator_data_type"></property>\r
-                                                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                                                <property name="validator_variable"></property>\r
                                                                                 <property name="window_extra_style"></property>\r
                                                                                 <property name="window_name"></property>\r
                                                                                 <property name="window_style"></property>\r
                                                                                 <property name="subclass"></property>\r
                                                                                 <property name="toolbar_pane">0</property>\r
                                                                                 <property name="tooltip"></property>\r
-                                                                                <property name="validator_data_type"></property>\r
-                                                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                                                <property name="validator_variable"></property>\r
                                                                                 <property name="window_extra_style"></property>\r
                                                                                 <property name="window_name"></property>\r
                                                                                 <property name="window_style"></property>\r
                                                                                 <property name="subclass"></property>\r
                                                                                 <property name="toolbar_pane">0</property>\r
                                                                                 <property name="tooltip"></property>\r
-                                                                                <property name="validator_data_type"></property>\r
-                                                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                                                <property name="validator_variable"></property>\r
                                                                                 <property name="window_extra_style"></property>\r
                                                                                 <property name="window_name"></property>\r
                                                                                 <property name="window_style"></property>\r
                                                                                 <property name="subclass"></property>\r
                                                                                 <property name="toolbar_pane">0</property>\r
                                                                                 <property name="tooltip"></property>\r
-                                                                                <property name="validator_data_type"></property>\r
-                                                                                <property name="validator_style">wxFILTER_NONE</property>\r
-                                                                                <property name="validator_type">wxDefaultValidator</property>\r
-                                                                                <property name="validator_variable"></property>\r
                                                                                 <property name="window_extra_style"></property>\r
                                                                                 <property name="window_name"></property>\r
                                                                                 <property name="window_style"></property>\r
index d296ef6ee8761995f63c33b25aaf8d3daba552da..821e7cf421d04aede0accb06cc2e9ae890cda5c5 100644 (file)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////\r
-// C++ code generated with wxFormBuilder (version Mar 17 2012)\r
+// C++ code generated with wxFormBuilder (version Apr 10 2012)\r
 // http://www.wxformbuilder.org/\r
 //\r
 // PLEASE DO "NOT" EDIT THIS FILE!\r
 #include <wx/xrc/xmlres.h>\r
 #include <wx/intl.h>\r
 #include <wx/listctrl.h>\r
-#include <wx/string.h>\r
 #include <wx/gdicmn.h>\r
 #include <wx/font.h>\r
 #include <wx/colour.h>\r
 #include <wx/settings.h>\r
+#include <wx/string.h>\r
 #include <wx/stattext.h>\r
 #include <wx/textctrl.h>\r
 #include <wx/combobox.h>\r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class MainFrameBase\r
 ///////////////////////////////////////////////////////////////////////////////\r
-class MainFrameBase : public wxFrame \r
+class MainFrameBase : public wxFrame\r
 {\r
        private:\r
-       \r
+\r
        protected:\r
                wxPanel* m_panel1;\r
                wxNotebook* m_notebook1;\r
@@ -51,7 +51,7 @@ class MainFrameBase : public wxFrame
                wxComboBox* m_cbSampleRateRxIn;\r
                wxListCtrl* m_listCtrlRxOutDevices;\r
                wxStaticText* m_staticText9;\r
-               wxTextCtrl* m_textRxOut;\r
+               wxTextCtrl* m_textCtrlRxOut;\r
                wxStaticText* m_staticText10;\r
                wxComboBox* m_cbSampleRateRxOut;\r
                wxPanel* m_panelTx;\r
@@ -62,7 +62,7 @@ class MainFrameBase : public wxFrame
                wxComboBox* m_cbSampleRateTxIn;\r
                wxListCtrl* m_listCtrlTxOutDevices;\r
                wxStaticText* m_staticText81;\r
-               wxTextCtrl* m_textCtrTxOut;\r
+               wxTextCtrl* m_textCtrlTxOut;\r
                wxStaticText* m_staticText71;\r
                wxComboBox* m_cbSampleRateTxOut;\r
                wxPanel* m_panelAPI;\r
@@ -79,7 +79,7 @@ class MainFrameBase : public wxFrame
                wxButton* m_sdbSizer1OK;\r
                wxButton* m_sdbSizer1Apply;\r
                wxButton* m_sdbSizer1Cancel;\r
-               \r
+\r
                // Virtual event handlers, overide them in your derived class\r
                virtual void OnActivateApp( wxActivateEvent& event ) { event.Skip(); }\r
                virtual void OnCloseFrame( wxCloseEvent& event ) { event.Skip(); }\r
@@ -91,14 +91,15 @@ class MainFrameBase : public wxFrame
                virtual void OnApplyAudioParameters( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void OnCancelAudioParameters( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void OnOkAudioParameters( wxCommandEvent& event ) { event.Skip(); }\r
-               \r
-       \r
+\r
+\r
        public:\r
-               \r
-               MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PortAudio Device Enumeration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 790,400 ), long style = wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
-               \r
+\r
+               MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PortAudio Device Enumeration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 690,400 ), long style = wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
+//             MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PortAudio Device Enumeration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 690,400 ), long style = wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
+\r
                ~MainFrameBase();\r
-       \r
+\r
 };\r
 \r
 #endif //__GUI_H__\r
index 507c4ee58cb85217291b7f4fd37b2ffb2a329334..bb191f96ca4789ab7ecfb71be833f73df1c3c988 100644 (file)
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*- \r
 \r
 ###########################################################################\r
-## Python code generated with wxFormBuilder (version Mar 17 2012)\r
+## Python code generated with wxFormBuilder (version Apr 10 2012)\r
 ## http://www.wxformbuilder.org/\r
 ##\r
 ## PLEASE DO "NOT" EDIT THIS FILE!\r
@@ -17,11 +17,12 @@ _ = gettext.gettext
 ## Class MainFrameBase\r
 ###########################################################################\r
 \r
-class MainFrameBase ( wx.Frame ):\r
+class MainFrameBase ( wx.Frame wx.Frame ):\r
        \r
-       def __init__( self, parent ):\r
-               wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"PortAudio Device Enumeration"), pos = wx.DefaultPosition, size = wx.Size( 790,400 ), style = wx.CLOSE_BOX|wx.DEFAULT_FRAME_STYLE|wx.RESIZE_BORDER|wx.TAB_TRAVERSAL )\r
+       def __init__( self, parent ):def __init__( self, parent ):\r
+               wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"PortAudio Device Enumeration"), pos = wx.DefaultPosition, size = wx.Size( 690,400 ), style = wx.CLOSE_BOX|wx.DEFAULT_FRAME_STYLE|wx.RESIZE_BORDER|wx.TAB_TRAVERSAL )wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"PortAudio Device Enumeration"), pos = wx.DefaultPosition, size = wx.Size( 690,400 ), style = wx.CLOSE_BOX|wx.DEFAULT_FRAME_STYLE|wx.RESIZE_BORDER|wx.TAB_TRAVERSAL )\r
                \r
+               self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize )\r
                self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize )\r
                \r
                mainSizer = wx.BoxSizer( wx.VERTICAL )\r
@@ -280,11 +281,12 @@ class MainFrameBase ( wx.Frame ):
                self.SetSizer( mainSizer )\r
                self.Layout()\r
                \r
+               self.Centre( wx.BOTH )\r
                self.Centre( wx.BOTH )\r
                \r
                # Connect Events\r
-               self.Bind( wx.EVT_ACTIVATE_APP, self.OnActivateApp )\r
-               self.Bind( wx.EVT_CLOSE, self.OnCloseFrame )\r
+               self.Bind( wx.EVT_ACTIVATE_APP, self.OnActivateApp )self.Bind( wx.EVT_ACTIVATE_APP, self.OnActivateApp )\r
+               self.Bind( wx.EVT_CLOSE, self.OnCloseFrame )self.Bind( wx.EVT_CLOSE, self.OnCloseFrame )\r
                self.m_listCtrlRxInDevices.Bind( wx.EVT_LIST_ITEM_SELECTED, self.OnRxInDeviceSelect )\r
                self.m_listCtrlRxOutDevices.Bind( wx.EVT_LIST_ITEM_SELECTED, self.OnRxOutDeviceSelect )\r
                self.m_listCtrlTxInDevices.Bind( wx.EVT_LIST_ITEM_SELECTED, self.OnTxInDeviceSelect )\r
index f8b101ec7e33d1f22b58d0c7ea997811ab62bdb6..19cf18c9468218e11e76e9904afeb855d88402d8 100644 (file)
@@ -2,7 +2,7 @@
 <resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">\r
        <object class="wxFrame" name="MainFrameBase">\r
                <style>wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL</style>\r
-               <size>790,400</size>\r
+               <size>690,400</size>\r
                <title>PortAudio Device Enumeration</title>\r
                <centered>1</centered>\r
                <aui_managed>0</aui_managed>\r
index 68455e83cfe6514f0593168b21af27b72e5e5739..ed768b7b4cae21229165c9e53d4faa08f4308bbd 100644 (file)
@@ -83,7 +83,7 @@ MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent)
 \r
     m_RxOutDevices.m_listDevices  = m_listCtrlRxOutDevices;\r
     m_RxOutDevices.direction      = AUDIO_OUT;\r
-    m_RxOutDevices.m_textDevice   = m_textRxOut;\r
+    m_RxOutDevices.m_textDevice   = m_textCtrlRxOut;\r
     m_RxOutDevices.m_cbSampleRate = m_cbSampleRateRxOut;\r
 \r
     m_TxInDevices.m_listDevices   = m_listCtrlTxInDevices;\r
@@ -93,7 +93,7 @@ MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent)
 \r
     m_TxOutDevices.m_listDevices  = m_listCtrlTxOutDevices;\r
     m_TxOutDevices.direction      = AUDIO_OUT;\r
-    m_TxOutDevices.m_textDevice   = m_textCtrTxOut;\r
+    m_TxOutDevices.m_textDevice   = m_textCtrlTxOut;\r
     m_TxOutDevices.m_cbSampleRate = m_cbSampleRateTxOut;\r
 \r
     populateParams(m_RxInDevices);\r
@@ -232,19 +232,6 @@ void MainFrame::DisplaySupportedSampleRates(const PaStreamParameters *inputParam
     }\r
 }\r
 \r
-//-------------------------------------------------------------------------\r
-// OnRefreshClick()\r
-//-------------------------------------------------------------------------\r
-void MainFrame::OnRefreshClick(wxCommandEvent& event)\r
-{\r
-    m_notebook1->SetSelection(0);\r
-    showAPIInfo();\r
-    populateParams(m_RxInDevices);\r
-    populateParams(m_RxOutDevices);\r
-    populateParams(m_TxInDevices);\r
-    populateParams(m_TxOutDevices);\r
-}\r
-\r
 //-------------------------------------------------------------------------\r
 // GetAPIInfo()\r
 //-------------------------------------------------------------------------\r
@@ -427,3 +414,106 @@ void MainFrame::populateParams(AudioInfoDisplay ai)    //wxListCtrl* ctrl, int i
     }\r
 }\r
 \r
+//-------------------------------------------------------------------------\r
+// OnRxInDeviceSelect()\r
+//-------------------------------------------------------------------------\r
+void MainFrame::OnRxInDeviceSelect(wxListEvent& event)\r
+{\r
+    wxString str;\r
+    int index = event.GetIndex();\r
+    wxString str2;\r
+\r
+    str2 = m_listCtrlRxInDevices->GetItemText(index, 2);\r
+    str.Printf("Name: %s", str2);\r
+    wxMessageBox(str, _("OnSelect"));\r
+    m_textCtrlRxIn->SetValue(str2);\r
+//    event.Skip();\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnRxOutDeviceSelect()\r
+//-------------------------------------------------------------------------\r
+void MainFrame::OnRxOutDeviceSelect(wxListEvent& event)\r
+{\r
+    wxString str;\r
+    int index = event.GetIndex();\r
+    wxString str2;\r
+\r
+    str2 = m_listCtrlRxOutDevices->GetItemText(index, 2);\r
+    str.Printf("Name: %s", str2);\r
+    wxMessageBox(str, _("OnSelect"));\r
+    m_textCtrlRxOut->SetValue(str2);\r
+//    event.Skip();\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnTxInDeviceSelect()\r
+//-------------------------------------------------------------------------\r
+void MainFrame::OnTxInDeviceSelect(wxListEvent& event)\r
+{\r
+    wxString str;\r
+    int index = event.GetIndex();\r
+    wxString str2;\r
+\r
+    str2 = m_listCtrlTxInDevices->GetItemText(index, 2);\r
+    str.Printf("Name: %s", str2);\r
+    wxMessageBox(str, _("OnSelect"));\r
+    m_textCtrlTxIn->SetValue(str2);\r
+//    event.Skip();\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnTxOutDeviceSelect()\r
+//-------------------------------------------------------------------------\r
+void MainFrame::OnTxOutDeviceSelect(wxListEvent& event)\r
+{\r
+    wxString str;\r
+    int index = event.GetIndex();\r
+    wxString str2;\r
+\r
+    str2 = m_listCtrlTxOutDevices->GetItemText(index, 2);\r
+    str.Printf("Name: %s", str2);\r
+    wxMessageBox(str, _("OnSelect"));\r
+    m_textCtrlTxOut->SetValue(str2);\r
+//    event.Skip();\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnRefreshClick()\r
+//-------------------------------------------------------------------------\r
+void MainFrame::OnRefreshClick(wxCommandEvent& event)\r
+{\r
+    m_notebook1->SetSelection(0);\r
+    showAPIInfo();\r
+    populateParams(m_RxInDevices);\r
+    populateParams(m_RxOutDevices);\r
+    populateParams(m_TxInDevices);\r
+    populateParams(m_TxOutDevices);\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnApplyAudioParameters()\r
+//-------------------------------------------------------------------------\r
+void MainFrame::OnApplyAudioParameters(wxCommandEvent& event)\r
+{\r
+    Close();\r
+    event.Skip();\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnCancelAudioParameters()\r
+//-------------------------------------------------------------------------\r
+void MainFrame::OnCancelAudioParameters(wxCommandEvent& event)\r
+{\r
+    Close();\r
+    //event.Skip();\r
+}\r
+\r
+//-------------------------------------------------------------------------\r
+// OnOkAudioParameters()\r
+//-------------------------------------------------------------------------\r
+void MainFrame::OnOkAudioParameters(wxCommandEvent& event)\r
+{\r
+    Close();\r
+    event.Skip();\r
+}\r
index b962a51da2190353f376e84067d88a66187962df..cec65951e88313bf9c7b3caae61488207f8b83ec 100644 (file)
@@ -99,10 +99,20 @@ class MainFrame : public MainFrameBase
         void OnDeviceSelect( wxListEvent& event );\r
 
         void OnExitClick( wxCommandEvent& event );
-        void OnRefreshClick( wxCommandEvent& event );\r
         void DisplaySupportedSampleRates(const PaStreamParameters *inputParameters, const PaStreamParameters *outputParameters);\r
         void populateParams(AudioInfoDisplay);
         void showAPIInfo();\r
+\r
+//        void OnActivateApp( wxActivateEvent& event ) { event.Skip(); }\r
+//        void OnCloseFrame( wxCloseEvent& event ) { event.Skip(); }\r
+        void OnRxInDeviceSelect(wxListEvent& event);\r
+        void OnRxOutDeviceSelect(wxListEvent& event);\r
+        void OnTxInDeviceSelect(wxListEvent& event);\r
+        void OnTxOutDeviceSelect(wxListEvent& event);\r
+        void OnRefreshClick(wxCommandEvent& event);\r
+        void OnApplyAudioParameters(wxCommandEvent& event);\r
+        void OnCancelAudioParameters(wxCommandEvent& event);\r
+        void OnOkAudioParameters(wxCommandEvent& event);\r
         AudioInfoDisplay m_RxInDevices;\r
         AudioInfoDisplay m_RxOutDevices;\r
         AudioInfoDisplay m_TxInDevices;\r
index 4aca206ae71167c2d76da0d3a7ed011d77a68eb0..c40f6ef805d6485c7c04bb4bdaf4568f982fb4a9 100644 (file)
@@ -2,21 +2,20 @@
 ## Auto Generated makefile by CodeLite IDE\r
 ## any manual changes will be erased      \r
 ##\r
-## Release\r
+## Debug\r
 ProjectName            :=pa_enum\r
-ConfigurationName      :=Release\r
-IntermediateDirectory  :=./Release\r
+ConfigurationName      :=Debug\r
+WorkspacePath          := "C:\bin\Projects\Radio\fdmdv2\build"\r
+ProjectPath            := "C:\bin\Projects\Radio\fdmdv2\tests\pa_enum"\r
+IntermediateDirectory  :=./Debug\r
 OutDir                 := $(IntermediateDirectory)\r
-WorkspacePath          := "C:\Users\wittend\Projects\Radio\fdmdv2"\r
-ProjectPath            := "C:\Users\wittend\Projects\Radio\fdmdv2\pa_enum"\r
 CurrentFileName        :=\r
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
-User                   :=wittend\r
-Date                   :=8/14/2012\r
-CodeLitePath           :="C:\Program Files\CodeLite"\r
+User                   :=OFA-Staff\r
+Date                   :=10/25/2012\r
+CodeLitePath           :="C:\bin\CodeLite"\r
 LinkerName             :=g++\r
-ArchiveTool            :=ar rcus\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
 ObjectSuffix           :=.o\r
 DependSuffix           :=.o.d\r
@@ -28,30 +27,37 @@ OutputSwitch           :=-o
 LibraryPathSwitch      :=-L\r
 PreprocessorSwitch     :=-D\r
 SourceSwitch           :=-c \r
-CompilerName           :=g++\r
-C_CompilerName         :=gcc\r
 OutputFile             :=$(IntermediateDirectory)/$(ProjectName)\r
 Preprocessors          :=$(PreprocessorSwitch)__WX__ \r
 ObjectSwitch           :=-o \r
 ArchiveOutputSwitch    := \r
 PreprocessOnlySwitch   :=-E \r
-ObjectsFileList        :="C:\Users\wittend\Projects\Radio\fdmdv2\pa_enum\pa_enum.txt"\r
+ObjectsFileList        :="C:\bin\Projects\Radio\fdmdv2\tests\pa_enum\pa_enum.txt"\r
 PCHCompileFlags        :=\r
 MakeDirCommand         :=makedir\r
-CmpOptions             := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)\r
-C_CmpOptions           := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)\r
-LinkOptions            :=  -mwindows -s $(shell wx-config --debug=no --libs --unicode=yes)\r
-IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW/msys/1.0/local/include \r
+LinkOptions            :=  -mwindows $(shell wx-config --debug=yes --libs --unicode=yes)\r
+IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.6.1/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/ \r
 IncludePCH             := \r
 RcIncludePath          := \r
 Libs                   := $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp \r
-LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW/msys/1.0/local/lib \r
+ArLibs                 :=  "libportaudio.a" "libportaudiocpp.a" \r
+LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW-4.6.1/msys/1.0/local/lib \r
+\r
+##\r
+## Common variables\r
+## AR, CXX, CC, CXXFLAGS and CFLAGS can be overriden using an environment variables\r
+##\r
+AR       := ar rcus\r
+CXX      := g++\r
+CC       := gcc\r
+CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"810\"  $(Preprocessors)\r
+CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"810\"  $(Preprocessors)\r
 \r
 \r
 ##\r
 ## User defined environment variables\r
 ##\r
-CodeLiteDir:=C:\Program Files\CodeLite\r
+CodeLiteDir:=C:\bin\CodeLite\r
 WXWIN:=C:\bin\wxWidgets-2.9.4\r
 PATH:=$(WXWIN)\lib\gcc_dll;$(PATH)\r
 WXCFG:=gcc_dll\mswu\r
@@ -71,7 +77,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects)
        $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)\r
 \r
 $(IntermediateDirectory)/.d:\r
-       @$(MakeDirCommand) "./Release"\r
+       @$(MakeDirCommand) "./Debug"\r
 \r
 PreBuild:\r
 \r
@@ -80,20 +86,20 @@ PreBuild:
 ## Objects\r
 ##\r
 $(IntermediateDirectory)/gui$(ObjectSuffix): gui.cpp $(IntermediateDirectory)/gui$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_enum/gui.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/gui$(ObjectSuffix) $(IncludePath)\r
+       $(CXX) $(IncludePCH) $(SourceSwitch) "C:/bin/Projects/Radio/fdmdv2/tests/pa_enum/gui.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/gui$(ObjectSuffix) $(IncludePath)\r
 $(IntermediateDirectory)/gui$(DependSuffix): gui.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/gui$(ObjectSuffix) -MF$(IntermediateDirectory)/gui$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/pa_enum/gui.cpp"\r
+       @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/gui$(ObjectSuffix) -MF$(IntermediateDirectory)/gui$(DependSuffix) -MM "C:/bin/Projects/Radio/fdmdv2/tests/pa_enum/gui.cpp"\r
 \r
 $(IntermediateDirectory)/gui$(PreprocessSuffix): gui.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/gui$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_enum/gui.cpp"\r
+       @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/gui$(PreprocessSuffix) "C:/bin/Projects/Radio/fdmdv2/tests/pa_enum/gui.cpp"\r
 \r
 $(IntermediateDirectory)/main$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main$(DependSuffix)\r
-       $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_enum/main.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/main$(ObjectSuffix) $(IncludePath)\r
+       $(CXX) $(IncludePCH) $(SourceSwitch) "C:/bin/Projects/Radio/fdmdv2/tests/pa_enum/main.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main$(ObjectSuffix) $(IncludePath)\r
 $(IntermediateDirectory)/main$(DependSuffix): main.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main$(ObjectSuffix) -MF$(IntermediateDirectory)/main$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/pa_enum/main.cpp"\r
+       @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main$(ObjectSuffix) -MF$(IntermediateDirectory)/main$(DependSuffix) -MM "C:/bin/Projects/Radio/fdmdv2/tests/pa_enum/main.cpp"\r
 \r
 $(IntermediateDirectory)/main$(PreprocessSuffix): main.cpp\r
-       @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_enum/main.cpp"\r
+       @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main$(PreprocessSuffix) "C:/bin/Projects/Radio/fdmdv2/tests/pa_enum/main.cpp"\r
 \r
 \r
 -include $(IntermediateDirectory)/*$(DependSuffix)\r
@@ -109,6 +115,6 @@ clean:
        $(RM) $(IntermediateDirectory)/main$(PreprocessSuffix)\r
        $(RM) $(OutputFile)\r
        $(RM) $(OutputFile).exe\r
-       $(RM) "C:\Users\wittend\Projects\Radio\fdmdv2\.build-release\pa_enum"\r
+       $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-debug\pa_enum"\r
 \r
 \r
index df12bc4d57be5599eca5636ba1258d1ccbf0164d..5a1e49bc5064a5957419b532a74719287f11b8ae 100644 (file)
       <ResourceCompiler Options=""/>
     </GlobalSettings>
     <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="C:\Users\wittend\Projects\Radio\fdmdv2\pa_enum\main.h" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
-        <IncludePath Value="/bin/MinGW/msys/1.0/local/include"/>
+      <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="/bin/Projects/Audio/libsndfile/"/>
         <Preprocessor Value="__WX__"/>
       </Compiler>
       <Linker Options="-mwindows;$(shell wx-config --debug=yes --libs --unicode=yes)" Required="yes">
-        <LibraryPath Value="/bin/MinGW/msys/1.0/local/lib"/>
+        <LibraryPath Value="/bin/MinGW-4.6.1/msys/1.0/local/lib"/>
         <Library Value="libportaudio.a"/>
         <Library Value="libportaudiocpp.a"/>
       </Linker>
@@ -66,6 +68,7 @@
         <CustomPreBuild/>
       </AdditionalRules>
       <Completion EnableCpp11="no">
+        <ClangCmpFlagsC/>
         <ClangCmpFlags/>
         <ClangPP/>
         <SearchPaths/>
     </Configuration>
     <Configuration Name="Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
       <Compiler Options="-O2;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=no)" C_Options="-O2;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=no)" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
-        <IncludePath Value="/bin/MinGW/msys/1.0/local/include"/>
+        <IncludePath Value="/bin/MinGW-4.6.1/msys/1.0/local/include"/>
+        <IncludePath Value="../../codec2-dev/src"/>
+        <IncludePath Value="/bin/Projects/Audio/libsndfile/"/>
         <Preprocessor Value="__WX__"/>
       </Compiler>
       <Linker Options="-mwindows;-s;$(shell wx-config --debug=no --libs --unicode=yes)" Required="yes">
-        <LibraryPath Value="/bin/MinGW/msys/1.0/local/lib"/>
+        <LibraryPath Value="/bin/MinGW-4.6.1/msys/1.0/local/lib"/>
         <Library Value="libportaudio.a"/>
         <Library Value="libportaudiocpp.a"/>
       </Linker>
         <CustomPreBuild/>
       </AdditionalRules>
       <Completion EnableCpp11="no">
+        <ClangCmpFlagsC/>
         <ClangCmpFlags/>
         <ClangPP/>
         <SearchPaths/>
index 8e987060060180abdd0ee934c24570c8f269fbf1..df3ff2994ae3d7929d4c6f09c21d5f3bc0d77f9b 100644 (file)
@@ -1 +1 @@
-./Release/gui.o ./Release/main.o  \r
+./Debug/gui.o ./Debug/main.o  \r