From: wittend99 Date: Sun, 20 May 2012 01:58:55 +0000 (+0000) Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@485 01035d8c-6547-0410-b346-abe4f9... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=6142c92f8b1358c1595c875ab220dc3d7a478e06;p=freetel-svn-tracking.git git-svn-id: https://svn.code.sf.net/p/freetel/code@485 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/extern/lib/libctb-0.16.so b/fdmdv2/extern/lib/libctb-0.16.so new file mode 100644 index 00000000..08cbe000 Binary files /dev/null and b/fdmdv2/extern/lib/libctb-0.16.so differ diff --git a/fdmdv2/fdmdv2.mk b/fdmdv2/fdmdv2.mk index 8dc37dad..5f0360f8 100644 --- a/fdmdv2/fdmdv2.mk +++ b/fdmdv2/fdmdv2.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=wittend -Date :=5/17/2012 +Date :=5/18/2012 CodeLitePath :="C:\Program Files\CodeLite" LinkerName :=g++ ArchiveTool :=ar rcus @@ -56,7 +56,7 @@ WXWIN:=C:\bin\wxWidgets-2.9.2 PATH:=$(WXWIN)\lib\gcc_dll;$(PATH) WXCFG:=gcc_dll\mswu UNIT_TEST_PP_SRC_DIR:=C:\bin\UnitTest++-1.3 -Objects=$(IntermediateDirectory)/topFrame$(ObjectSuffix) $(IntermediateDirectory)/dlg_about$(ObjectSuffix) $(IntermediateDirectory)/dlg_audio$(ObjectSuffix) $(IntermediateDirectory)/dlg_options$(ObjectSuffix) $(IntermediateDirectory)/dlg_comports$(ObjectSuffix) $(IntermediateDirectory)/fdmdv2_plot$(ObjectSuffix) $(IntermediateDirectory)/fdmdv2_main$(ObjectSuffix) $(IntermediateDirectory)/thread_audio$(ObjectSuffix) $(IntermediateDirectory)/fdmdv2_thread_audio$(ObjectSuffix) +Objects=$(IntermediateDirectory)/topFrame$(ObjectSuffix) $(IntermediateDirectory)/dlg_about$(ObjectSuffix) $(IntermediateDirectory)/dlg_audio$(ObjectSuffix) $(IntermediateDirectory)/dlg_options$(ObjectSuffix) $(IntermediateDirectory)/dlg_comports$(ObjectSuffix) $(IntermediateDirectory)/fdmdv2_plot$(ObjectSuffix) $(IntermediateDirectory)/fdmdv2_main$(ObjectSuffix) ## ## Main Build Targets @@ -135,22 +135,6 @@ $(IntermediateDirectory)/fdmdv2_main$(DependSuffix): fdmdv2_main.cpp $(IntermediateDirectory)/fdmdv2_main$(PreprocessSuffix): fdmdv2_main.cpp @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fdmdv2_main$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_main.cpp" -$(IntermediateDirectory)/thread_audio$(ObjectSuffix): thread_audio.cpp $(IntermediateDirectory)/thread_audio$(DependSuffix) - $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/thread_audio.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/thread_audio$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/thread_audio$(DependSuffix): thread_audio.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/thread_audio$(ObjectSuffix) -MF$(IntermediateDirectory)/thread_audio$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/thread_audio.cpp" - -$(IntermediateDirectory)/thread_audio$(PreprocessSuffix): thread_audio.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/thread_audio$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/thread_audio.cpp" - -$(IntermediateDirectory)/fdmdv2_thread_audio$(ObjectSuffix): fdmdv2_thread_audio.cpp $(IntermediateDirectory)/fdmdv2_thread_audio$(DependSuffix) - $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_thread_audio.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/fdmdv2_thread_audio$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/fdmdv2_thread_audio$(DependSuffix): fdmdv2_thread_audio.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/fdmdv2_thread_audio$(ObjectSuffix) -MF$(IntermediateDirectory)/fdmdv2_thread_audio$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_thread_audio.cpp" - -$(IntermediateDirectory)/fdmdv2_thread_audio$(PreprocessSuffix): fdmdv2_thread_audio.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/fdmdv2_thread_audio$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2_thread_audio.cpp" - -include $(IntermediateDirectory)/*$(DependSuffix) ## @@ -178,12 +162,6 @@ clean: $(RM) $(IntermediateDirectory)/fdmdv2_main$(ObjectSuffix) $(RM) $(IntermediateDirectory)/fdmdv2_main$(DependSuffix) $(RM) $(IntermediateDirectory)/fdmdv2_main$(PreprocessSuffix) - $(RM) $(IntermediateDirectory)/thread_audio$(ObjectSuffix) - $(RM) $(IntermediateDirectory)/thread_audio$(DependSuffix) - $(RM) $(IntermediateDirectory)/thread_audio$(PreprocessSuffix) - $(RM) $(IntermediateDirectory)/fdmdv2_thread_audio$(ObjectSuffix) - $(RM) $(IntermediateDirectory)/fdmdv2_thread_audio$(DependSuffix) - $(RM) $(IntermediateDirectory)/fdmdv2_thread_audio$(PreprocessSuffix) $(RM) $(OutputFile) $(RM) $(OutputFile).exe $(RM) "C:\Users\wittend\Projects\Radio\fdmdv2\.build-release\fdmdv2" diff --git a/fdmdv2/fdmdv2.project b/fdmdv2/fdmdv2.project index 883aea66..1a55b90b 100644 --- a/fdmdv2/fdmdv2.project +++ b/fdmdv2/fdmdv2.project @@ -15,8 +15,6 @@ - - @@ -26,8 +24,6 @@ - - diff --git a/fdmdv2/fdmdv2.workspace b/fdmdv2/fdmdv2.workspace index 9254a85e..1ac9a3cf 100644 --- a/fdmdv2/fdmdv2.workspace +++ b/fdmdv2/fdmdv2.workspace @@ -2,9 +2,9 @@ - + - + diff --git a/fdmdv2/fdmdv2_main.h b/fdmdv2/fdmdv2_main.h index 08f03fda..28b8f7e0 100644 --- a/fdmdv2/fdmdv2_main.h +++ b/fdmdv2/fdmdv2_main.h @@ -30,7 +30,7 @@ #include "dlg_options.h" #include "dlg_comports.h" #include "fdmdv2_plot.h" -#include "fdmdv2_thread_audio.h" +//#include "fdmdv2_thread_audio.h" #define WAV_FILE wxT("doggrowl.wav") @@ -86,7 +86,7 @@ class MainFrame : public TopFrame void OnThreadCompletion(wxThreadEvent&); protected: - Fdmdv2ThreadAudio *m_pThread; +// Fdmdv2ThreadAudio *m_pThread; wxCriticalSection m_pThreadCS; // protects the m_pThread pointer // protected event handlers virtual void OnCloseFrame(wxCloseEvent& event); diff --git a/fdmdv2/fdmdv2_wsp.mk b/fdmdv2/fdmdv2_wsp.mk index 13bc5fdc..359a9f63 100644 --- a/fdmdv2/fdmdv2_wsp.mk +++ b/fdmdv2/fdmdv2_wsp.mk @@ -1,8 +1,8 @@ .PHONY: clean All All: - @echo ----------Building project:[ pa_cppbinding_test - Release ]---------- - @cd "pa_cppbinding_test" && "mingw32-make.exe" -j 2 -f "pa_cppbinding_test.mk" + @echo ----------Building project:[ fdmdv2 - Release ]---------- + @"mingw32-make.exe" -j 2 -f "fdmdv2.mk" clean: - @echo ----------Cleaning project:[ pa_cppbinding_test - Release ]---------- - @cd "pa_cppbinding_test" && "mingw32-make.exe" -j 2 -f "pa_cppbinding_test.mk" clean + @echo ----------Cleaning project:[ fdmdv2 - Release ]---------- + @"mingw32-make.exe" -j 2 -f "fdmdv2.mk" clean diff --git a/fdmdv2/pa_cppbinding_test/gui.cpp b/fdmdv2/pa_cppbinding_test/gui.cpp index 1a2d09e2..812cbfca 100644 --- a/fdmdv2/pa_cppbinding_test/gui.cpp +++ b/fdmdv2/pa_cppbinding_test/gui.cpp @@ -29,92 +29,123 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t m_audioInfo = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_audioInfo->SetMinSize( wxSize( 65,65 ) ); - wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 4, 4, 1, 1 ); - fgSizer1->AddGrowableCol( 3 ); - fgSizer1->AddGrowableRow( 3 ); - fgSizer1->SetFlexibleDirection( wxBOTH ); - fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL ); + wxBoxSizer* bSizer17; + bSizer17 = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* bSizer15; + bSizer15 = new wxBoxSizer( wxVERTICAL ); - fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); + wxBoxSizer* bSizer9; + bSizer9 = new wxBoxSizer( wxVERTICAL ); - m_staticText1 = new wxStaticText( m_audioInfo, wxID_ANY, _("Input, Output:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); - m_staticText1->Wrap( -1 ); - fgSizer1->Add( m_staticText1, 1, wxALL|wxEXPAND, 5 ); + wxBoxSizer* bSizer7; + bSizer7 = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer* bSizer2; - bSizer2 = new wxBoxSizer( wxVERTICAL ); + bSizer2 = new wxBoxSizer( wxHORIZONTAL ); bSizer2->SetMinSize( wxSize( 65,65 ) ); - m_comboBoxLeft = new wxComboBox( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_SIMPLE ); + m_comboBoxLeft = new wxComboBox( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_comboBoxLeft->SetToolTip( _("Input Audio Interface") ); m_comboBoxLeft->SetMinSize( wxSize( 65,65 ) ); bSizer2->Add( m_comboBoxLeft, 1, wxALL|wxEXPAND, 5 ); - fgSizer1->Add( bSizer2, 1, wxEXPAND|wxFIXED_MINSIZE, 5 ); + bSizer7->Add( bSizer2, 1, wxEXPAND, 5 ); wxBoxSizer* bSizer3; - bSizer3 = new wxBoxSizer( wxVERTICAL ); + bSizer3 = new wxBoxSizer( wxHORIZONTAL ); bSizer3->SetMinSize( wxSize( 65,65 ) ); - m_comboBoxRight = new wxComboBox( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_SIMPLE ); + m_comboBoxRight = new wxComboBox( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_comboBoxRight->SetToolTip( _("Output Audio Interface") ); - m_comboBoxRight->SetMinSize( wxSize( 65,65 ) ); + m_comboBoxRight->SetMinSize( wxSize( 65,35 ) ); bSizer3->Add( m_comboBoxRight, 1, wxALL|wxEXPAND, 5 ); - fgSizer1->Add( bSizer3, 1, wxEXPAND, 5 ); + bSizer7->Add( bSizer3, 1, wxEXPAND, 5 ); - fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); + bSizer9->Add( bSizer7, 1, wxEXPAND, 5 ); - m_staticText2 = new wxStaticText( m_audioInfo, wxID_ANY, _("Behavor:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); - m_staticText2->Wrap( -1 ); - fgSizer1->Add( m_staticText2, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL|wxEXPAND, 5 ); + + bSizer15->Add( bSizer9, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + wxBoxSizer* bSizer10; + bSizer10 = new wxBoxSizer( wxHORIZONTAL ); + + wxBoxSizer* bSizer5; + bSizer5 = new wxBoxSizer( wxHORIZONTAL ); m_gauge1 = new wxGauge( m_audioInfo, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL|wxGA_SMOOTH ); - fgSizer1->Add( m_gauge1, 1, wxALL|wxEXPAND, 5 ); + bSizer5->Add( m_gauge1, 1, wxALL, 5 ); + + + bSizer10->Add( bSizer5, 1, wxEXPAND, 5 ); + + wxBoxSizer* bSizer6; + bSizer6 = new wxBoxSizer( wxHORIZONTAL ); m_slider1 = new wxSlider( m_audioInfo, wxID_ANY, 50, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_SELRANGE|wxSL_TOP ); - fgSizer1->Add( m_slider1, 1, wxALL|wxEXPAND, 5 ); + bSizer6->Add( m_slider1, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); + + + bSizer10->Add( bSizer6, 1, wxEXPAND, 5 ); + + + bSizer15->Add( bSizer10, 1, wxEXPAND, 5 ); + + wxBoxSizer* bSizer14; + bSizer14 = new wxBoxSizer( wxHORIZONTAL ); + + wxBoxSizer* bSizer13; + bSizer13 = new wxBoxSizer( wxHORIZONTAL ); + wxBoxSizer* bSizer12; + bSizer12 = new wxBoxSizer( wxVERTICAL ); - fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); + m_toggleBtn3 = new wxToggleButton( m_audioInfo, wxID_ANY, _("On / Off"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer12->Add( m_toggleBtn3, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + + + bSizer13->Add( bSizer12, 1, 0, 5 ); - m_staticText5 = new wxStaticText( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText5->Wrap( -1 ); - fgSizer1->Add( m_staticText5, 1, wxALL|wxEXPAND, 5 ); + wxBoxSizer* bSizer11; + bSizer11 = new wxBoxSizer( wxVERTICAL ); m_toggleBtn2 = new wxToggleButton( m_audioInfo, wxID_ANY, _("On / Off"), wxDefaultPosition, wxDefaultSize, 0 ); m_toggleBtn2->SetValue( true ); - fgSizer1->Add( m_toggleBtn2, 1, wxALL|wxEXPAND, 5 ); + bSizer11->Add( m_toggleBtn2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL, 5 ); + + + bSizer13->Add( bSizer11, 1, 0, 5 ); - m_toggleBtn3 = new wxToggleButton( m_audioInfo, wxID_ANY, _("On / Off"), wxDefaultPosition, wxDefaultSize, 0 ); - m_toggleBtn3->SetValue( true ); - fgSizer1->Add( m_toggleBtn3, 0, wxALL|wxEXPAND, 5 ); + bSizer14->Add( bSizer13, 1, wxALIGN_BOTTOM|wxALIGN_RIGHT, 5 ); - fgSizer1->Add( 0, 0, 1, 0, 5 ); + bSizer15->Add( bSizer14, 0, wxEXPAND, 5 ); - fgSizer1->Add( 0, 0, 1, 0, 5 ); + bSizer17->Add( bSizer15, 1, wxEXPAND, 5 ); - fgSizer1->Add( 0, 0, 1, 0, 5 ); + wxBoxSizer* bSizer16; + bSizer16 = new wxBoxSizer( wxVERTICAL ); m_button1 = new wxButton( m_audioInfo, wxID_ANY, _("Exit"), wxDefaultPosition, wxDefaultSize, 0 ); m_button1->SetDefault(); - fgSizer1->Add( m_button1, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL, 5 ); + bSizer16->Add( m_button1, 0, 0, 5 ); - m_audioInfo->SetSizer( fgSizer1 ); + bSizer17->Add( bSizer16, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT, 5 ); + + + m_audioInfo->SetSizer( bSizer17 ); m_audioInfo->Layout(); - fgSizer1->Fit( m_audioInfo ); - mainSizer->Add( m_audioInfo, 1, wxALL|wxEXPAND|wxFIXED_MINSIZE, 0 ); + bSizer17->Fit( m_audioInfo ); + mainSizer->Add( m_audioInfo, 1, wxEXPAND, 0 ); this->SetSizer( mainSizer ); @@ -137,8 +168,8 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t m_slider1->Connect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( MainFrameBase::OnScroll ), NULL, this ); m_slider1->Connect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( MainFrameBase::OnScroll ), NULL, this ); m_slider1->Connect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( MainFrameBase::OnScroll ), NULL, this ); - m_toggleBtn2->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnTogLeft ), NULL, this ); m_toggleBtn3->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnTogRight ), NULL, this ); + m_toggleBtn2->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnTogLeft ), NULL, this ); m_button1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnExitClick ), NULL, this ); } @@ -158,8 +189,8 @@ MainFrameBase::~MainFrameBase() m_slider1->Disconnect( wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( MainFrameBase::OnScroll ), NULL, this ); m_slider1->Disconnect( wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler( MainFrameBase::OnScroll ), NULL, this ); m_slider1->Disconnect( wxEVT_SCROLL_CHANGED, wxScrollEventHandler( MainFrameBase::OnScroll ), NULL, this ); - m_toggleBtn2->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnTogLeft ), NULL, this ); m_toggleBtn3->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnTogRight ), NULL, this ); + m_toggleBtn2->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnTogLeft ), NULL, this ); m_button1->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnExitClick ), NULL, this ); } diff --git a/fdmdv2/pa_cppbinding_test/gui.fbp b/fdmdv2/pa_cppbinding_test/gui.fbp index 3b3b63e8..03271f86 100644 --- a/fdmdv2/pa_cppbinding_test/gui.fbp +++ b/fdmdv2/pa_cppbinding_test/gui.fbp @@ -71,8 +71,8 @@ Resizable 1 - 500,300 - wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER + 577,365 + wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER Test PortAudio CPP Binding 0 @@ -228,7 +228,7 @@ none 0 - wxALL|wxEXPAND|wxFIXED_MINSIZE + wxEXPAND 1 1 @@ -308,231 +308,708 @@ - - 4 - wxBOTH - 3 - 3 - 1 + - fgSizer1 - wxFLEX_GROWMODE_ALL + bSizer17 + wxVERTICAL none - 4 - 1 - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Input, Output: - - 0 - - - 0 - - 1 - m_staticText1 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxFIXED_MINSIZE + wxEXPAND 1 - 65,65 - bSizer2 + + bSizer15 wxVERTICAL none - + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + + + bSizer9 + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bSizer7 + wxHORIZONTAL + none + + 5 + wxEXPAND + 1 + + 65,65 + bSizer2 + wxHORIZONTAL + none + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + 65,65 + 1 + m_comboBoxLeft + 1 + + + protected + 1 + + Resizable + -1 + 1 + + + + 0 + Input Audio Interface + + wxFILTER_NONE + wxDefaultValidator + + + + + + + OnComboLeft + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 65,65 + bSizer3 + wxHORIZONTAL + none + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + -1,-1 + + 0 + 65,35 + 1 + m_comboBoxRight + 1 + + + protected + 1 + + Resizable + -1 + 1 + + + + 0 + Output Audio Interface + + wxFILTER_NONE + wxDefaultValidator + + + + + + + OnComboRight + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - wxALL|wxEXPAND + wxEXPAND 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 65,65 - 1 - m_comboBoxLeft - 1 - - - protected - 1 - - Resizable - -1 - 1 - - wxCB_SIMPLE - - 0 - Input Audio Interface - - wxFILTER_NONE - wxDefaultValidator - - - - - - - OnComboLeft - - - - - - - - - - - - - - - - - - - - - - - - + + + bSizer10 + wxHORIZONTAL + none + + 5 + wxEXPAND + 1 + + + bSizer5 + wxHORIZONTAL + none + + 5 + wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_gauge1 + 1 + + + protected + 1 + + 100 + Resizable + 1 + + wxGA_HORIZONTAL|wxGA_SMOOTH + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + bSizer6 + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER|wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 100 + + 0 + + 0 + + 0 + + 1 + m_slider1 + 1 + + + protected + 1 + + Resizable + 1 + + wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_SELRANGE|wxSL_TOP + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 50 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnScroll + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 0 + + + bSizer14 + wxHORIZONTAL + none + + 5 + wxALIGN_BOTTOM|wxALIGN_RIGHT + 1 + + + bSizer13 + wxHORIZONTAL + none + + 5 + + 1 + + + bSizer12 + wxVERTICAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + On / Off + + 0 + + + 0 + + 1 + m_toggleBtn3 + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + OnTogRight + + + + + + + 5 + + 1 + + + bSizer11 + wxVERTICAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + On / Off + + 0 + + + 0 + + 1 + m_toggleBtn2 + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + OnTogLeft + + + + + + + 5 - wxEXPAND - 1 + wxALIGN_BOTTOM|wxALIGN_RIGHT + 0 - 65,65 - bSizer3 + + bSizer16 wxVERTICAL none 5 - wxALL|wxEXPAND - 1 - + + 0 + 1 1 1 @@ -546,10 +1023,10 @@ 1 0 - 1 1 + 1 0 Dock 0 @@ -561,14 +1038,15 @@ 0 0 wxID_ANY + Exit 0 0 - 65,65 + 1 - m_comboBoxRight + m_button1 1 @@ -576,23 +1054,21 @@ 1 Resizable - -1 1 - wxCB_SIMPLE + 0 - Output Audio Interface + wxFILTER_NONE wxDefaultValidator - + OnExitClick - OnComboRight @@ -614,694 +1090,11 @@ - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Behavor: - - 0 - - - 0 - - 1 - m_staticText2 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_gauge1 - 1 - - - protected - 1 - - 100 - Resizable - 1 - - wxGA_HORIZONTAL|wxGA_SMOOTH - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 100 - - 0 - - 0 - - 0 - - 1 - m_slider1 - 1 - - - protected - 1 - - Resizable - 1 - - wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_SELRANGE|wxSL_TOP - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 50 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnScroll - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_staticText5 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - On / Off - - 0 - - - 0 - - 1 - m_toggleBtn2 - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - OnTogLeft - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - On / Off - - 0 - - - 0 - - 1 - m_toggleBtn3 - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - OnTogRight - - - - - 5 - - 1 - - 0 - protected - 0 - - - - 5 - - 1 - - 0 - protected - 0 - - - - 5 - - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Exit - - 0 - - - 0 - - 1 - m_button1 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnExitClick - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fdmdv2/pa_cppbinding_test/gui.h b/fdmdv2/pa_cppbinding_test/gui.h index b0fd86e1..e27f921a 100644 --- a/fdmdv2/pa_cppbinding_test/gui.h +++ b/fdmdv2/pa_cppbinding_test/gui.h @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -45,15 +44,12 @@ class MainFrameBase : public wxFrame wxMenuBar* m_menuBar; wxMenu* m_menuFile; wxPanel* m_audioInfo; - wxStaticText* m_staticText1; wxComboBox* m_comboBoxLeft; wxComboBox* m_comboBoxRight; - wxStaticText* m_staticText2; wxGauge* m_gauge1; wxSlider* m_slider1; - wxStaticText* m_staticText5; - wxToggleButton* m_toggleBtn2; wxToggleButton* m_toggleBtn3; + wxToggleButton* m_toggleBtn2; wxButton* m_button1; wxStatusBar* m_statusBar; @@ -63,13 +59,13 @@ class MainFrameBase : public wxFrame virtual void OnComboLeft( wxCommandEvent& event ) { event.Skip(); } virtual void OnComboRight( wxCommandEvent& event ) { event.Skip(); } virtual void OnScroll( wxScrollEvent& event ) { event.Skip(); } - virtual void OnTogLeft( wxCommandEvent& event ) { event.Skip(); } virtual void OnTogRight( wxCommandEvent& event ) { event.Skip(); } + virtual void OnTogLeft( wxCommandEvent& event ) { event.Skip(); } public: - MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Test PortAudio CPP Binding "), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL ); + MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Test PortAudio CPP Binding "), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 577,365 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL ); ~MainFrameBase(); diff --git a/fdmdv2/pa_cppbinding_test/gui.py b/fdmdv2/pa_cppbinding_test/gui.py index 30ef15d1..021031a2 100644 --- a/fdmdv2/pa_cppbinding_test/gui.py +++ b/fdmdv2/pa_cppbinding_test/gui.py @@ -20,7 +20,7 @@ _ = gettext.gettext class MainFrameBase ( wx.Frame ): def __init__( self, parent ): - wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"Test PortAudio CPP Binding "), pos = wx.DefaultPosition, size = wx.Size( 500,300 ), 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"Test PortAudio CPP Binding "), pos = wx.DefaultPosition, size = wx.Size( 577,365 ), style = wx.DEFAULT_FRAME_STYLE|wx.RESIZE_BORDER|wx.TAB_TRAVERSAL ) self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) @@ -38,91 +38,111 @@ class MainFrameBase ( wx.Frame ): self.m_audioInfo = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) self.m_audioInfo.SetMinSize( wx.Size( 65,65 ) ) - fgSizer1 = wx.FlexGridSizer( 4, 4, 1, 1 ) - fgSizer1.AddGrowableCol( 3 ) - fgSizer1.AddGrowableRow( 3 ) - fgSizer1.SetFlexibleDirection( wx.BOTH ) - fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_ALL ) + bSizer17 = wx.BoxSizer( wx.VERTICAL ) + bSizer15 = wx.BoxSizer( wx.VERTICAL ) - fgSizer1.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 ) + bSizer9 = wx.BoxSizer( wx.VERTICAL ) - self.m_staticText1 = wx.StaticText( self.m_audioInfo, wx.ID_ANY, _(u"Input, Output:"), wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_RIGHT ) - self.m_staticText1.Wrap( -1 ) - fgSizer1.Add( self.m_staticText1, 1, wx.ALL|wx.EXPAND, 5 ) + bSizer7 = wx.BoxSizer( wx.HORIZONTAL ) - bSizer2 = wx.BoxSizer( wx.VERTICAL ) + bSizer2 = wx.BoxSizer( wx.HORIZONTAL ) bSizer2.SetMinSize( wx.Size( 65,65 ) ) m_comboBoxLeftChoices = [] - self.m_comboBoxLeft = wx.ComboBox( self.m_audioInfo, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_comboBoxLeftChoices, wx.CB_SIMPLE ) + self.m_comboBoxLeft = wx.ComboBox( self.m_audioInfo, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_comboBoxLeftChoices, 0 ) self.m_comboBoxLeft.SetToolTipString( _(u"Input Audio Interface") ) self.m_comboBoxLeft.SetMinSize( wx.Size( 65,65 ) ) bSizer2.Add( self.m_comboBoxLeft, 1, wx.ALL|wx.EXPAND, 5 ) - fgSizer1.Add( bSizer2, 1, wx.EXPAND|wx.FIXED_MINSIZE, 5 ) + bSizer7.Add( bSizer2, 1, wx.EXPAND, 5 ) - bSizer3 = wx.BoxSizer( wx.VERTICAL ) + bSizer3 = wx.BoxSizer( wx.HORIZONTAL ) bSizer3.SetMinSize( wx.Size( 65,65 ) ) m_comboBoxRightChoices = [] - self.m_comboBoxRight = wx.ComboBox( self.m_audioInfo, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_comboBoxRightChoices, wx.CB_SIMPLE ) + self.m_comboBoxRight = wx.ComboBox( self.m_audioInfo, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_comboBoxRightChoices, 0 ) self.m_comboBoxRight.SetToolTipString( _(u"Output Audio Interface") ) - self.m_comboBoxRight.SetMinSize( wx.Size( 65,65 ) ) + self.m_comboBoxRight.SetMinSize( wx.Size( 65,35 ) ) bSizer3.Add( self.m_comboBoxRight, 1, wx.ALL|wx.EXPAND, 5 ) - fgSizer1.Add( bSizer3, 1, wx.EXPAND, 5 ) + bSizer7.Add( bSizer3, 1, wx.EXPAND, 5 ) - fgSizer1.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 ) + bSizer9.Add( bSizer7, 1, wx.EXPAND, 5 ) - self.m_staticText2 = wx.StaticText( self.m_audioInfo, wx.ID_ANY, _(u"Behavor:"), wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_RIGHT ) - self.m_staticText2.Wrap( -1 ) - fgSizer1.Add( self.m_staticText2, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL|wx.EXPAND, 5 ) + + bSizer15.Add( bSizer9, 0, wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 5 ) + + bSizer10 = wx.BoxSizer( wx.HORIZONTAL ) + + bSizer5 = wx.BoxSizer( wx.HORIZONTAL ) self.m_gauge1 = wx.Gauge( self.m_audioInfo, wx.ID_ANY, 100, wx.DefaultPosition, wx.DefaultSize, wx.GA_HORIZONTAL|wx.GA_SMOOTH ) - fgSizer1.Add( self.m_gauge1, 1, wx.ALL|wx.EXPAND, 5 ) + bSizer5.Add( self.m_gauge1, 1, wx.ALL, 5 ) + + + bSizer10.Add( bSizer5, 1, wx.EXPAND, 5 ) + + bSizer6 = wx.BoxSizer( wx.HORIZONTAL ) self.m_slider1 = wx.Slider( self.m_audioInfo, wx.ID_ANY, 50, 0, 100, wx.DefaultPosition, wx.DefaultSize, wx.SL_AUTOTICKS|wx.SL_HORIZONTAL|wx.SL_SELRANGE|wx.SL_TOP ) - fgSizer1.Add( self.m_slider1, 1, wx.ALL|wx.EXPAND, 5 ) + bSizer6.Add( self.m_slider1, 1, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 5 ) + + + bSizer10.Add( bSizer6, 1, wx.EXPAND, 5 ) + + + bSizer15.Add( bSizer10, 1, wx.EXPAND, 5 ) + + bSizer14 = wx.BoxSizer( wx.HORIZONTAL ) + + bSizer13 = wx.BoxSizer( wx.HORIZONTAL ) + + bSizer12 = wx.BoxSizer( wx.VERTICAL ) + + self.m_toggleBtn3 = wx.ToggleButton( self.m_audioInfo, wx.ID_ANY, _(u"On / Off"), wx.DefaultPosition, wx.DefaultSize, 0 ) + bSizer12.Add( self.m_toggleBtn3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - fgSizer1.AddSpacer( ( 0, 0), 1, wx.EXPAND, 5 ) + bSizer13.Add( bSizer12, 1, 0, 5 ) - self.m_staticText5 = wx.StaticText( self.m_audioInfo, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText5.Wrap( -1 ) - fgSizer1.Add( self.m_staticText5, 1, wx.ALL|wx.EXPAND, 5 ) + bSizer11 = wx.BoxSizer( wx.VERTICAL ) self.m_toggleBtn2 = wx.ToggleButton( self.m_audioInfo, wx.ID_ANY, _(u"On / Off"), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_toggleBtn2.SetValue( True ) - fgSizer1.Add( self.m_toggleBtn2, 1, wx.ALL|wx.EXPAND, 5 ) + bSizer11.Add( self.m_toggleBtn2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) - self.m_toggleBtn3 = wx.ToggleButton( self.m_audioInfo, wx.ID_ANY, _(u"On / Off"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_toggleBtn3.SetValue( True ) - fgSizer1.Add( self.m_toggleBtn3, 0, wx.ALL|wx.EXPAND, 5 ) + + bSizer13.Add( bSizer11, 1, 0, 5 ) - fgSizer1.AddSpacer( ( 0, 0), 1, 0, 5 ) + bSizer14.Add( bSizer13, 1, wx.ALIGN_BOTTOM|wx.ALIGN_RIGHT, 5 ) - fgSizer1.AddSpacer( ( 0, 0), 1, 0, 5 ) + bSizer15.Add( bSizer14, 0, wx.EXPAND, 5 ) - fgSizer1.AddSpacer( ( 0, 0), 1, 0, 5 ) + bSizer17.Add( bSizer15, 1, wx.EXPAND, 5 ) + + bSizer16 = wx.BoxSizer( wx.VERTICAL ) self.m_button1 = wx.Button( self.m_audioInfo, wx.ID_ANY, _(u"Exit"), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_button1.SetDefault() - fgSizer1.Add( self.m_button1, 0, wx.ALIGN_BOTTOM|wx.ALIGN_RIGHT|wx.ALL, 5 ) + bSizer16.Add( self.m_button1, 0, 0, 5 ) + + + bSizer17.Add( bSizer16, 0, wx.ALIGN_BOTTOM|wx.ALIGN_RIGHT, 5 ) - self.m_audioInfo.SetSizer( fgSizer1 ) + self.m_audioInfo.SetSizer( bSizer17 ) self.m_audioInfo.Layout() - fgSizer1.Fit( self.m_audioInfo ) - mainSizer.Add( self.m_audioInfo, 1, wx.ALL|wx.EXPAND|wx.FIXED_MINSIZE, 0 ) + bSizer17.Fit( self.m_audioInfo ) + mainSizer.Add( self.m_audioInfo, 1, wx.EXPAND, 0 ) self.SetSizer( mainSizer ) @@ -137,8 +157,8 @@ class MainFrameBase ( wx.Frame ): self.m_comboBoxLeft.Bind( wx.EVT_COMBOBOX, self.OnComboLeft ) self.m_comboBoxRight.Bind( wx.EVT_COMBOBOX, self.OnComboRight ) self.m_slider1.Bind( wx.EVT_SCROLL, self.OnScroll ) - self.m_toggleBtn2.Bind( wx.EVT_TOGGLEBUTTON, self.OnTogLeft ) self.m_toggleBtn3.Bind( wx.EVT_TOGGLEBUTTON, self.OnTogRight ) + self.m_toggleBtn2.Bind( wx.EVT_TOGGLEBUTTON, self.OnTogLeft ) self.m_button1.Bind( wx.EVT_BUTTON, self.OnExitClick ) def __del__( self ): @@ -161,10 +181,10 @@ class MainFrameBase ( wx.Frame ): def OnScroll( self, event ): event.Skip() - def OnTogLeft( self, event ): + def OnTogRight( self, event ): event.Skip() - def OnTogRight( self, event ): + def OnTogLeft( self, event ): event.Skip() diff --git a/fdmdv2/pa_cppbinding_test/gui.xrc b/fdmdv2/pa_cppbinding_test/gui.xrc index a7a3148b..b64fad7c 100644 --- a/fdmdv2/pa_cppbinding_test/gui.xrc +++ b/fdmdv2/pa_cppbinding_test/gui.xrc @@ -1,8 +1,8 @@ - - 500,300 + + 577,365 Test PortAudio CPP Binding 1 0 @@ -18,166 +18,182 @@ - - 4 - 4 - 1 - 1 - 3 - 3 - - - wxEXPAND - 5 - 0,0 - - - - wxALL|wxEXPAND - 5 - - - - -1 - - + + wxVERTICAL - wxEXPAND|wxFIXED_MINSIZE + wxEXPAND 5 - 65,65 wxVERTICAL + + + wxALIGN_CENTER_VERTICAL|wxEXPAND + 5 + + wxVERTICAL + + + wxEXPAND + 5 + + wxHORIZONTAL + + + wxEXPAND + 5 + + 65,65 + wxHORIZONTAL + + + wxALL|wxEXPAND + 5 + + Input Audio Interface + + + + + + + + + wxEXPAND + 5 + + 65,65 + wxHORIZONTAL + + + wxALL|wxEXPAND + 5 + + Output Audio Interface + + + + + + + + + + - wxALL|wxEXPAND + wxEXPAND 5 - - - Input Audio Interface - - + + wxHORIZONTAL + + + wxEXPAND + 5 + + wxHORIZONTAL + + + wxALL + 5 + + + 100 + 0 + + + + + + + wxEXPAND + 5 + + wxHORIZONTAL + + + wxALIGN_CENTER|wxALL|wxEXPAND + 5 + + + 50 + 0 + 100 + + + + + + + + + wxEXPAND + 5 + + wxHORIZONTAL + + + wxALIGN_BOTTOM|wxALIGN_RIGHT + 5 + + wxHORIZONTAL + + + + 5 + + wxVERTICAL + + + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 5 + + + 0 + + + + + + + + 5 + + wxVERTICAL + + + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL + 5 + + + 1 + + + + + + - - wxEXPAND + + wxALIGN_BOTTOM|wxALIGN_RIGHT 5 - 65,65 wxVERTICAL - - wxALL|wxEXPAND + + 5 - - - Output Audio Interface - - + + + 1 - - - wxEXPAND - 5 - 0,0 - - - - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL|wxEXPAND - 5 - - - - -1 - - - - - wxALL|wxEXPAND - 5 - - - 100 - 0 - - - - - wxALL|wxEXPAND - 5 - - - 50 - 0 - 100 - - - - - wxEXPAND - 5 - 0,0 - - - - wxALL|wxEXPAND - 5 - - - -1 - - - - - wxALL|wxEXPAND - 5 - - - 1 - - - - - wxALL|wxEXPAND - 5 - - - 1 - - - - - - 5 - 0,0 - - - - - 5 - 0,0 - - - - - 5 - 0,0 - - - - wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL - 5 - - - 1 - - diff --git a/fdmdv2/pa_cppbinding_test/main.cpp b/fdmdv2/pa_cppbinding_test/main.cpp index 24aecd4f..f3be47f9 100644 --- a/fdmdv2/pa_cppbinding_test/main.cpp +++ b/fdmdv2/pa_cppbinding_test/main.cpp @@ -51,6 +51,31 @@ void MainFrame::OnExitClick(wxCommandEvent& event) Destroy(); } +void MainFrame::OnComboLeft( wxCommandEvent& event ) +{ + event.Skip(); +} + +void MainFrame::OnComboRight( wxCommandEvent& event ) +{ + event.Skip(); +} + +void MainFrame::OnScroll( wxScrollEvent& event ) +{ + event.Skip(); +} + +void MainFrame::OnTogLeft( wxCommandEvent& event ) +{ + event.Skip(); +} + +void MainFrame::OnTogRight( wxCommandEvent& event ) +{ + event.Skip(); +} + void MainFrame::printSupportedStandardSampleRates( const portaudio::DirectionSpecificStreamParameters &inputParameters, const portaudio::DirectionSpecificStreamParameters &outputParameters) @@ -164,7 +189,7 @@ int MainFrame::populateAudioInfo() std::cout << "Default high input latency = " << (*i).defaultHighInputLatency() << std::endl; // 8.3 std::cout << "Default high output latency = " << (*i).defaultHighOutputLatency() << std::endl; // 8.3 -#ifdef WIN32 +#ifdef WIN32_ASIO // ASIO specific latency information: if ((*i).hostApi().typeId() == paASIO) { @@ -183,7 +208,7 @@ int MainFrame::populateAudioInfo() std::cout << "ASIO buffer granularity = " << asioDevice.granularity() << std::endl; } } -#endif // WIN32 +#endif // WIN32_ASIO std::cout << "Default sample rate = " << (*i).defaultSampleRate() << std::endl; // 8.2 diff --git a/fdmdv2/pa_cppbinding_test/main.h b/fdmdv2/pa_cppbinding_test/main.h index 5684cd66..b60de671 100644 --- a/fdmdv2/pa_cppbinding_test/main.h +++ b/fdmdv2/pa_cppbinding_test/main.h @@ -55,6 +55,11 @@ class MainFrame : public MainFrameBase const portaudio::DirectionSpecificStreamParameters &inputParameters, const portaudio::DirectionSpecificStreamParameters &outputParameters); int populateAudioInfo(); + void OnComboLeft( wxCommandEvent& event ); + void OnComboRight( wxCommandEvent& event ); + void OnScroll( wxScrollEvent& event ); + void OnTogLeft( wxCommandEvent& event ); + void OnTogRight( wxCommandEvent& event ); }; #endif //__main__ diff --git a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk index 7c2527c9..c93a9361 100644 --- a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk +++ b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk @@ -44,8 +44,8 @@ LinkOptions := -mwindows -s $(shell wx-config --debug=no --libs --un IncludePath := $(IncludeSwitch). $(IncludeSwitch)./ $(IncludeSwitch)C:/bin/MinGW/msys/1.0/local/include $(IncludeSwitch)./portaudiocpp IncludePCH := RcIncludePath := -Libs := $(LibrarySwitch)portaudiocpp.la $(LibrarySwitch)portaudio.la -LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch). $(LibraryPathSwitch)../../extern/lib/ +Libs := $(LibrarySwitch)portaudiocpp $(LibrarySwitch)portaudio +LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch). ## diff --git a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.project b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.project index 066f5a17..b0051278 100644 --- a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.project +++ b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.project @@ -55,9 +55,9 @@ - - - + + + @@ -99,9 +99,8 @@ - - - + + diff --git a/fdmdv2/thread_audio.cpp b/fdmdv2/thread_audio.cpp index 72793fdc..d5c465c3 100644 --- a/fdmdv2/thread_audio.cpp +++ b/fdmdv2/thread_audio.cpp @@ -38,7 +38,7 @@ static int audioCallback( void *inputBuffer, void *outputBuffer, unsigned long f } return 0; } - +#ifdef PORTAUDIO_MAIN /* Use a PortAudioStream to process audio data. */ int main(void) { @@ -53,3 +53,4 @@ int main(void) Pa_Terminate(); return 0; } +#endif //PORTAUDIO_MAIN