From: wittend99 Date: Thu, 25 Oct 2012 18:39:14 +0000 (+0000) Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@812 01035d8c-6547-0410-b346-abe4f9... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=5fb5cf0a0eb785085ca442192abbf7e8f8b94d51;p=freetel-svn-tracking.git git-svn-id: https://svn.code.sf.net/p/freetel/code@812 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk index 6cdc5253..01de3a33 100644 --- a/fdmdv2/build/fdmdv2.mk +++ b/fdmdv2/build/fdmdv2.mk @@ -2,18 +2,18 @@ ## Auto Generated makefile by CodeLite IDE ## any manual changes will be erased ## -## Release +## Debug ProjectName :=fdmdv2 -ConfigurationName :=Release +ConfigurationName :=Debug WorkspacePath := "C:\bin\Projects\Radio\fdmdv2\build" ProjectPath := "C:\bin\Projects\Radio\fdmdv2\build" -IntermediateDirectory :=./Release +IntermediateDirectory :=./Debug OutDir := $(IntermediateDirectory) CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=OFA-Staff -Date :=10/24/2012 +Date :=10/25/2012 CodeLitePath :="C:\bin\CodeLite" LinkerName :=g++ SharedObjectLinkerName :=g++ -shared -fPIC @@ -35,8 +35,8 @@ PreprocessOnlySwitch :=-E ObjectsFileList :="C:\bin\Projects\Radio\fdmdv2\build\fdmdv2.txt" PCHCompileFlags := MakeDirCommand :=makedir -LinkOptions := -mwindows -s $(shell wx-config --debug=no --libs --unicode=yes) -IncludePath := $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.6.1/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/ +LinkOptions := -mwindows $(shell wx-config --debug=yes --libs --unicode=yes) +IncludePath := $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.6.1/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/include IncludePCH := RcIncludePath := Libs := $(LibrarySwitch)sndfile-1 $(LibrarySwitch)codec2 $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp @@ -50,8 +50,8 @@ LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/Project AR := ar rcus CXX := g++ CC := gcc -CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"803\" $(Preprocessors) -CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"803\" $(Preprocessors) +CXXFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"810\" $(Preprocessors) +CFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"810\" $(Preprocessors) ## @@ -78,7 +78,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects) $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) $(IntermediateDirectory)/.d: - @$(MakeDirCommand) "./Release" + @$(MakeDirCommand) "./Debug" PreBuild: @@ -237,6 +237,6 @@ clean: $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(PreprocessSuffix) $(RM) $(OutputFile) $(RM) $(OutputFile).exe - $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-release\fdmdv2" + $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-debug\fdmdv2" diff --git a/fdmdv2/build/fdmdv2.workspace b/fdmdv2/build/fdmdv2.workspace index 9d2905da..6e5a6830 100644 --- a/fdmdv2/build/fdmdv2.workspace +++ b/fdmdv2/build/fdmdv2.workspace @@ -1,18 +1,21 @@ - + + - + + - + + diff --git a/fdmdv2/build/fdmdv2_wsp.mk b/fdmdv2/build/fdmdv2_wsp.mk index 59fb53ea..e7ba3f48 100644 --- a/fdmdv2/build/fdmdv2_wsp.mk +++ b/fdmdv2/build/fdmdv2_wsp.mk @@ -1,8 +1,8 @@ .PHONY: clean All All: - @echo ----------Building project:[ fdmdv2 - Release ]---------- - @"$(MAKE)" -f "fdmdv2.mk" + @echo ----------Building project:[ 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 diff --git a/fdmdv2/tests/pa_enum/Debug/pa_enum.exe b/fdmdv2/tests/pa_enum/Debug/pa_enum.exe index f2c76996..040490a5 100644 Binary files a/fdmdv2/tests/pa_enum/Debug/pa_enum.exe and b/fdmdv2/tests/pa_enum/Debug/pa_enum.exe differ diff --git a/fdmdv2/tests/pa_enum/Release/pa_enum.exe b/fdmdv2/tests/pa_enum/Release/pa_enum.exe index f38b510e..ba26986b 100644 Binary files a/fdmdv2/tests/pa_enum/Release/pa_enum.exe and b/fdmdv2/tests/pa_enum/Release/pa_enum.exe differ diff --git a/fdmdv2/tests/pa_enum/gui.cpp b/fdmdv2/tests/pa_enum/gui.cpp index 35cbda2b..2ba6be53 100644 --- a/fdmdv2/tests/pa_enum/gui.cpp +++ b/fdmdv2/tests/pa_enum/gui.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 17 2012) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -12,84 +12,85 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + wxBoxSizer* mainSizer; mainSizer = new wxBoxSizer( wxVERTICAL ); - + m_panel1 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxVERTICAL ); - + m_notebook1 = new wxNotebook( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM ); m_panelRx = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer20; bSizer20 = new wxBoxSizer( wxVERTICAL ); - + wxGridSizer* gSizer4; gSizer4 = new wxGridSizer( 2, 1, 0, 0 ); - + wxStaticBoxSizer* sbSizer2; sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_panelRx, wxID_ANY, _("Rx Radio Device") ), wxVERTICAL ); - + m_listCtrlRxInDevices = new wxListCtrl( m_panelRx, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES ); sbSizer2->Add( m_listCtrlRxInDevices, 1, wxALL|wxEXPAND, 1 ); - + wxBoxSizer* bSizer811; bSizer811 = new wxBoxSizer( wxHORIZONTAL ); - + m_staticText51 = new wxStaticText( m_panelRx, wxID_ANY, _("Device:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText51->Wrap( -1 ); bSizer811->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_textCtrlRxIn = new wxTextCtrl( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer811->Add( m_textCtrlRxIn, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 ); - + m_staticText6 = new wxStaticText( m_panelRx, wxID_ANY, _("Sample Rate:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6->Wrap( -1 ); bSizer811->Add( m_staticText6, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_cbSampleRateRxIn = new wxComboBox( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); + + m_cbSampleRateRxIn = new wxComboBox( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); bSizer811->Add( m_cbSampleRateRxIn, 0, wxALL, 1 ); - - + + sbSizer2->Add( bSizer811, 0, wxEXPAND, 5 ); - - + + gSizer4->Add( sbSizer2, 1, wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizer3; sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_panelRx, wxID_ANY, _("Rx Speaker Stream") ), wxVERTICAL ); - + m_listCtrlRxOutDevices = new wxListCtrl( m_panelRx, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES ); sbSizer3->Add( m_listCtrlRxOutDevices, 1, wxALL|wxEXPAND, 1 ); - + wxBoxSizer* bSizer81; bSizer81 = new wxBoxSizer( wxHORIZONTAL ); - + m_staticText9 = new wxStaticText( m_panelRx, wxID_ANY, _("Device:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText9->Wrap( -1 ); bSizer81->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_textRxOut = new wxTextCtrl( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer81->Add( m_textRxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 ); - + + m_textCtrlRxOut = new wxTextCtrl( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer81->Add( m_textCtrlRxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 ); + m_staticText10 = new wxStaticText( m_panelRx, wxID_ANY, _("Sample Rate:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText10->Wrap( -1 ); bSizer81->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_cbSampleRateRxOut = new wxComboBox( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); + + m_cbSampleRateRxOut = new wxComboBox( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); bSizer81->Add( m_cbSampleRateRxOut, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1 ); - - + + sbSizer3->Add( bSizer81, 0, wxEXPAND, 2 ); - - + + gSizer4->Add( sbSizer3, 1, wxEXPAND, 2 ); - - + + bSizer20->Add( gSizer4, 1, wxEXPAND, 1 ); - - + + m_panelRx->SetSizer( bSizer20 ); m_panelRx->Layout(); bSizer20->Fit( m_panelRx ); @@ -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 ); wxBoxSizer* bSizer18; bSizer18 = new wxBoxSizer( wxVERTICAL ); - + wxGridSizer* gSizer2; gSizer2 = new wxGridSizer( 2, 1, 0, 0 ); - + wxStaticBoxSizer* sbSizer22; sbSizer22 = new wxStaticBoxSizer( new wxStaticBox( m_panelTx, wxID_ANY, _("Tx Microphone Stream") ), wxVERTICAL ); - + m_listCtrlTxInDevices = new wxListCtrl( m_panelTx, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES ); sbSizer22->Add( m_listCtrlTxInDevices, 1, wxALL|wxEXPAND, 1 ); - + wxBoxSizer* bSizer83; bSizer83 = new wxBoxSizer( wxHORIZONTAL ); - + m_staticText12 = new wxStaticText( m_panelTx, wxID_ANY, _("Device:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText12->Wrap( -1 ); bSizer83->Add( m_staticText12, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - + m_textCtrlTxIn = new wxTextCtrl( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer83->Add( m_textCtrlTxIn, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 ); - + m_staticText11 = new wxStaticText( m_panelTx, wxID_ANY, _("Sample Rate:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText11->Wrap( -1 ); bSizer83->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_cbSampleRateTxIn = new wxComboBox( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); + + m_cbSampleRateTxIn = new wxComboBox( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); bSizer83->Add( m_cbSampleRateTxIn, 0, wxALL, 1 ); - - + + sbSizer22->Add( bSizer83, 0, wxEXPAND, 2 ); - - + + gSizer2->Add( sbSizer22, 1, wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizer21; sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_panelTx, wxID_ANY, _("Tx Radio Stream") ), wxVERTICAL ); - + m_listCtrlTxOutDevices = new wxListCtrl( m_panelTx, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES ); sbSizer21->Add( m_listCtrlTxOutDevices, 1, wxALL|wxEXPAND, 2 ); - + wxBoxSizer* bSizer82; bSizer82 = new wxBoxSizer( wxHORIZONTAL ); - + m_staticText81 = new wxStaticText( m_panelTx, wxID_ANY, _("Device:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText81->Wrap( -1 ); bSizer82->Add( m_staticText81, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_textCtrTxOut = new wxTextCtrl( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer82->Add( m_textCtrTxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 ); - + + m_textCtrlTxOut = new wxTextCtrl( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer82->Add( m_textCtrlTxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 ); + m_staticText71 = new wxStaticText( m_panelTx, wxID_ANY, _("Sample Rate:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText71->Wrap( -1 ); bSizer82->Add( m_staticText71, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_cbSampleRateTxOut = new wxComboBox( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); + + m_cbSampleRateTxOut = new wxComboBox( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); bSizer82->Add( m_cbSampleRateTxOut, 0, wxALL, 1 ); - - + + sbSizer21->Add( bSizer82, 0, wxEXPAND, 2 ); - - + + gSizer2->Add( sbSizer21, 1, wxEXPAND, 5 ); - - + + bSizer18->Add( gSizer2, 1, wxEXPAND, 1 ); - - + + m_panelTx->SetSizer( bSizer18 ); m_panelTx->Layout(); bSizer18->Fit( m_panelTx ); @@ -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 ); wxBoxSizer* bSizer12; bSizer12 = new wxBoxSizer( wxHORIZONTAL ); - + wxGridSizer* gSizer31; gSizer31 = new wxGridSizer( 2, 1, 0, 0 ); - + wxStaticBoxSizer* sbSizer1; sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_panelAPI, wxID_ANY, _("PortAudio") ), wxVERTICAL ); - + wxGridSizer* gSizer3; gSizer3 = new wxGridSizer( 4, 2, 0, 0 ); - + m_staticText7 = new wxStaticText( m_panelAPI, wxID_ANY, _("PortAudio Version String:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText7->Wrap( -1 ); gSizer3->Add( m_staticText7, 0, wxALIGN_RIGHT|wxALL|wxALIGN_CENTER_VERTICAL, 1 ); - + wxBoxSizer* bSizer151; bSizer151 = new wxBoxSizer( wxVERTICAL ); - + m_textStringVer = new wxTextCtrl( m_panelAPI, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); bSizer151->Add( m_textStringVer, 0, wxALL|wxEXPAND, 1 ); - - + + gSizer3->Add( bSizer151, 1, wxEXPAND, 2 ); - + m_staticText8 = new wxStaticText( m_panelAPI, wxID_ANY, _("PortAudio Int Version:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText8->Wrap( -1 ); gSizer3->Add( m_staticText8, 0, wxALIGN_RIGHT|wxALL|wxALIGN_CENTER_VERTICAL, 1 ); - + wxBoxSizer* bSizer13; bSizer13 = new wxBoxSizer( wxVERTICAL ); - + m_textIntVer = new wxTextCtrl( m_panelAPI, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); bSizer13->Add( m_textIntVer, 0, wxALL|wxALIGN_CENTER_VERTICAL, 1 ); - - + + gSizer3->Add( bSizer13, 1, wxEXPAND, 5 ); - + m_staticText5 = new wxStaticText( m_panelAPI, wxID_ANY, _("Device Count:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( -1 ); gSizer3->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 1 ); - + wxBoxSizer* bSizer14; bSizer14 = new wxBoxSizer( wxVERTICAL ); - + m_textCDevCount = new wxTextCtrl( m_panelAPI, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 45,-1 ), wxTE_READONLY ); m_textCDevCount->SetMaxSize( wxSize( 45,-1 ) ); - + bSizer14->Add( m_textCDevCount, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1 ); - - + + gSizer3->Add( bSizer14, 1, wxEXPAND, 5 ); - + m_staticText4 = new wxStaticText( m_panelAPI, wxID_ANY, _("API Count:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); gSizer3->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 1 ); - + wxBoxSizer* bSizer15; bSizer15 = new wxBoxSizer( wxVERTICAL ); - + m_textAPICount = new wxTextCtrl( m_panelAPI, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 45,-1 ), wxTE_READONLY ); m_textAPICount->SetMaxSize( wxSize( 45,-1 ) ); - + bSizer15->Add( m_textAPICount, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1 ); - - + + gSizer3->Add( bSizer15, 1, wxEXPAND, 5 ); - - + + sbSizer1->Add( gSizer3, 1, wxEXPAND, 2 ); - - + + gSizer31->Add( sbSizer1, 1, wxEXPAND, 2 ); - + wxStaticBoxSizer* sbSizer6; sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( m_panelAPI, wxID_ANY, _("Other") ), wxVERTICAL ); - - + + gSizer31->Add( sbSizer6, 1, wxEXPAND, 5 ); - - + + bSizer12->Add( gSizer31, 1, wxEXPAND, 5 ); - - + + m_panelAPI->SetSizer( bSizer12 ); m_panelAPI->Layout(); bSizer12->Fit( m_panelAPI ); m_notebook1->AddPage( m_panelAPI, _("API Info"), false ); - + bSizer4->Add( m_notebook1, 1, wxEXPAND | wxALL, 0 ); - - + + m_panel1->SetSizer( bSizer4 ); m_panel1->Layout(); bSizer4->Fit( m_panel1 ); mainSizer->Add( m_panel1, 1, wxEXPAND | wxALL, 1 ); - + wxBoxSizer* bSizer6; bSizer6 = new wxBoxSizer( wxHORIZONTAL ); - + m_btnRefresh = new wxButton( this, wxID_ANY, _("Refresh"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer6->Add( m_btnRefresh, 0, wxALIGN_CENTER|wxALL, 2 ); - + m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); @@ -279,21 +280,22 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - + bSizer6->Add( m_sdbSizer1, 1, wxALIGN_CENTER_VERTICAL, 2 ); - - + + mainSizer->Add( bSizer6, 0, wxEXPAND, 2 ); - - + + this->SetSizer( mainSizer ); this->Layout(); - + this->Centre( wxBOTH ); - + this->Centre( wxBOTH ); + // Connect Events - this->Connect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) ); - this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) ); + this->Connect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) );this->Connect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) ); + this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) ); m_listCtrlRxInDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnRxInDeviceSelect ), NULL, this ); m_listCtrlRxOutDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnRxOutDeviceSelect ), NULL, this ); m_listCtrlTxInDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnTxInDeviceSelect ), NULL, this ); @@ -307,8 +309,8 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t MainFrameBase::~MainFrameBase() { // Disconnect Events - this->Disconnect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) ); - this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) ); + this->Disconnect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) );this->Disconnect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) ); + this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) ); m_listCtrlRxInDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnRxInDeviceSelect ), NULL, this ); m_listCtrlRxOutDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnRxOutDeviceSelect ), NULL, this ); m_listCtrlTxInDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnTxInDeviceSelect ), NULL, this ); @@ -317,5 +319,5 @@ MainFrameBase::~MainFrameBase() m_sdbSizer1Apply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnApplyAudioParameters ), NULL, this ); m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnCancelAudioParameters ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnOkAudioParameters ), NULL, this ); - + } diff --git a/fdmdv2/tests/pa_enum/gui.fbp b/fdmdv2/tests/pa_enum/gui.fbp index 4f69c823..97f7182c 100644 --- a/fdmdv2/tests/pa_enum/gui.fbp +++ b/fdmdv2/tests/pa_enum/gui.fbp @@ -25,62 +25,27 @@ 0 0 - 1 - 1 - 1 - 1 - 0 - - - - - - 1 wxBOTH - 0 - 1 1 - 0 - Dock - 0 - Left 1 impl_virtual - 1 - 0 0 wxID_ANY - - 0 - - 0 - 1 MainFrameBase - 1 - - - 1 - Resizable - 1 - 790,400 + 690,400 wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER PortAudio Device Enumeration - 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -177,10 +142,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -266,10 +227,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -302,7 +259,7 @@ Receive 1 - + 1 1 1 @@ -350,10 +307,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -380,16 +333,16 @@ - + bSizer20 wxVERTICAL none - + 1 wxEXPAND 1 - + 1 0 @@ -397,11 +350,11 @@ none 2 0 - + 5 wxEXPAND 1 - + wxID_ANY Rx Radio Device @@ -514,20 +467,20 @@ - + 5 wxEXPAND 0 - + bSizer811 wxHORIZONTAL none - + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL 0 - + 1 1 1 @@ -577,10 +530,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -701,11 +650,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL 0 - + 1 1 1 @@ -755,10 +704,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -788,11 +733,11 @@ - + 1 wxALL 0 - + 1 1 1 @@ -883,11 +828,11 @@ - + 2 wxEXPAND 1 - + wxID_ANY Rx Speaker Stream @@ -1000,20 +945,20 @@ - + 2 wxEXPAND 0 - + bSizer81 wxHORIZONTAL none - + 5 wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 1 1 @@ -1063,10 +1008,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1187,11 +1128,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL 0 - + 1 1 1 @@ -1241,10 +1182,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1274,11 +1211,11 @@ - + 1 wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 1 1 @@ -1378,7 +1315,7 @@ Transmit 0 - + 1 1 1 @@ -1426,10 +1363,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -1456,16 +1389,16 @@ - + bSizer18 wxVERTICAL none - + 1 wxEXPAND 1 - + 1 0 @@ -1599,11 +1532,11 @@ bSizer83 wxHORIZONTAL none - + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL 0 - + 1 1 1 @@ -1653,10 +1586,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1777,11 +1706,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL 0 - + 1 1 1 @@ -1831,10 +1760,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -1864,11 +1789,11 @@ - + 1 wxALL 0 - + 1 1 1 @@ -1959,11 +1884,11 @@ - + 5 wxEXPAND 1 - + wxID_ANY Tx Radio Stream @@ -2076,20 +2001,20 @@ - + 2 wxEXPAND 0 - + bSizer82 wxHORIZONTAL none - + 5 wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 1 1 @@ -2139,10 +2064,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -2263,11 +2184,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL 0 - + 1 1 1 @@ -2317,10 +2238,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -2350,11 +2267,11 @@ - + 1 wxALL 0 - + 1 1 1 @@ -2454,7 +2371,7 @@ API Info 0 - + 1 1 1 @@ -2502,10 +2419,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - wxTAB_TRAVERSAL @@ -2532,16 +2445,16 @@ - + bSizer12 wxHORIZONTAL none - + 5 wxEXPAND 1 - + 1 0 @@ -2549,11 +2462,11 @@ none 2 0 - + 2 wxEXPAND 1 - + wxID_ANY PortAudio @@ -2561,11 +2474,11 @@ wxVERTICAL none - + 2 wxEXPAND 1 - + 2 0 @@ -2627,10 +2540,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -2816,10 +2725,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -3005,10 +2910,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - @@ -3194,10 +3095,6 @@ 0 - - wxFILTER_NONE - wxDefaultValidator - diff --git a/fdmdv2/tests/pa_enum/gui.h b/fdmdv2/tests/pa_enum/gui.h index d296ef6e..821e7cf4 100644 --- a/fdmdv2/tests/pa_enum/gui.h +++ b/fdmdv2/tests/pa_enum/gui.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 17 2012) +// C++ code generated with wxFormBuilder (version Apr 10 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -12,11 +12,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include @@ -36,10 +36,10 @@ /////////////////////////////////////////////////////////////////////////////// /// Class MainFrameBase /////////////////////////////////////////////////////////////////////////////// -class MainFrameBase : public wxFrame +class MainFrameBase : public wxFrame { private: - + protected: wxPanel* m_panel1; wxNotebook* m_notebook1; @@ -51,7 +51,7 @@ class MainFrameBase : public wxFrame wxComboBox* m_cbSampleRateRxIn; wxListCtrl* m_listCtrlRxOutDevices; wxStaticText* m_staticText9; - wxTextCtrl* m_textRxOut; + wxTextCtrl* m_textCtrlRxOut; wxStaticText* m_staticText10; wxComboBox* m_cbSampleRateRxOut; wxPanel* m_panelTx; @@ -62,7 +62,7 @@ class MainFrameBase : public wxFrame wxComboBox* m_cbSampleRateTxIn; wxListCtrl* m_listCtrlTxOutDevices; wxStaticText* m_staticText81; - wxTextCtrl* m_textCtrTxOut; + wxTextCtrl* m_textCtrlTxOut; wxStaticText* m_staticText71; wxComboBox* m_cbSampleRateTxOut; wxPanel* m_panelAPI; @@ -79,7 +79,7 @@ class MainFrameBase : public wxFrame wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Apply; wxButton* m_sdbSizer1Cancel; - + // Virtual event handlers, overide them in your derived class virtual void OnActivateApp( wxActivateEvent& event ) { event.Skip(); } virtual void OnCloseFrame( wxCloseEvent& event ) { event.Skip(); } @@ -91,14 +91,15 @@ class MainFrameBase : public wxFrame virtual void OnApplyAudioParameters( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelAudioParameters( wxCommandEvent& event ) { event.Skip(); } virtual void OnOkAudioParameters( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - 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 ); - + + 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 ); +// 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 ); + ~MainFrameBase(); - + }; #endif //__GUI_H__ diff --git a/fdmdv2/tests/pa_enum/gui.py b/fdmdv2/tests/pa_enum/gui.py index 507c4ee5..bb191f96 100644 --- a/fdmdv2/tests/pa_enum/gui.py +++ b/fdmdv2/tests/pa_enum/gui.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ########################################################################### -## Python code generated with wxFormBuilder (version Mar 17 2012) +## Python code generated with wxFormBuilder (version Apr 10 2012) ## http://www.wxformbuilder.org/ ## ## PLEASE DO "NOT" EDIT THIS FILE! @@ -17,11 +17,12 @@ _ = gettext.gettext ## Class MainFrameBase ########################################################################### -class MainFrameBase ( wx.Frame ): +class MainFrameBase ( wx.Frame wx.Frame ): - def __init__( self, parent ): - 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 ) + def __init__( self, parent ):def __init__( self, parent ): + 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 ) + self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) mainSizer = wx.BoxSizer( wx.VERTICAL ) @@ -280,11 +281,12 @@ class MainFrameBase ( wx.Frame ): self.SetSizer( mainSizer ) self.Layout() + self.Centre( wx.BOTH ) self.Centre( wx.BOTH ) # Connect Events - self.Bind( wx.EVT_ACTIVATE_APP, self.OnActivateApp ) - self.Bind( wx.EVT_CLOSE, self.OnCloseFrame ) + self.Bind( wx.EVT_ACTIVATE_APP, self.OnActivateApp )self.Bind( wx.EVT_ACTIVATE_APP, self.OnActivateApp ) + self.Bind( wx.EVT_CLOSE, self.OnCloseFrame )self.Bind( wx.EVT_CLOSE, self.OnCloseFrame ) self.m_listCtrlRxInDevices.Bind( wx.EVT_LIST_ITEM_SELECTED, self.OnRxInDeviceSelect ) self.m_listCtrlRxOutDevices.Bind( wx.EVT_LIST_ITEM_SELECTED, self.OnRxOutDeviceSelect ) self.m_listCtrlTxInDevices.Bind( wx.EVT_LIST_ITEM_SELECTED, self.OnTxInDeviceSelect ) diff --git a/fdmdv2/tests/pa_enum/gui.xrc b/fdmdv2/tests/pa_enum/gui.xrc index f8b101ec..19cf18c9 100644 --- a/fdmdv2/tests/pa_enum/gui.xrc +++ b/fdmdv2/tests/pa_enum/gui.xrc @@ -2,7 +2,7 @@ - 790,400 + 690,400 PortAudio Device Enumeration 1 0 diff --git a/fdmdv2/tests/pa_enum/main.cpp b/fdmdv2/tests/pa_enum/main.cpp index 68455e83..ed768b7b 100644 --- a/fdmdv2/tests/pa_enum/main.cpp +++ b/fdmdv2/tests/pa_enum/main.cpp @@ -83,7 +83,7 @@ MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent) m_RxOutDevices.m_listDevices = m_listCtrlRxOutDevices; m_RxOutDevices.direction = AUDIO_OUT; - m_RxOutDevices.m_textDevice = m_textRxOut; + m_RxOutDevices.m_textDevice = m_textCtrlRxOut; m_RxOutDevices.m_cbSampleRate = m_cbSampleRateRxOut; m_TxInDevices.m_listDevices = m_listCtrlTxInDevices; @@ -93,7 +93,7 @@ MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent) m_TxOutDevices.m_listDevices = m_listCtrlTxOutDevices; m_TxOutDevices.direction = AUDIO_OUT; - m_TxOutDevices.m_textDevice = m_textCtrTxOut; + m_TxOutDevices.m_textDevice = m_textCtrlTxOut; m_TxOutDevices.m_cbSampleRate = m_cbSampleRateTxOut; populateParams(m_RxInDevices); @@ -232,19 +232,6 @@ void MainFrame::DisplaySupportedSampleRates(const PaStreamParameters *inputParam } } -//------------------------------------------------------------------------- -// OnRefreshClick() -//------------------------------------------------------------------------- -void MainFrame::OnRefreshClick(wxCommandEvent& event) -{ - m_notebook1->SetSelection(0); - showAPIInfo(); - populateParams(m_RxInDevices); - populateParams(m_RxOutDevices); - populateParams(m_TxInDevices); - populateParams(m_TxOutDevices); -} - //------------------------------------------------------------------------- // GetAPIInfo() //------------------------------------------------------------------------- @@ -427,3 +414,106 @@ void MainFrame::populateParams(AudioInfoDisplay ai) //wxListCtrl* ctrl, int i } } +//------------------------------------------------------------------------- +// OnRxInDeviceSelect() +//------------------------------------------------------------------------- +void MainFrame::OnRxInDeviceSelect(wxListEvent& event) +{ + wxString str; + int index = event.GetIndex(); + wxString str2; + + str2 = m_listCtrlRxInDevices->GetItemText(index, 2); + str.Printf("Name: %s", str2); + wxMessageBox(str, _("OnSelect")); + m_textCtrlRxIn->SetValue(str2); +// event.Skip(); +} + +//------------------------------------------------------------------------- +// OnRxOutDeviceSelect() +//------------------------------------------------------------------------- +void MainFrame::OnRxOutDeviceSelect(wxListEvent& event) +{ + wxString str; + int index = event.GetIndex(); + wxString str2; + + str2 = m_listCtrlRxOutDevices->GetItemText(index, 2); + str.Printf("Name: %s", str2); + wxMessageBox(str, _("OnSelect")); + m_textCtrlRxOut->SetValue(str2); +// event.Skip(); +} + +//------------------------------------------------------------------------- +// OnTxInDeviceSelect() +//------------------------------------------------------------------------- +void MainFrame::OnTxInDeviceSelect(wxListEvent& event) +{ + wxString str; + int index = event.GetIndex(); + wxString str2; + + str2 = m_listCtrlTxInDevices->GetItemText(index, 2); + str.Printf("Name: %s", str2); + wxMessageBox(str, _("OnSelect")); + m_textCtrlTxIn->SetValue(str2); +// event.Skip(); +} + +//------------------------------------------------------------------------- +// OnTxOutDeviceSelect() +//------------------------------------------------------------------------- +void MainFrame::OnTxOutDeviceSelect(wxListEvent& event) +{ + wxString str; + int index = event.GetIndex(); + wxString str2; + + str2 = m_listCtrlTxOutDevices->GetItemText(index, 2); + str.Printf("Name: %s", str2); + wxMessageBox(str, _("OnSelect")); + m_textCtrlTxOut->SetValue(str2); +// event.Skip(); +} + +//------------------------------------------------------------------------- +// OnRefreshClick() +//------------------------------------------------------------------------- +void MainFrame::OnRefreshClick(wxCommandEvent& event) +{ + m_notebook1->SetSelection(0); + showAPIInfo(); + populateParams(m_RxInDevices); + populateParams(m_RxOutDevices); + populateParams(m_TxInDevices); + populateParams(m_TxOutDevices); +} + +//------------------------------------------------------------------------- +// OnApplyAudioParameters() +//------------------------------------------------------------------------- +void MainFrame::OnApplyAudioParameters(wxCommandEvent& event) +{ + Close(); + event.Skip(); +} + +//------------------------------------------------------------------------- +// OnCancelAudioParameters() +//------------------------------------------------------------------------- +void MainFrame::OnCancelAudioParameters(wxCommandEvent& event) +{ + Close(); + //event.Skip(); +} + +//------------------------------------------------------------------------- +// OnOkAudioParameters() +//------------------------------------------------------------------------- +void MainFrame::OnOkAudioParameters(wxCommandEvent& event) +{ + Close(); + event.Skip(); +} diff --git a/fdmdv2/tests/pa_enum/main.h b/fdmdv2/tests/pa_enum/main.h index b962a51d..cec65951 100644 --- a/fdmdv2/tests/pa_enum/main.h +++ b/fdmdv2/tests/pa_enum/main.h @@ -99,10 +99,20 @@ class MainFrame : public MainFrameBase void OnDeviceSelect( wxListEvent& event ); void OnExitClick( wxCommandEvent& event ); - void OnRefreshClick( wxCommandEvent& event ); void DisplaySupportedSampleRates(const PaStreamParameters *inputParameters, const PaStreamParameters *outputParameters); void populateParams(AudioInfoDisplay); void showAPIInfo(); + +// void OnActivateApp( wxActivateEvent& event ) { event.Skip(); } +// void OnCloseFrame( wxCloseEvent& event ) { event.Skip(); } + void OnRxInDeviceSelect(wxListEvent& event); + void OnRxOutDeviceSelect(wxListEvent& event); + void OnTxInDeviceSelect(wxListEvent& event); + void OnTxOutDeviceSelect(wxListEvent& event); + void OnRefreshClick(wxCommandEvent& event); + void OnApplyAudioParameters(wxCommandEvent& event); + void OnCancelAudioParameters(wxCommandEvent& event); + void OnOkAudioParameters(wxCommandEvent& event); AudioInfoDisplay m_RxInDevices; AudioInfoDisplay m_RxOutDevices; AudioInfoDisplay m_TxInDevices; diff --git a/fdmdv2/tests/pa_enum/pa_enum.mk b/fdmdv2/tests/pa_enum/pa_enum.mk index 4aca206a..c40f6ef8 100644 --- a/fdmdv2/tests/pa_enum/pa_enum.mk +++ b/fdmdv2/tests/pa_enum/pa_enum.mk @@ -2,21 +2,20 @@ ## Auto Generated makefile by CodeLite IDE ## any manual changes will be erased ## -## Release +## Debug ProjectName :=pa_enum -ConfigurationName :=Release -IntermediateDirectory :=./Release +ConfigurationName :=Debug +WorkspacePath := "C:\bin\Projects\Radio\fdmdv2\build" +ProjectPath := "C:\bin\Projects\Radio\fdmdv2\tests\pa_enum" +IntermediateDirectory :=./Debug OutDir := $(IntermediateDirectory) -WorkspacePath := "C:\Users\wittend\Projects\Radio\fdmdv2" -ProjectPath := "C:\Users\wittend\Projects\Radio\fdmdv2\pa_enum" CurrentFileName := CurrentFilePath := CurrentFileFullPath := -User :=wittend -Date :=8/14/2012 -CodeLitePath :="C:\Program Files\CodeLite" +User :=OFA-Staff +Date :=10/25/2012 +CodeLitePath :="C:\bin\CodeLite" LinkerName :=g++ -ArchiveTool :=ar rcus SharedObjectLinkerName :=g++ -shared -fPIC ObjectSuffix :=.o DependSuffix :=.o.d @@ -28,30 +27,37 @@ OutputSwitch :=-o LibraryPathSwitch :=-L PreprocessorSwitch :=-D SourceSwitch :=-c -CompilerName :=g++ -C_CompilerName :=gcc OutputFile :=$(IntermediateDirectory)/$(ProjectName) Preprocessors :=$(PreprocessorSwitch)__WX__ ObjectSwitch :=-o ArchiveOutputSwitch := PreprocessOnlySwitch :=-E -ObjectsFileList :="C:\Users\wittend\Projects\Radio\fdmdv2\pa_enum\pa_enum.txt" +ObjectsFileList :="C:\bin\Projects\Radio\fdmdv2\tests\pa_enum\pa_enum.txt" PCHCompileFlags := MakeDirCommand :=makedir -CmpOptions := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors) -C_CmpOptions := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors) -LinkOptions := -mwindows -s $(shell wx-config --debug=no --libs --unicode=yes) -IncludePath := $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW/msys/1.0/local/include +LinkOptions := -mwindows $(shell wx-config --debug=yes --libs --unicode=yes) +IncludePath := $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.6.1/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/ IncludePCH := RcIncludePath := Libs := $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp -LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW/msys/1.0/local/lib +ArLibs := "libportaudio.a" "libportaudiocpp.a" +LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW-4.6.1/msys/1.0/local/lib + +## +## Common variables +## AR, CXX, CC, CXXFLAGS and CFLAGS can be overriden using an environment variables +## +AR := ar rcus +CXX := g++ +CC := gcc +CXXFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"810\" $(Preprocessors) +CFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"810\" $(Preprocessors) ## ## User defined environment variables ## -CodeLiteDir:=C:\Program Files\CodeLite +CodeLiteDir:=C:\bin\CodeLite WXWIN:=C:\bin\wxWidgets-2.9.4 PATH:=$(WXWIN)\lib\gcc_dll;$(PATH) WXCFG:=gcc_dll\mswu @@ -71,7 +77,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects) $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) $(IntermediateDirectory)/.d: - @$(MakeDirCommand) "./Release" + @$(MakeDirCommand) "./Debug" PreBuild: @@ -80,20 +86,20 @@ PreBuild: ## Objects ## $(IntermediateDirectory)/gui$(ObjectSuffix): gui.cpp $(IntermediateDirectory)/gui$(DependSuffix) - $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_enum/gui.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/gui$(ObjectSuffix) $(IncludePath) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/bin/Projects/Radio/fdmdv2/tests/pa_enum/gui.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/gui$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/gui$(DependSuffix): gui.cpp - @$(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" + @$(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" $(IntermediateDirectory)/gui$(PreprocessSuffix): gui.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/gui$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_enum/gui.cpp" + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/gui$(PreprocessSuffix) "C:/bin/Projects/Radio/fdmdv2/tests/pa_enum/gui.cpp" $(IntermediateDirectory)/main$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main$(DependSuffix) - $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_enum/main.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/main$(ObjectSuffix) $(IncludePath) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/bin/Projects/Radio/fdmdv2/tests/pa_enum/main.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/main$(DependSuffix): main.cpp - @$(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" + @$(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" $(IntermediateDirectory)/main$(PreprocessSuffix): main.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_enum/main.cpp" + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main$(PreprocessSuffix) "C:/bin/Projects/Radio/fdmdv2/tests/pa_enum/main.cpp" -include $(IntermediateDirectory)/*$(DependSuffix) @@ -109,6 +115,6 @@ clean: $(RM) $(IntermediateDirectory)/main$(PreprocessSuffix) $(RM) $(OutputFile) $(RM) $(OutputFile).exe - $(RM) "C:\Users\wittend\Projects\Radio\fdmdv2\.build-release\pa_enum" + $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-debug\pa_enum" diff --git a/fdmdv2/tests/pa_enum/pa_enum.project b/fdmdv2/tests/pa_enum/pa_enum.project index df12bc4d..5a1e49bc 100644 --- a/fdmdv2/tests/pa_enum/pa_enum.project +++ b/fdmdv2/tests/pa_enum/pa_enum.project @@ -31,12 +31,14 @@ - - + + + + - + @@ -66,6 +68,7 @@ + @@ -73,11 +76,13 @@ - + + + - + @@ -107,6 +112,7 @@ + diff --git a/fdmdv2/tests/pa_enum/pa_enum.txt b/fdmdv2/tests/pa_enum/pa_enum.txt index 8e987060..df3ff299 100644 --- a/fdmdv2/tests/pa_enum/pa_enum.txt +++ b/fdmdv2/tests/pa_enum/pa_enum.txt @@ -1 +1 @@ -./Release/gui.o ./Release/main.o +./Debug/gui.o ./Debug/main.o