From: wittend99 Date: Fri, 17 Aug 2012 20:18:39 +0000 (+0000) Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@619 01035d8c-6547-0410-b346-abe4f9... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=e1a16ec4c0a1e636b60abec3dc8b49d593d1b890;p=freetel-svn-tracking.git git-svn-id: https://svn.code.sf.net/p/freetel/code@619 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/pa_cppbinding_test/Release/libportaudio-2.dll b/fdmdv2/pa_cppbinding_test/Release/libportaudio-2.dll deleted file mode 100644 index 302e6635..00000000 Binary files a/fdmdv2/pa_cppbinding_test/Release/libportaudio-2.dll and /dev/null differ diff --git a/fdmdv2/pa_cppbinding_test/Release/libportaudiocpp-0.dll b/fdmdv2/pa_cppbinding_test/Release/libportaudiocpp-0.dll deleted file mode 100644 index eae7e694..00000000 Binary files a/fdmdv2/pa_cppbinding_test/Release/libportaudiocpp-0.dll and /dev/null differ diff --git a/fdmdv2/pa_cppbinding_test/asio_libs/libportaudio.a b/fdmdv2/pa_cppbinding_test/asio_libs/libportaudio.a deleted file mode 100644 index e5b3b049..00000000 Binary files a/fdmdv2/pa_cppbinding_test/asio_libs/libportaudio.a and /dev/null differ diff --git a/fdmdv2/pa_cppbinding_test/asio_libs/libportaudio.la b/fdmdv2/pa_cppbinding_test/asio_libs/libportaudio.la deleted file mode 100644 index 934a2133..00000000 --- a/fdmdv2/pa_cppbinding_test/asio_libs/libportaudio.la +++ /dev/null @@ -1,41 +0,0 @@ -# libportaudio.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4 Debian-2.4-2ubuntu1 -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='' - -# Names of this library. -library_names='' - -# The name of the static archive. -old_library='libportaudio.a' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags='' - -# Libraries that this one depends upon. -dependency_libs=' -lwinmm -lole32 -luuid' - -# Names of additional weak libraries provided by this library -weak_library_names='' - -# Version information for libportaudio. -current=2 -age=0 -revision=0 - -# Is this an already installed library? -installed=yes - -# Should we warn about portability when linking against -modules? -shouldnotlink=no - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/local/lib' diff --git a/fdmdv2/pa_cppbinding_test/asio_libs/libportaudiocpp.a b/fdmdv2/pa_cppbinding_test/asio_libs/libportaudiocpp.a deleted file mode 100644 index b2844fb5..00000000 Binary files a/fdmdv2/pa_cppbinding_test/asio_libs/libportaudiocpp.a and /dev/null differ diff --git a/fdmdv2/pa_cppbinding_test/asio_libs/libportaudiocpp.la b/fdmdv2/pa_cppbinding_test/asio_libs/libportaudiocpp.la deleted file mode 100644 index 9414270d..00000000 --- a/fdmdv2/pa_cppbinding_test/asio_libs/libportaudiocpp.la +++ /dev/null @@ -1,41 +0,0 @@ -# libportaudiocpp.la - a libtool library file -# Generated by libtool (GNU libtool) 2.4 Debian-2.4-2ubuntu1 -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='' - -# Names of this library. -library_names='' - -# The name of the static archive. -old_library='libportaudiocpp.a' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags='' - -# Libraries that this one depends upon. -dependency_libs=' /usr/local/lib/libportaudio.la -lwinmm -lole32 -luuid' - -# Names of additional weak libraries provided by this library -weak_library_names='' - -# Version information for libportaudiocpp. -current=0 -age=0 -revision=12 - -# Is this an already installed library? -installed=yes - -# Should we warn about portability when linking against -modules? -shouldnotlink=no - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/local/lib' diff --git a/fdmdv2/pa_cppbinding_test/gui.cpp b/fdmdv2/pa_cppbinding_test/gui.cpp deleted file mode 100644 index 5a2d98bf..00000000 --- a/fdmdv2/pa_cppbinding_test/gui.cpp +++ /dev/null @@ -1,200 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 17 2012) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "gui.h" - -/////////////////////////////////////////////////////////////////////////// - -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 ); - - m_menuBar = new wxMenuBar( 0 ); - m_menuFile = new wxMenu(); - wxMenuItem* menuFileExit; - menuFileExit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) + wxT(' ') + wxT("Alt+X"), wxEmptyString, wxITEM_NORMAL ); - m_menuFile->Append( menuFileExit ); - - m_menuBar->Append( m_menuFile, _("&File") ); - - this->SetMenuBar( m_menuBar ); - - wxBoxSizer* mainSizer; - mainSizer = new wxBoxSizer( wxVERTICAL ); - - m_audioInfo = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_audioInfo->SetMinSize( wxSize( 65,65 ) ); - - wxBoxSizer* bSizer17; - bSizer17 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer151; - bSizer151 = new wxBoxSizer( wxHORIZONTAL ); - - wxStaticBoxSizer* sbSizerLeft; - sbSizerLeft = new wxStaticBoxSizer( new wxStaticBox( m_audioInfo, wxID_ANY, _("label") ), wxVERTICAL ); - - m_listBoxTopLeft = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - sbSizerLeft->Add( m_listBoxTopLeft, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 3 ); - - - bSizer151->Add( sbSizerLeft, 1, wxEXPAND, 1 ); - - wxStaticBoxSizer* sbSizerRight; - sbSizerRight = new wxStaticBoxSizer( new wxStaticBox( m_audioInfo, wxID_ANY, _("label") ), wxVERTICAL ); - - m_textTopRight = new wxTextCtrl( m_audioInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTE_DONTWRAP|wxTE_MULTILINE ); - m_textTopRight->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVEBORDER ) ); - - sbSizerRight->Add( m_textTopRight, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 3 ); - - - bSizer151->Add( sbSizerRight, 1, wxEXPAND, 1 ); - - - bSizer17->Add( bSizer151, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer15; - bSizer15 = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* bSizer9; - bSizer9 = new wxBoxSizer( wxVERTICAL ); - - m_listBoxMidLeft = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - bSizer9->Add( m_listBoxMidLeft, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); - - - bSizer15->Add( bSizer9, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 1 ); - - wxBoxSizer* bSizer18; - bSizer18 = new wxBoxSizer( wxVERTICAL ); - - m_listBoxMidRight = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - bSizer18->Add( m_listBoxMidRight, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); - - - bSizer15->Add( bSizer18, 1, wxEXPAND, 5 ); - - - bSizer17->Add( bSizer15, 1, wxEXPAND, 1 ); - - wxBoxSizer* bSizer91; - bSizer91 = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* bSizer71; - bSizer71 = new wxBoxSizer( wxHORIZONTAL ); - - m_listBoxBottomLeft = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - bSizer71->Add( m_listBoxBottomLeft, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); - - - bSizer91->Add( bSizer71, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer31; - bSizer31 = new wxBoxSizer( wxHORIZONTAL ); - - bSizer31->SetMinSize( wxSize( 65,65 ) ); - m_listBoxBottomRight = new wxListBox( m_audioInfo, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - bSizer31->Add( m_listBoxBottomRight, 1, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); - - - bSizer91->Add( bSizer31, 1, wxEXPAND, 5 ); - - - bSizer17->Add( bSizer91, 1, wxEXPAND, 1 ); - - wxBoxSizer* bSizer14; - bSizer14 = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* bSizer13; - bSizer13 = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* bSizer12; - bSizer12 = new wxBoxSizer( wxVERTICAL ); - - m_btnLeft = new wxButton( m_audioInfo, wxID_ANY, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer12->Add( m_btnLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 1 ); - - - bSizer13->Add( bSizer12, 1, 0, 1 ); - - wxBoxSizer* bSizer11; - bSizer11 = new wxBoxSizer( wxVERTICAL ); - - m_btnRight = new wxButton( m_audioInfo, wxID_ANY, _("On / Off"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer11->Add( m_btnRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL, 1 ); - - - bSizer13->Add( bSizer11, 1, 0, 1 ); - - - bSizer14->Add( bSizer13, 1, wxALIGN_BOTTOM|wxALIGN_RIGHT, 1 ); - - - bSizer17->Add( bSizer14, 0, wxEXPAND, 5 ); - - wxBoxSizer* bSizer16; - bSizer16 = new wxBoxSizer( wxVERTICAL ); - - m_button1 = new wxButton( m_audioInfo, wxID_ANY, _("Exit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_button1->SetDefault(); - bSizer16->Add( m_button1, 0, 0, 1 ); - - - bSizer17->Add( bSizer16, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT, 1 ); - - - m_audioInfo->SetSizer( bSizer17 ); - m_audioInfo->Layout(); - bSizer17->Fit( m_audioInfo ); - mainSizer->Add( m_audioInfo, 1, wxALIGN_CENTER|wxEXPAND, 1 ); - - - this->SetSizer( mainSizer ); - this->Layout(); - m_statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY ); - - this->Centre( wxBOTH ); - - // Connect Events - this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) ); - this->Connect( menuFileExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnExitClick ) ); - m_listBoxTopLeft->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxTopLeftBox ), NULL, this ); - m_listBoxTopLeft->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxTopLeftDClick ), NULL, this ); - m_listBoxMidLeft->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListMidLeftBoxClick ), NULL, this ); - m_listBoxMidLeft->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListMidLeftBoxDClick ), NULL, this ); - m_listBoxMidRight->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListMidRightBoxClick ), NULL, this ); - m_listBoxMidRight->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListMidRightBoxDClick ), NULL, this ); - m_listBoxBottomLeft->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomLeftClick ), NULL, this ); - m_listBoxBottomLeft->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomLeftDClick ), NULL, this ); - m_listBoxBottomRight->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomRIghtClick ), NULL, this ); - m_listBoxBottomRight->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomRIghtDClick ), NULL, this ); - m_btnLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnBtnLeft ), NULL, this ); - m_btnRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnBtnRight ), NULL, this ); - m_button1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnExitClick ), NULL, this ); -} - -MainFrameBase::~MainFrameBase() -{ - // Disconnect Events - this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) ); - this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnExitClick ) ); - m_listBoxTopLeft->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxTopLeftBox ), NULL, this ); - m_listBoxTopLeft->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxTopLeftDClick ), NULL, this ); - m_listBoxMidLeft->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListMidLeftBoxClick ), NULL, this ); - m_listBoxMidLeft->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListMidLeftBoxDClick ), NULL, this ); - m_listBoxMidRight->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListMidRightBoxClick ), NULL, this ); - m_listBoxMidRight->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListMidRightBoxDClick ), NULL, this ); - m_listBoxBottomLeft->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomLeftClick ), NULL, this ); - m_listBoxBottomLeft->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomLeftDClick ), NULL, this ); - m_listBoxBottomRight->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomRIghtClick ), NULL, this ); - m_listBoxBottomRight->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainFrameBase::OnListBoxBottomRIghtDClick ), NULL, this ); - m_btnLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnBtnLeft ), NULL, this ); - m_btnRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnBtnRight ), 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 deleted file mode 100644 index 58075679..00000000 --- a/fdmdv2/pa_cppbinding_test/gui.fbp +++ /dev/null @@ -1,1358 +0,0 @@ - - - - - - C++|Python|XRC - 1 - source_name - 0 - 0 - res - UTF-8 - connect - gui - 1000 - none - 1 - gui - - . - - 1 - 1 - 1 - 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 - 651,445 - wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER - - Test PortAudio CPP Binding - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - wxTAB_TRAVERSAL - 1 - - - - - - - - - - OnCloseFrame - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - MainMenu - - 0 - - - 0 - - 1 - m_menuBar - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &File - m_menuFile - protected - - - 0 - 1 - - wxID_EXIT - wxITEM_NORMAL - E&xit - menuFileExit - none - Alt+X - - OnExitClick - - - - - - - mainSizer - wxVERTICAL - none - - 1 - wxALIGN_CENTER|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_audioInfo - 1 - - - protected - 1 - - Resizable - 1 - - ; - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer17 - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bSizer151 - wxHORIZONTAL - none - - 1 - wxEXPAND - 1 - - wxID_ANY - label - - sbSizerLeft - wxVERTICAL - none - - - 3 - wxALIGN_CENTER|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_listBoxTopLeft - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnListBoxTopLeftBox - OnListBoxTopLeftDClick - - - - - - - - - - - - - - - - - - - 1 - wxEXPAND - 1 - - wxID_ANY - label - - sbSizerRight - wxVERTICAL - none - - - 3 - wxALIGN_CENTER|wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - wxSYS_COLOUR_INACTIVEBORDER - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textTopRight - 1 - - - protected - 1 - - Resizable - 1 - - wxHSCROLL|wxTE_DONTWRAP|wxTE_MULTILINE - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxEXPAND - 1 - - - bSizer15 - wxHORIZONTAL - none - - 1 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 1 - - - bSizer9 - wxVERTICAL - 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 - - 0 - - - 0 - - 1 - m_listBoxMidLeft - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnListMidLeftBoxClick - OnListMidLeftBoxDClick - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizer18 - wxVERTICAL - 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 - - 0 - - - 0 - - 1 - m_listBoxMidRight - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnListMidRightBoxClick - OnListMidRightBoxDClick - - - - - - - - - - - - - - - - - - - - - 1 - wxEXPAND - 1 - - - bSizer91 - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - - bSizer71 - 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 - - 0 - - - 0 - - 1 - m_listBoxBottomLeft - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnListBoxBottomLeftClick - OnListBoxBottomLeftDClick - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 65,65 - bSizer31 - 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 - - 0 - - - 0 - - 1 - m_listBoxBottomRight - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnListBoxBottomRIghtClick - OnListBoxBottomRIghtDClick - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - - bSizer14 - wxHORIZONTAL - none - - 1 - wxALIGN_BOTTOM|wxALIGN_RIGHT - 1 - - - bSizer13 - wxHORIZONTAL - none - - 1 - - 1 - - - bSizer12 - wxVERTICAL - none - - 1 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Ok - - 0 - - - 0 - - 1 - m_btnLeft - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnBtnLeft - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - 1 - - - bSizer11 - wxVERTICAL - none - - 1 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - On / Off - - 0 - - - 0 - - 1 - m_btnRight - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnBtnRight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxALIGN_BOTTOM|wxALIGN_RIGHT - 0 - - - bSizer16 - wxVERTICAL - none - - 1 - - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_statusBar - 1 - - - protected - 1 - - Resizable - 1 - - wxST_SIZEGRIP - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fdmdv2/pa_cppbinding_test/gui.h b/fdmdv2/pa_cppbinding_test/gui.h deleted file mode 100644 index 540d6bcb..00000000 --- a/fdmdv2/pa_cppbinding_test/gui.h +++ /dev/null @@ -1,82 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 17 2012) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __GUI_H__ -#define __GUI_H__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////////////// -/// Class MainFrameBase -/////////////////////////////////////////////////////////////////////////////// -class MainFrameBase : public wxFrame -{ - private: - - protected: - wxMenuBar* m_menuBar; - wxMenu* m_menuFile; - wxPanel* m_audioInfo; - wxListBox* m_listBoxTopLeft; - wxTextCtrl* m_textTopRight; - wxListBox* m_listBoxMidLeft; - wxListBox* m_listBoxMidRight; - wxListBox* m_listBoxBottomLeft; - wxListBox* m_listBoxBottomRight; - wxButton* m_btnLeft; - wxButton* m_btnRight; - wxButton* m_button1; - wxStatusBar* m_statusBar; - - // Virtual event handlers, overide them in your derived class - virtual void OnCloseFrame( wxCloseEvent& event ) { event.Skip(); } - virtual void OnExitClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnListBoxTopLeftBox( wxCommandEvent& event ) { event.Skip(); } - virtual void OnListBoxTopLeftDClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnListMidLeftBoxClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnListMidLeftBoxDClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnListMidRightBoxClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnListMidRightBoxDClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnListBoxBottomLeftClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnListBoxBottomLeftDClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnListBoxBottomRIghtClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnListBoxBottomRIghtDClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnBtnLeft( wxCommandEvent& event ) { event.Skip(); } - virtual void OnBtnRight( 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( 651,445 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL ); - - ~MainFrameBase(); - -}; - -#endif //__GUI_H__ diff --git a/fdmdv2/pa_cppbinding_test/gui.py b/fdmdv2/pa_cppbinding_test/gui.py deleted file mode 100644 index 7b4d2fa2..00000000 --- a/fdmdv2/pa_cppbinding_test/gui.py +++ /dev/null @@ -1,227 +0,0 @@ -# -*- coding: utf-8 -*- - -########################################################################### -## Python code generated with wxFormBuilder (version Mar 17 2012) -## http://www.wxformbuilder.org/ -## -## PLEASE DO "NOT" EDIT THIS FILE! -########################################################################### - -import wx -import wx.xrc - -import gettext -_ = gettext.gettext - -########################################################################### -## Class MainFrameBase -########################################################################### - -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( 651,445 ), style = wx.DEFAULT_FRAME_STYLE|wx.RESIZE_BORDER|wx.TAB_TRAVERSAL ) - - self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) - - self.m_menuBar = wx.MenuBar( 0 ) - self.m_menuFile = wx.Menu() - self.menuFileExit = wx.MenuItem( self.m_menuFile, wx.ID_EXIT, _(u"E&xit")+ u"\t" + u"Alt+X", wx.EmptyString, wx.ITEM_NORMAL ) - self.m_menuFile.AppendItem( self.menuFileExit ) - - self.m_menuBar.Append( self.m_menuFile, _(u"&File") ) - - self.SetMenuBar( self.m_menuBar ) - - mainSizer = wx.BoxSizer( wx.VERTICAL ) - - self.m_audioInfo = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) - self.m_audioInfo.SetMinSize( wx.Size( 65,65 ) ) - - bSizer17 = wx.BoxSizer( wx.VERTICAL ) - - bSizer151 = wx.BoxSizer( wx.HORIZONTAL ) - - sbSizerLeft = wx.StaticBoxSizer( wx.StaticBox( self.m_audioInfo, wx.ID_ANY, _(u"label") ), wx.VERTICAL ) - - m_listBoxTopLeftChoices = [] - self.m_listBoxTopLeft = wx.ListBox( self.m_audioInfo, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_listBoxTopLeftChoices, 0 ) - sbSizerLeft.Add( self.m_listBoxTopLeft, 1, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 3 ) - - - bSizer151.Add( sbSizerLeft, 1, wx.EXPAND, 1 ) - - sbSizerRight = wx.StaticBoxSizer( wx.StaticBox( self.m_audioInfo, wx.ID_ANY, _(u"label") ), wx.VERTICAL ) - - self.m_textTopRight = wx.TextCtrl( self.m_audioInfo, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.HSCROLL|wx.TE_DONTWRAP|wx.TE_MULTILINE ) - self.m_textTopRight.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_INACTIVEBORDER ) ) - - sbSizerRight.Add( self.m_textTopRight, 1, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 3 ) - - - bSizer151.Add( sbSizerRight, 1, wx.EXPAND, 1 ) - - - bSizer17.Add( bSizer151, 1, wx.EXPAND, 5 ) - - bSizer15 = wx.BoxSizer( wx.HORIZONTAL ) - - bSizer9 = wx.BoxSizer( wx.VERTICAL ) - - m_listBoxMidLeftChoices = [] - self.m_listBoxMidLeft = wx.ListBox( self.m_audioInfo, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_listBoxMidLeftChoices, 0 ) - bSizer9.Add( self.m_listBoxMidLeft, 1, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 5 ) - - - bSizer15.Add( bSizer9, 1, wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 1 ) - - bSizer18 = wx.BoxSizer( wx.VERTICAL ) - - m_listBoxMidRightChoices = [] - self.m_listBoxMidRight = wx.ListBox( self.m_audioInfo, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_listBoxMidRightChoices, 0 ) - bSizer18.Add( self.m_listBoxMidRight, 1, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 5 ) - - - bSizer15.Add( bSizer18, 1, wx.EXPAND, 5 ) - - - bSizer17.Add( bSizer15, 1, wx.EXPAND, 1 ) - - bSizer91 = wx.BoxSizer( wx.HORIZONTAL ) - - bSizer71 = wx.BoxSizer( wx.HORIZONTAL ) - - m_listBoxBottomLeftChoices = [] - self.m_listBoxBottomLeft = wx.ListBox( self.m_audioInfo, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_listBoxBottomLeftChoices, 0 ) - bSizer71.Add( self.m_listBoxBottomLeft, 1, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 5 ) - - - bSizer91.Add( bSizer71, 1, wx.EXPAND, 5 ) - - bSizer31 = wx.BoxSizer( wx.HORIZONTAL ) - - bSizer31.SetMinSize( wx.Size( 65,65 ) ) - m_listBoxBottomRightChoices = [] - self.m_listBoxBottomRight = wx.ListBox( self.m_audioInfo, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_listBoxBottomRightChoices, 0 ) - bSizer31.Add( self.m_listBoxBottomRight, 1, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 5 ) - - - bSizer91.Add( bSizer31, 1, wx.EXPAND, 5 ) - - - bSizer17.Add( bSizer91, 1, wx.EXPAND, 1 ) - - bSizer14 = wx.BoxSizer( wx.HORIZONTAL ) - - bSizer13 = wx.BoxSizer( wx.HORIZONTAL ) - - bSizer12 = wx.BoxSizer( wx.VERTICAL ) - - self.m_btnLeft = wx.Button( self.m_audioInfo, wx.ID_ANY, _(u"Ok"), wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer12.Add( self.m_btnLeft, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 1 ) - - - bSizer13.Add( bSizer12, 1, 0, 1 ) - - bSizer11 = wx.BoxSizer( wx.VERTICAL ) - - self.m_btnRight = wx.Button( self.m_audioInfo, wx.ID_ANY, _(u"On / Off"), wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer11.Add( self.m_btnRight, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 1 ) - - - bSizer13.Add( bSizer11, 1, 0, 1 ) - - - bSizer14.Add( bSizer13, 1, wx.ALIGN_BOTTOM|wx.ALIGN_RIGHT, 1 ) - - - bSizer17.Add( bSizer14, 0, 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() - bSizer16.Add( self.m_button1, 0, 0, 1 ) - - - bSizer17.Add( bSizer16, 0, wx.ALIGN_BOTTOM|wx.ALIGN_RIGHT, 1 ) - - - self.m_audioInfo.SetSizer( bSizer17 ) - self.m_audioInfo.Layout() - bSizer17.Fit( self.m_audioInfo ) - mainSizer.Add( self.m_audioInfo, 1, wx.ALIGN_CENTER|wx.EXPAND, 1 ) - - - self.SetSizer( mainSizer ) - self.Layout() - self.m_statusBar = self.CreateStatusBar( 1, wx.ST_SIZEGRIP, wx.ID_ANY ) - - self.Centre( wx.BOTH ) - - # Connect Events - self.Bind( wx.EVT_CLOSE, self.OnCloseFrame ) - self.Bind( wx.EVT_MENU, self.OnExitClick, id = self.menuFileExit.GetId() ) - self.m_listBoxTopLeft.Bind( wx.EVT_LISTBOX, self.OnListBoxTopLeftBox ) - self.m_listBoxTopLeft.Bind( wx.EVT_LISTBOX_DCLICK, self.OnListBoxTopLeftDClick ) - self.m_listBoxMidLeft.Bind( wx.EVT_LISTBOX, self.OnListMidLeftBoxClick ) - self.m_listBoxMidLeft.Bind( wx.EVT_LISTBOX_DCLICK, self.OnListMidLeftBoxDClick ) - self.m_listBoxMidRight.Bind( wx.EVT_LISTBOX, self.OnListMidRightBoxClick ) - self.m_listBoxMidRight.Bind( wx.EVT_LISTBOX_DCLICK, self.OnListMidRightBoxDClick ) - self.m_listBoxBottomLeft.Bind( wx.EVT_LISTBOX, self.OnListBoxBottomLeftClick ) - self.m_listBoxBottomLeft.Bind( wx.EVT_LISTBOX_DCLICK, self.OnListBoxBottomLeftDClick ) - self.m_listBoxBottomRight.Bind( wx.EVT_LISTBOX, self.OnListBoxBottomRIghtClick ) - self.m_listBoxBottomRight.Bind( wx.EVT_LISTBOX_DCLICK, self.OnListBoxBottomRIghtDClick ) - self.m_btnLeft.Bind( wx.EVT_BUTTON, self.OnBtnLeft ) - self.m_btnRight.Bind( wx.EVT_BUTTON, self.OnBtnRight ) - self.m_button1.Bind( wx.EVT_BUTTON, self.OnExitClick ) - - def __del__( self ): - pass - - - # Virtual event handlers, overide them in your derived class - def OnCloseFrame( self, event ): - event.Skip() - - def OnExitClick( self, event ): - event.Skip() - - def OnListBoxTopLeftBox( self, event ): - event.Skip() - - def OnListBoxTopLeftDClick( self, event ): - event.Skip() - - def OnListMidLeftBoxClick( self, event ): - event.Skip() - - def OnListMidLeftBoxDClick( self, event ): - event.Skip() - - def OnListMidRightBoxClick( self, event ): - event.Skip() - - def OnListMidRightBoxDClick( self, event ): - event.Skip() - - def OnListBoxBottomLeftClick( self, event ): - event.Skip() - - def OnListBoxBottomLeftDClick( self, event ): - event.Skip() - - def OnListBoxBottomRIghtClick( self, event ): - event.Skip() - - def OnListBoxBottomRIghtDClick( self, event ): - event.Skip() - - def OnBtnLeft( self, event ): - event.Skip() - - def OnBtnRight( self, event ): - event.Skip() - - - diff --git a/fdmdv2/pa_cppbinding_test/gui.xrc b/fdmdv2/pa_cppbinding_test/gui.xrc deleted file mode 100644 index 67b45ae9..00000000 --- a/fdmdv2/pa_cppbinding_test/gui.xrc +++ /dev/null @@ -1,223 +0,0 @@ - - - - - 651,445 - Test PortAudio CPP Binding - 1 - 0 - - - - - - - - - - - - - - wxVERTICAL - - - wxEXPAND - 5 - - wxHORIZONTAL - - - wxEXPAND - 1 - - wxVERTICAL - - - - wxALIGN_CENTER|wxALL|wxEXPAND - 3 - - - - - - - - - wxEXPAND - 1 - - wxVERTICAL - - - - wxALIGN_CENTER|wxALL|wxEXPAND - 3 - - - #f4f7fc - - 0 - - - - - - - - - wxEXPAND - 1 - - wxHORIZONTAL - - - wxALIGN_CENTER_VERTICAL|wxEXPAND - 1 - - wxVERTICAL - - - wxALIGN_CENTER|wxALL|wxEXPAND - 5 - - - - - - - - - wxEXPAND - 5 - - wxVERTICAL - - - wxALIGN_CENTER|wxALL|wxEXPAND - 5 - - - - - - - - - - - wxEXPAND - 1 - - wxHORIZONTAL - - - wxEXPAND - 5 - - wxHORIZONTAL - - - wxALIGN_CENTER|wxALL|wxEXPAND - 5 - - - - - - - - - wxEXPAND - 5 - - 65,65 - wxHORIZONTAL - - - wxALIGN_CENTER|wxALL|wxEXPAND - 5 - - - - - - - - - - - wxEXPAND - 5 - - wxHORIZONTAL - - - wxALIGN_BOTTOM|wxALIGN_RIGHT - 1 - - wxHORIZONTAL - - - - 1 - - wxVERTICAL - - - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 1 - - - 0 - - - - - - - - 1 - - wxVERTICAL - - - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL - 1 - - - 0 - - - - - - - - - - - wxALIGN_BOTTOM|wxALIGN_RIGHT - 1 - - wxVERTICAL - - - - 1 - - - 1 - - - - - - - - - 1 - - - diff --git a/fdmdv2/pa_cppbinding_test/libportaudio-2.dll b/fdmdv2/pa_cppbinding_test/libportaudio-2.dll deleted file mode 100644 index 302e6635..00000000 Binary files a/fdmdv2/pa_cppbinding_test/libportaudio-2.dll and /dev/null differ diff --git a/fdmdv2/pa_cppbinding_test/libportaudiocpp-0.dll b/fdmdv2/pa_cppbinding_test/libportaudiocpp-0.dll deleted file mode 100644 index eae7e694..00000000 Binary files a/fdmdv2/pa_cppbinding_test/libportaudiocpp-0.dll and /dev/null differ diff --git a/fdmdv2/pa_cppbinding_test/main.cpp b/fdmdv2/pa_cppbinding_test/main.cpp deleted file mode 100644 index 26dd162d..00000000 --- a/fdmdv2/pa_cppbinding_test/main.cpp +++ /dev/null @@ -1,351 +0,0 @@ -/********************************************************************* - * Name: main.cpp - * Purpose: Implements simple wxWidgets application with GUI - * created using wxFormBuilder. - * Author: - * Created: - * Copyright: - * License: wxWidgets license (www.wxwidgets.org) - * - * Notes: Note that all GUI creation code is implemented in - * gui.cpp source file which is generated by wxFormBuilder. - *********************************************************************/ - -#include "main.h" - -// initialize the application -IMPLEMENT_APP(MainApp); - -//////////////////////////////////////////////////////////////////////////////// -// application class implementation -//////////////////////////////////////////////////////////////////////////////// - -bool MainApp::OnInit() -{ - SetTopWindow(new MainFrame(NULL)); - GetTopWindow()->Show(); - - // true = enter the main loop - return true; -} - -//////////////////////////////////////////////////////////////////////////////// -// main application frame implementation -//////////////////////////////////////////////////////////////////////////////// - -MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent) -{ -} - -MainFrame::~MainFrame() -{ -} - -void MainFrame::OnCloseFrame(wxCloseEvent& event) -{ - Destroy(); -} - -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::OnBtnLeft( wxCommandEvent& event ) -{ - populateAudioInfo(); - event.Skip(); -} - -void MainFrame::OnBtnRight( wxCommandEvent& event ) -{ - event.Skip(); -} - -void MainFrame::populateStandardSampleRates( - wxListBox* target, - const portaudio::DirectionSpecificStreamParameters &inputParameters, - const portaudio::DirectionSpecificStreamParameters &outputParameters) -{ - static double STANDARD_SAMPLE_RATES[] = { - 8000.0, - 9600.0, - 11025.0, - 12000.0, - 16000.0, - 22050.0, - 24000.0, - 32000.0, - 44100.0, - 48000.0, - 88200.0, - 96000.0, - 192000.0, - -1 - }; // negative terminated list - - int printCount = 0; - wxString tStr; - - for (int i = 0; STANDARD_SAMPLE_RATES[i] > 0; ++i) - { - portaudio::StreamParameters tmp = portaudio::StreamParameters(inputParameters, outputParameters, STANDARD_SAMPLE_RATES[i], 0, paNoFlag); - if (tmp.isSupported()) - { - tStr.Printf("%8.2f", STANDARD_SAMPLE_RATES[i]); - if (printCount == 0) - { - target->InsertItems(1, &tStr, 0); - printCount = 1; - } - else if (printCount == 4) - { - target->InsertItems(1, &tStr, 0); - printCount = 1; - } - else - { - target->InsertItems(1, &tStr, 0); - ++printCount; - } - } - } - if (printCount == 0) - { - //std::cout << "None" << std::endl; - tStr = "None\n"; - target->InsertItems(1, &tStr, 0); - } - -/* - else - { - std::cout << std::endl; - } -*/ -} - -int MainFrame::populateAudioInfo() -{ - wxString tStr; - wxString ttStr; - try - { - portaudio::AutoSystem autoSys; - portaudio::System &sys = portaudio::System::instance(); - - tStr.Printf("PortAudio version number: %i\n", sys.version()); - m_textTopRight->AppendText(tStr); - - tStr.Printf("PortAudio version number: %s\n", sys.versionText()); - m_textTopRight->AppendText(tStr); - - int numDevices = sys.deviceCount(); - tStr.Printf("Number of devices: %i\n\n", numDevices); - m_textTopRight->AppendText(tStr); - - for (portaudio::System::DeviceIterator i = sys.devicesBegin(); i != sys.devicesEnd(); ++i) - { - tStr.Printf("---------- device #: %i ----------\n", (*i).index()); - m_textTopRight->AppendText(tStr); - - bool defaultDisplayed = false; - - if ((*i).isSystemDefaultInputDevice()) - { - tStr.Printf("[ System Default Input %s", (*i).hostApi().name()); - m_textTopRight->AppendText(tStr); - defaultDisplayed = true; - } - else if ((*i).isHostApiDefaultInputDevice()) - { - tStr.Printf("[ HostApi Default %s Input", (*i).hostApi().name()); - m_textTopRight->AppendText(tStr); - defaultDisplayed = true; - } - if ((*i).isSystemDefaultOutputDevice()) - { - tStr.Printf(defaultDisplayed ? "," : "["); - m_textTopRight->AppendText(tStr); - tStr = (" System Default Output"); - m_textTopRight->AppendText(tStr); - defaultDisplayed = true; - } - else if ((*i).isHostApiDefaultOutputDevice()) - { - tStr.Printf(defaultDisplayed ? "," : "["); - m_textTopRight->AppendText(tStr); - tStr.Printf(" HostApi Default %s Output", (*i).hostApi().name()); - m_textTopRight->AppendText(tStr); - defaultDisplayed = true; - } - - if (defaultDisplayed) - { - tStr = " ]\n"; - m_textTopRight->AppendText(tStr); - } - - ttStr.Printf("Name : %s\n", (*i).name()); - tStr += ttStr; - ttStr.Printf("Host API : %s\n", (*i).hostApi().name()); - tStr += ttStr; - ttStr.Printf("Max inputs : %i\n", (*i).maxInputChannels()); - tStr += ttStr; - ttStr.Printf("Max outputs : %i\n\n", (*i).maxOutputChannels()); - tStr += ttStr; - - ttStr.Printf("Default low input latency : %8.3f\n", (*i).defaultLowInputLatency()); - tStr += ttStr; - ttStr.Printf("Default low output latency : %8.3f\n", (*i).defaultLowOutputLatency()); - tStr += ttStr; - ttStr.Printf("Default high input latency : %8.3f\n", (*i).defaultHighInputLatency()); - tStr += ttStr; - ttStr.Printf("Default high output latency : %8.3f\n\n", (*i).defaultHighOutputLatency()); - tStr += ttStr; - m_textTopRight->AppendText(tStr); - -#ifdef WIN32_ASIO - // ASIO specific latency information: - if ((*i).hostApi().typeId() == paASIO) - { - portaudio::AsioDeviceAdapter asioDevice((*i)); - - //std::cout << "ASIO minimum buffer size = " << asioDevice.minBufferSize() << std::endl; - //std::cout << "ASIO maximum buffer size = " << asioDevice.maxBufferSize() << std::endl; - //std::cout << "ASIO preferred buffer size = " << asioDevice.preferredBufferSize() << std::endl; - - if (asioDevice.granularity() == -1) - { - //std::cout << "ASIO buffer granularity = power of 2" << std::endl; - } - else - { - //std::cout << "ASIO buffer granularity = " << asioDevice.granularity() << std::endl; - } - } -#endif // WIN32_ASIO - - tStr.Printf("Default sample rate : %8.2f\n", (*i).defaultSampleRate()); - m_textTopRight->AppendText(tStr); - - // Poll for standard sample rates: - portaudio::DirectionSpecificStreamParameters inputParameters((*i), (*i).maxInputChannels(), portaudio::INT16, true, 0.0, NULL); - portaudio::DirectionSpecificStreamParameters outputParameters((*i), (*i).maxOutputChannels(), portaudio::INT16, true, 0.0, NULL); - if (inputParameters.numChannels() > 0) - { - tStr = "Supported standard Input sample rates\n"; - m_listBoxTopLeft->InsertItems(1, &tStr, 0); - tStr.Printf(" for half-duplex 16 bit %i channel input = ", inputParameters.numChannels()); - m_listBoxTopLeft->InsertItems(1, &tStr, 0); - populateStandardSampleRates(m_listBoxTopLeft, inputParameters, portaudio::DirectionSpecificStreamParameters::null()); - } - if (outputParameters.numChannels() > 0) - { - tStr = "Supported standard Output sample rates\n"; - m_listBoxMidLeft->InsertItems(1, &tStr, 0); - tStr.Printf(" for half-duplex 16 bit %i channel output = ", outputParameters.numChannels()); - m_listBoxMidLeft->InsertItems(1, &tStr, 0); - populateStandardSampleRates(m_listBoxMidLeft, portaudio::DirectionSpecificStreamParameters::null(), outputParameters); - } - if (inputParameters.numChannels() > 0 && outputParameters.numChannels() > 0) - { - tStr = "Supported full-duplex sample rates\n"; - m_listBoxMidRight->InsertItems(1, &tStr, 0); - tStr.Printf(" for full-duplex 16 bit %i channel input, %i", inputParameters.numChannels(), outputParameters.numChannels()); - m_listBoxMidRight->InsertItems(1, &tStr, 0); - populateStandardSampleRates(m_listBoxMidRight, inputParameters, outputParameters); - } - tStr.Printf("---------------------------------\n"); - m_textTopRight->AppendText(tStr); - } - } - catch (const portaudio::PaException &e) - { - tStr.Printf("A PortAudio error occured: %s\n", e.paErrorText()); - m_textTopRight->AppendText(tStr); - } - catch (const portaudio::PaCppException &e) - { - tStr.Printf("A PortAudioCpp error occured: %s\n", e.what()); - m_textTopRight->AppendText(tStr); - } - catch (const std::exception &e) - { - tStr.Printf("A generic exception occured: %s\n", e.what()); - m_textTopRight->AppendText(tStr); - } - catch (...) - { - tStr.Printf("An unknown exception occured.\n"); - m_textTopRight->AppendText(tStr); - } - return 0; -} - -void MainFrame::OnListBoxTopLeftBox( wxCommandEvent& event ) -{ - //wxMessageBox(wxT("Got OnListBoxTopLeftBox()"), wxT("Interface Test"), wxOK); -} - -void MainFrame::OnListBoxTopLeftDClick( wxCommandEvent& event ) -{ - wxMessageBox(wxT("Got OnListBoxTopLeftDClick()"), wxT("Interface Test"), wxOK); -} - -void MainFrame::OnListMidLeftBoxClick( wxCommandEvent& event ) -{ -// wxMessageBox(wxT("Got OnListMidLeftBoxClick()"), wxT("Interface Test"), wxOK); -} - -void MainFrame::OnListMidLeftBoxDClick( wxCommandEvent& event ) -{ - wxMessageBox(wxT("Got OnListMidLeftBoxDClick()"), wxT("Interface Test"), wxOK); -} - -void MainFrame::OnListMidRightBoxClick( wxCommandEvent& event ) -{ -// wxMessageBox(wxT("Got OnListMidRightBoxClick()"), wxT("Interface Test"), wxOK); -} - -void MainFrame::OnListMidRightBoxDClick( wxCommandEvent& event ) -{ - wxMessageBox(wxT("Got OnListMidRightBoxDClick()"), wxT("Interface Test"), wxOK); -} - -void MainFrame::OnListBoxBottomLeftClick( wxCommandEvent& event ) -{ -// wxMessageBox(wxT("Got OnListBoxBottomLeftClick()"), wxT("Interface Test"), wxOK); -} - -void MainFrame::OnListBoxBottomLeftDClick( wxCommandEvent& event ) -{ - wxMessageBox(wxT("Got OnListBoxBottomLeftDClick()"), wxT("Interface Test"), wxOK); -} - -void MainFrame::OnListBoxBottomRIghtClick( wxCommandEvent& event ) -{ -// wxMessageBox(wxT("Got OnListBoxBottomRIghtClick()"), wxT("Interface Test"), wxOK); -} - -void MainFrame::OnListBoxBottomRIghtDClick( wxCommandEvent& event ) -{ - wxMessageBox(wxT("Got OnListBoxBottomRIghtDClick()"), wxT("Interface Test"), wxOK); -} - - diff --git a/fdmdv2/pa_cppbinding_test/main.h b/fdmdv2/pa_cppbinding_test/main.h deleted file mode 100644 index 974b512d..00000000 --- a/fdmdv2/pa_cppbinding_test/main.h +++ /dev/null @@ -1,76 +0,0 @@ -/********************************************************************* - * Name: main.h - * Purpose: Declares simple wxWidgets application with GUI - * created using wxFormBuilder. - * Author: - * Created: - * Copyright: - * License: wxWidgets license (www.wxwidgets.org) - * - * Notes: Note that all GUI creation code is declared in - * gui.h source file which is generated by wxFormBuilder. - *********************************************************************/ -#ifndef __main__ -#define __main__ - -// main wxWidgets header file -#include -#include -#include "portaudiocpp/PortAudioCpp.hxx" -#ifdef WIN32 -#include "portaudiocpp/AsioDeviceAdapter.hxx" -#endif - -// gui classes generated by wxFormBuilder -#include "gui.h" - -//////////////////////////////////////////////////////////////////////////////// -// application class declaration -//////////////////////////////////////////////////////////////////////////////// - -class MainApp : public wxApp -{ - public: - virtual bool OnInit(); -}; - -// declare global static function wxGetApp() -DECLARE_APP(MainApp) - -//////////////////////////////////////////////////////////////////////////////// -// main application frame declaration -//////////////////////////////////////////////////////////////////////////////// - -class MainFrame : public MainFrameBase -{ - public: - MainFrame(wxWindow *parent); - virtual ~MainFrame(); - - protected: - // protected event handlers - virtual void OnCloseFrame(wxCloseEvent& event); - virtual void OnExitClick(wxCommandEvent& event); - void populateStandardSampleRates( - wxListBox* target, - const portaudio::DirectionSpecificStreamParameters &inputParameters, - const portaudio::DirectionSpecificStreamParameters &outputParameters); - int populateAudioInfo(); - void OnComboLeft( wxCommandEvent& event ); - void OnComboRight( wxCommandEvent& event ); - void OnScroll( wxScrollEvent& event ); - void OnBtnLeft( wxCommandEvent& event ); - void OnBtnRight( wxCommandEvent& event ); - void OnListBoxTopLeftBox( wxCommandEvent& event ); - void OnListBoxTopLeftDClick( wxCommandEvent& event ); - void OnListMidLeftBoxClick( wxCommandEvent& event ); - void OnListMidLeftBoxDClick( wxCommandEvent& event ); - void OnListMidRightBoxClick( wxCommandEvent& event ); - void OnListMidRightBoxDClick( wxCommandEvent& event ); - void OnListBoxBottomLeftClick( wxCommandEvent& event ); - void OnListBoxBottomLeftDClick( wxCommandEvent& event ); - void OnListBoxBottomRIghtClick( wxCommandEvent& event ); - void OnListBoxBottomRIghtDClick( wxCommandEvent& event ); -}; - -#endif //__main__ diff --git a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk deleted file mode 100644 index 114619aa..00000000 --- a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk +++ /dev/null @@ -1,114 +0,0 @@ -## -## Auto Generated makefile by CodeLite IDE -## any manual changes will be erased -## -## Release -ProjectName :=pa_cppbinding_test -ConfigurationName :=Release -IntermediateDirectory :=./Release -OutDir := $(IntermediateDirectory) -WorkspacePath := "C:\Users\wittend\Projects\Radio\fdmdv2" -ProjectPath := "C:\Users\wittend\Projects\Radio\fdmdv2\pa_cppbinding_test" -CurrentFileName := -CurrentFilePath := -CurrentFileFullPath := -User :=wittend -Date :=6/18/2012 -CodeLitePath :="C:\Program Files\CodeLite" -LinkerName :=g++ -ArchiveTool :=ar rcus -SharedObjectLinkerName :=g++ -shared -fPIC -ObjectSuffix :=.o -DependSuffix :=.o.d -PreprocessSuffix :=.o.i -DebugSwitch :=-gstab -IncludeSwitch :=-I -LibrarySwitch :=-l -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_cppbinding_test\pa_cppbinding_test.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)./ $(IncludeSwitch)C:/bin/MinGW/msys/1.0/local/include $(IncludeSwitch)./portaudiocpp -IncludePCH := -RcIncludePath := -Libs := $(LibrarySwitch)portaudiocpp-0 $(LibrarySwitch)portaudio-2 -LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch). - - -## -## User defined environment variables -## -CodeLiteDir:=C:\Program Files\CodeLite -WXWIN:=C:\bin\wxWidgets-2.9.4 -PATH:=$(WXWIN)\lib\gcc_dll;$(PATH) -WXCFG:=gcc_dll\mswu -UNIT_TEST_PP_SRC_DIR:=C:\bin\UnitTest++-1.3 -Objects=$(IntermediateDirectory)/gui$(ObjectSuffix) $(IntermediateDirectory)/main$(ObjectSuffix) - -## -## Main Build Targets -## -.PHONY: all clean PreBuild PrePreBuild PostBuild -all: $(OutputFile) - -$(OutputFile): $(IntermediateDirectory)/.d $(Objects) - @$(MakeDirCommand) $(@D) - @echo "" > $(IntermediateDirectory)/.d - @echo $(Objects) > $(ObjectsFileList) - $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) - -$(IntermediateDirectory)/.d: - @$(MakeDirCommand) "./Release" - -PreBuild: - - -## -## Objects -## -$(IntermediateDirectory)/gui$(ObjectSuffix): gui.cpp $(IntermediateDirectory)/gui$(DependSuffix) - $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_cppbinding_test/gui.cpp" $(CmpOptions) $(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_cppbinding_test/gui.cpp" - -$(IntermediateDirectory)/gui$(PreprocessSuffix): gui.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/gui$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_cppbinding_test/gui.cpp" - -$(IntermediateDirectory)/main$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main$(DependSuffix) - $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_cppbinding_test/main.cpp" $(CmpOptions) $(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_cppbinding_test/main.cpp" - -$(IntermediateDirectory)/main$(PreprocessSuffix): main.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_cppbinding_test/main.cpp" - - --include $(IntermediateDirectory)/*$(DependSuffix) -## -## Clean -## -clean: - $(RM) $(IntermediateDirectory)/gui$(ObjectSuffix) - $(RM) $(IntermediateDirectory)/gui$(DependSuffix) - $(RM) $(IntermediateDirectory)/gui$(PreprocessSuffix) - $(RM) $(IntermediateDirectory)/main$(ObjectSuffix) - $(RM) $(IntermediateDirectory)/main$(DependSuffix) - $(RM) $(IntermediateDirectory)/main$(PreprocessSuffix) - $(RM) $(OutputFile) - $(RM) $(OutputFile).exe - $(RM) "C:\Users\wittend\Projects\Radio\fdmdv2\.build-release\pa_cppbinding_test" - - diff --git a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.project b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.project deleted file mode 100644 index 6728a3af..00000000 --- a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.project +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - - diff --git a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.txt b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.txt deleted file mode 100644 index 8e987060..00000000 --- a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.txt +++ /dev/null @@ -1 +0,0 @@ -./Release/gui.o ./Release/main.o diff --git a/fdmdv2/pa_test/Release/.gitignore b/fdmdv2/pa_test/Release/.gitignore new file mode 100644 index 00000000..e69de29b