From: wittend99 Date: Thu, 13 Dec 2012 01:11:14 +0000 (+0000) Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@1133 01035d8c-6547-0410-b346-abe4f... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=c99cea9e473fe839969706a89573cec659630938;p=freetel-svn-tracking.git git-svn-id: https://svn.code.sf.net/p/freetel/code@1133 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/build/Debug/ctb-0.16.dll b/fdmdv2/build/Debug/ctb-0.16.dll deleted file mode 100644 index f47939b3..00000000 Binary files a/fdmdv2/build/Debug/ctb-0.16.dll and /dev/null differ diff --git a/fdmdv2/build/Debug/libsndfile-1.dll b/fdmdv2/build/Debug/libsndfile-1.dll deleted file mode 100644 index 545ffb50..00000000 Binary files a/fdmdv2/build/Debug/libsndfile-1.dll and /dev/null differ diff --git a/fdmdv2/build/Release/libsndfile-1.dll b/fdmdv2/build/Release/libsndfile-1.dll deleted file mode 100644 index 545ffb50..00000000 Binary files a/fdmdv2/build/Release/libsndfile-1.dll and /dev/null differ diff --git a/fdmdv2/src/FDMDV2.fbp b/fdmdv2/src/FDMDV2.fbp deleted file mode 100644 index 69bfbc92..00000000 --- a/fdmdv2/src/FDMDV2.fbp +++ /dev/null @@ -1,7259 +0,0 @@ - - - - - - C++|Python|XRC - 1 - source_name - 0 - 0 - res - UTF-8 - connect - topFrame - 1000 - none - 1 - fdmdv2 - - C:\bin\Projects\Radio\fdmdv2\src - - 1 - 1 - 1 - 0 - 1 - - 0 - wxSYS_COLOUR_3DLIGHT - - - 1 - 1 - impl_virtual - - wxSYS_COLOUR_WINDOWTEXT - - 0 - wxID_ANY - - - TopFrame - - 761,500 - wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER - - FDMDV2 - - - - wxTAB_TRAVERSAL - 1 - - - - - - - - - - topFrame_OnClose - - - - - - - - - - - - - - - - - - - topFrame_OnPaint - - - - - topFrame_OnSize - topFrame_OnUpdateUI - - - - 1 - 1 - - - 0 - wxID_ANY - MyMenuBar - - - m_menubarMain - protected - - - wxMB_DOCKABLE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &File - file - protected - - - 0 - 1 - Open File - ID_OPEN - wxITEM_NORMAL - &Open - m_menuItemOpen - none - - - OnOpen - OnOpenUpdateUI - - - - 0 - 1 - Save current file - ID_SAVE - wxITEM_NORMAL - &Save - m_menuItemSave - none - - - OnSave - OnSaveUpdateUI - - - - 0 - 1 - Close current file - ID_CLOSE - wxITEM_NORMAL - &Close - m_menuItemClose - none - - - OnClose - OnCloseUpdateUI - - - m_separator1 - none - - - - 0 - 1 - Exit Program - ID_EXIT - wxITEM_NORMAL - E&xit - m_menuItemExit - none - - - OnExit - - - - - &Edit - edit - protected - - - 0 - 0 - Copy selection - ID_COPY - wxITEM_NORMAL - &Copy - m_menuItemCopy - none - - - OnCopy - OnCopyUpdateUI - - - - 0 - 0 - Cut Selection - ID_CUT - wxITEM_NORMAL - Cut - m_menuItemCut - none - - - OnCut - OnCutUpdateUI - - - - 0 - 0 - Paste selection - ID_PASTE - wxITEM_NORMAL - &Paste - m_menuItemPaste - none - - - OnPaste - OnPasteUpdateUI - - - - &Tools - tools - protected - - - 0 - 1 - - wxID_ANY - wxITEM_NORMAL - &Audio Config - m_menuItemAudio - none - - - OnToolsAudio - OnToolsAudioUI - - - - 0 - 1 - - wxID_ANY - wxITEM_NORMAL - Rig Control Config - m_menuItemRigCtrlCfg - none - - - OnToolsComCfg - OnToolsComCfgUI - - - - 0 - 1 - Set preferences - ID_OPTIONS - wxITEM_NORMAL - Other Program &Options - m_menuItemOptions - none - - - OnToolsOptions - OnToolsOptionsUI - - - m_separator2 - none - - - Load From Art Provider; - 0 - 1 - - wxID_ANY - wxITEM_NORMAL - Capture Rx Stream - m_menuItemCaptRxStream - none - Capture receive stream to file. - - OnCaptureRxStream - - - - Load From Art Provider; - 0 - 1 - - wxID_ANY - wxITEM_NORMAL - Capture Tx Stream - m_menuItemCaptTxStream - none - Capture transmit stream to file. - - OnCaptureTxStream - - - - m_separator3 - none - - - - 0 - 1 - - wxID_ANY - wxITEM_NORMAL - Play File - m_menuItemPlayAudioFile - none - - - OnPlayAudioFile - - - - - &Help - help - protected - - - 0 - 0 - - wxID_ANY - wxITEM_NORMAL - Check for Updates - m_menuItemHelpUpdates - none - - - OnHelpCheckUpdates - OnHelpCheckUpdatesUI - - - - 0 - 1 - About this program - ID_ABOUT - wxITEM_NORMAL - &About - m_menuItemAbout - none - - - OnHelpAbout - - - - - - - bSizer1 - wxHORIZONTAL - none - - 5 - wxALL|wxEXPAND - 0 - - - leftSizer - wxVERTICAL - none - - 1 - wxALIGN_CENTER|wxALL|wxEXPAND - 2 - - wxID_ANY - SNR - - snrSizer - wxVERTICAL - none - - - 10 - wxALIGN_CENTER_HORIZONTAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_gaugeSNR - 1 - - - protected - 1 - - 100 - Resizable - 1 - 15,135 - wxGA_SMOOTH|wxGA_VERTICAL - - 0 - Display signal to noise ratio. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxEXPAND - 0 - - - bSizer29 - wxVERTICAL - none - - 1 - wxALIGN_CENTER|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 35,25 - 1 - m_textSNR - 0 - - - protected - 1 - -1,-1 - Resizable - 1 - 35,25 - wxTE_READONLY - - 0 - Show S/N ratio numerically. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxALIGN_CENTER|wxALL|wxEXPAND - 2 - - wxID_ANY - Level - - levelSizer - wxVERTICAL - none - - - 10 - wxALIGN_CENTER_HORIZONTAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_gaugeLevel - 1 - - - protected - 1 - - 100 - Resizable - 1 - 15,135 - wxGA_SMOOTH|wxGA_VERTICAL - - 0 - Display signal level. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 4 - - - centerSizer - wxVERTICAL - none - - 0 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALIGN_TOP|wxEXPAND - 1 - - - upperSizer - wxVERTICAL - none - - 1 - wxALIGN_TOP|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,6,70,0 - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_auiNbookCtrl - 1 - - - public - 1 - - Resizable - 1 - - wxAUI_NB_BOTTOM|wxAUI_NB_DEFAULT_STYLE - - -1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_BOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND - 0 - - - lowerSizer - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - - bSizer15 - wxVERTICAL - none - - 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_txtCtrl - 0 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT - 0 - - - bSizer141 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL|wxFIXED_MINSIZE - 0 - - 1 - 1 - 1 - 1 - - - - - 45,35 - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - RxID - 45,35 - 0 - - 45,35 - 0 - - 1 - m_togRxID - 1 - - 45,35 - protected - 1 - - Resizable - 1 - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - OnTogBtnRxID - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - TxID - - 0 - - - 0 - - 1 - m_togTxID - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - OnTogBtnTxID - - - - - - - - - - - 3 - wxALL|wxEXPAND - 0 - - - rightSizer - wxVERTICAL - none - - 3 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 2 - - wxID_ANY - SQ - - sbSizer3 - wxVERTICAL - none - - - 1 - wxALIGN_CENTER|wxALL - 2 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 100 - - 0 - - 0 - - 0 - - 1 - m_sliderSQ - 1 - - - protected - 1 - - Resizable - 1 - -1,100 - wxSL_AUTOTICKS|wxSL_INVERSE|wxSL_VERTICAL - - 0 - Set Squelch level. - - wxFILTER_NONE - wxDefaultValidator - - 50 - - - - - OnCmdSliderScroll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnSliderScrollBottom - OnCmdSliderScrollChanged - - - - - - - OnSliderScrollTop - - - - - - - 5 - wxALIGN_CENTER - 0 - - - bSizer131 - wxVERTICAL - none - - 5 - wxALIGN_CENTER|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_ckboxSQ - 1 - - - protected - 1 - - Resizable - 1 - - wxCHK_2STATE - - 0 - Activate/Deactivate Squelch - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnCheckSQClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER|wxALL|wxEXPAND - 2 - - wxID_ANY - Control - - sbSizer5 - wxVERTICAL - none - - - 1 - wxEXPAND - 0 - - - bSizer1511 - wxVERTICAL - none - - 1 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Start - - 0 - - - 0 - - 1 - m_togBtnOnOff - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - Begin receiving data. - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - OnTogBtnOnOff - - - - - - - 1 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - - bSizer151 - wxVERTICAL - none - - 1 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Split - - 0 - - - 0 - - 1 - m_togBtnSplit - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - Toggle split frequency mode. - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - OnTogBtnSplitClick - - - - - - - 1 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL - 0 - - - bSizer13 - wxVERTICAL - none - - 1 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Analog - - 0 - - - 0 - - 1 - m_togBtnAnalog - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - Toggle analog/digital operation. - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - OnTogBtnAnalogClick - - - - - - - 1 - wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL|wxALL - 0 - - - bSizer14 - wxVERTICAL - none - - 1 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - ALC - - 0 - - - 0 - - 1 - m_togBtnALC - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - Toggle automatic level control mode. - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - OnTogBtnALCClick - - - - - - - 1 - wxEXPAND - 2 - - - bSizer11 - wxVERTICAL - none - - 1 - wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - TX - - 0 - - - 0 - - 1 - m_btnTogPTT - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - Switch between Receive and Transmit - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - OnTogBtnPTT - - - - - - - - - - - - - - 1 - 1 - - 3 - - 0 - wxID_ANY - - - m_statusBar1 - protected - - - wxST_SIZEGRIP - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DlgAbout - - 352,343 - wxDEFAULT_DIALOG_STYLE - ; - About FDMDV2 - - - - - - - - - - - - - - OnClose - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - - - - bSizer20 - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bSizer21 - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bSizer23 - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bSizer25 - wxVERTICAL - 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 - - 1 - m_bitmapAbout - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - 0 - - - bSizer26 - wxVERTICAL - none - - 5 - wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - MyLabel - - 0 - - - 0 - - 1 - m_staticText1 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizer24 - wxVERTICAL - 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 - - 0 - - 1 - m_textCtrl2 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT - 0 - - - bSizer22 - wxVERTICAL - none - - 5 - wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - MyButton - - 0 - - - 0 - - 1 - m_button9 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DlgAudio - - 555,419 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - Audio Options - - - - - - - - - - - - - - OnClose - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - - - - bSizer32 - wxVERTICAL - none - - 1 - wxEXPAND | wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_nbAudioOptions - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Devices - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelDevices - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer34 - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - wxID_ANY - PortAudio - - sbSizer10 - wxHORIZONTAL - none - - - 5 - wxEXPAND - 1 - - - bSizer41 - wxHORIZONTAL - none - - 5 - wxALL - 0 - - 1 - 0 - 115,-1 - gSizer6 - none - 3 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - PortAudio - - 0 - - - 0 - - 1 - m_radioBtnPortAudio - 1 - - - protected - 1 - - Resizable - 1 - - wxRB_GROUP - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - 2 - 0 - 110,-1 - gSizer51 - none - 2 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,7,70,0 - 0 - 0 - wxID_ANY - # Ch Out: - - 0 - 80,-1 - - 0 - 80,-1 - 1 - m_staticText151 - 1 - - - protected - 1 - - Resizable - 1 - 80,-1 - wxALIGN_RIGHT - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,7,70,0 - 0 - 0 - wxID_ANY - - 0 - 30,-1 - 0 - - 0 - 30,-1 - 1 - m_textNumChOut - 1 - - - protected - 1 - - Resizable - 1 - 30,-1 - wxTE_READONLY - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,7,70,0 - 0 - 0 - wxID_ANY - # Ch In: - - 0 - 90,-1 - - 0 - 80,-1 - 1 - m_staticText141 - 1 - - - protected - 1 - - Resizable - 1 - 80,-1 - wxALIGN_RIGHT - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 4 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,7,70,0 - 0 - 0 - wxID_ANY - - 0 - 30,-1 - 0 - - 0 - 30,-1 - 1 - m_textNumChIn - 1 - - - protected - 1 - - Resizable - 1 - 30,-1 - wxTE_READONLY - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 2 - 0 - - gSizer7 - none - 4 - 0 - - 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 - Audio in (mic) -> codec: - - 0 - - - 0 - - 1 - m_staticText14 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT|wxST_NO_AUTORESIZE - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 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_comboAudioCodec - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - <default> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - codec -> Radio Tx: - - 0 - - - 0 - - 1 - m_staticText15 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT|wxST_NO_AUTORESIZE - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 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_comboCodecTx - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - <default> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - Radio Rx -> codec: - - 0 - - - 0 - - 1 - m_staticText16 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT|wxST_NO_AUTORESIZE - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 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_comboRadioRx - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - <default> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - codec -> Audio out (spkr): - - 0 - - - 0 - - 1 - m_staticText17 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT|wxST_NO_AUTORESIZE - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_comboCodecSpkr - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - <default> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY - File I/O - - sbSizer11 - wxHORIZONTAL - none - - - 5 - wxEXPAND - 0 - - - bSizer38 - wxVERTICAL - none - - 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - File Only - - 0 - - - 0 - - 1 - m_radioBtnFileOnly - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizer45 - wxVERTICAL - none - - - - 5 - wxEXPAND - 1 - - - bSizer46 - wxVERTICAL - none - - - - - - - - - - Settings - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelSettings - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer27 - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bSizer271 - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - wxID_ANY - Rx Input - - sbSizer6 - wxVERTICAL - none - - - 6 - wxEXPAND - 1 - - - bSizer31 - wxVERTICAL - none - - 2 - wxALIGN_CENTER_HORIZONTAL|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_lbRxInput - 1 - - - protected - 1 - - Resizable - 1 - - wxLB_HSCROLL|wxLB_SINGLE - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnRxInputSelect - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textRxInput - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6 - wxEXPAND - 1 - - wxID_ANY - Tx Output - - sbSizer7 - wxVERTICAL - none - - - 5 - wxEXPAND - 1 - - - bSizer281 - wxVERTICAL - none - - 2 - wxALIGN_CENTER_HORIZONTAL|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_lbTxOutput - 1 - - - protected - 1 - - Resizable - 1 - - wxLB_HSCROLL|wxLB_SINGLE - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnTxOutputSelect - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textTxOutput - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxEXPAND - 1 - - - bSizer26 - wxHORIZONTAL - none - - 6 - wxEXPAND - 1 - - wxID_ANY - Voice Input - - sbSizer8 - wxVERTICAL - none - - - 5 - wxEXPAND - 1 - - - bSizer29 - wxVERTICAL - none - - 2 - wxALIGN_CENTER_HORIZONTAL|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_lbVoiceInput - 1 - - - protected - 1 - - Resizable - 1 - - wxLB_HSCROLL|wxLB_SINGLE - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnVoiceInputSelect - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textVoiceInput - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6 - wxEXPAND - 1 - - wxID_ANY - Voice Output - - sbSizer9 - wxVERTICAL - none - - - 1 - wxEXPAND - 1 - - - bSizer30 - wxVERTICAL - none - - 2 - wxALIGN_CENTER_HORIZONTAL|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_lbVoiceOutput - 1 - - - protected - 1 - - Resizable - 1 - - wxLB_HSCROLL|wxLB_SINGLE - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnVoiceOutputSelect - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textVoiceOutput - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - - bSizer28 - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - 1 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer3 - protected - OnApply - OnCancel - - - - OnOK - - - - - - - - 5 - wxEXPAND - 0 - - 15 - protected - 0 - - - - - - 0 - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DlgOptions - - 332,364 - wxDEFAULT_DIALOG_STYLE - - Program Options - - - - - - - - - - - - - - OnClose - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - - - - bSizer30 - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - wxID_ANY - Config Options - - sbSizer5 - wxHORIZONTAL - none - - - 5 - wxEXPAND - 1 - - 2 - 0 - - gSizer2 - none - 6 - 0 - - 5 - wxALIGN_RIGHT|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Option #1: - - 0 - - - 0 - - 1 - m_staticText2 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrl3 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Option #2: - - 0 - - - 0 - - 1 - m_staticText3 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrl4 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Option #3: - - 0 - - - 0 - - 1 - m_staticText4 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrl5 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Option #4: - - 0 - - - 0 - - 1 - m_staticText5 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrl6 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Option #5: - - 0 - - - 0 - - 1 - m_staticText6 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrl7 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Option #6: - - 0 - - - 0 - - 1 - m_staticText7 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrl8 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer4 - protected - - - - - - - - - - - - - - 0 - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DlgComPorts - - 399,354 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - Select Com Port - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer30 - wxVERTICAL - none - - 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 1 - - 2 - 0 - - gSizer3 - none - 6 - 0 - - 2 - 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 - Available Ports: - - 0 - - - 0 - - 1 - m_staticText8 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALL|wxEXPAND - 2 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_listCtrlPortSelect - 1 - - - protected - 1 - - Resizable - 1 - - wxLC_ICON|wxLC_SINGLE_SEL - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnListItemSelected - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Use Port: - - 0 - - - 0 - - 1 - m_staticText9 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textRigCtrlPort - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Buad Rate: - - 0 - - - 0 - - 1 - m_staticText91 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textRigCtrlBaud - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Data Bits: - - 0 - - - 0 - - 1 - m_staticText911 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textRigCtrlDatabits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Stop Bits: - - 0 - - - 0 - - 1 - m_staticText912 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textRigCtrlStopbits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Parity: - - 0 - - - 0 - - 1 - m_staticText913 - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textRigCtrlParity - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - 1 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer3 - protected - - - - - - - - - - - - - - diff --git a/fdmdv2/src/res/Antenna_and_radio_waves.svg b/fdmdv2/src/res/Antenna_and_radio_waves.svg deleted file mode 100644 index 63fa6a97..00000000 --- a/fdmdv2/src/res/Antenna_and_radio_waves.svg +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/fdmdv2/src/res/antenna-clipart-th.png b/fdmdv2/src/res/antenna-clipart-th.png deleted file mode 100644 index 76026067..00000000 Binary files a/fdmdv2/src/res/antenna-clipart-th.png and /dev/null differ diff --git a/fdmdv2/src/res/antenna.png b/fdmdv2/src/res/antenna.png deleted file mode 100644 index 817a9476..00000000 Binary files a/fdmdv2/src/res/antenna.png and /dev/null differ diff --git a/fdmdv2/src/res/bullhorn.jpg b/fdmdv2/src/res/bullhorn.jpg deleted file mode 100644 index 321cde82..00000000 Binary files a/fdmdv2/src/res/bullhorn.jpg and /dev/null differ diff --git a/fdmdv2/src/res/ispyisail_Wireless_WiFi_symbol.svg b/fdmdv2/src/res/ispyisail_Wireless_WiFi_symbol.svg deleted file mode 100644 index 911e41b9..00000000 --- a/fdmdv2/src/res/ispyisail_Wireless_WiFi_symbol.svg +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/fdmdv2/src/res/ispyisail_Wireless_WiFi_symbol.svg.thumb.png b/fdmdv2/src/res/ispyisail_Wireless_WiFi_symbol.svg.thumb.png deleted file mode 100644 index 3facf958..00000000 Binary files a/fdmdv2/src/res/ispyisail_Wireless_WiFi_symbol.svg.thumb.png and /dev/null differ diff --git a/fdmdv2/src/res/kblogger (1).svg b/fdmdv2/src/res/kblogger (1).svg deleted file mode 100644 index 85513d73..00000000 --- a/fdmdv2/src/res/kblogger (1).svg +++ /dev/null @@ -1,16389 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fdmdv2/src/res/kblogger.svg b/fdmdv2/src/res/kblogger.svg deleted file mode 100644 index 85513d73..00000000 --- a/fdmdv2/src/res/kblogger.svg +++ /dev/null @@ -1,16389 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fdmdv2/src/res/logo.gfie b/fdmdv2/src/res/logo.gfie deleted file mode 100644 index f46fd752..00000000 Binary files a/fdmdv2/src/res/logo.gfie and /dev/null differ diff --git a/fdmdv2/src/res/logo.icl b/fdmdv2/src/res/logo.icl deleted file mode 100644 index db85823b..00000000 Binary files a/fdmdv2/src/res/logo.icl and /dev/null differ diff --git a/fdmdv2/src/res/logo_24x24x16.ico b/fdmdv2/src/res/logo_24x24x16.ico deleted file mode 100644 index 694b18e8..00000000 Binary files a/fdmdv2/src/res/logo_24x24x16.ico and /dev/null differ diff --git a/fdmdv2/src/res/logo_24x24x256.gif b/fdmdv2/src/res/logo_24x24x256.gif deleted file mode 100644 index bcdaf9fb..00000000 Binary files a/fdmdv2/src/res/logo_24x24x256.gif and /dev/null differ diff --git a/fdmdv2/src/res/logo_24x24x256.ico b/fdmdv2/src/res/logo_24x24x256.ico deleted file mode 100644 index 694b18e8..00000000 Binary files a/fdmdv2/src/res/logo_24x24x256.ico and /dev/null differ diff --git a/fdmdv2/src/res/logo_24x24x256.xpm b/fdmdv2/src/res/logo_24x24x256.xpm deleted file mode 100644 index 7b6e50f0..00000000 --- a/fdmdv2/src/res/logo_24x24x256.xpm +++ /dev/null @@ -1,30 +0,0 @@ -/* XPM */ -static char *logo_24x24x256[] = { -"16 16 10 1 0 0", -" c #FFFFFF", -"! c #C0C0C0", -"# c #000080", -"$ c #008080", -"% c #808080", -"& c #800080", -"' c #0000FF", -"( c #800000", -") c #000000", -"* c None", -" ", -" !#$! ", -" !%!$&%'! ", -" !%%!!%#%'% ", -" %% %!%%!%##! ", -" !% % !!!#!($' ", -" %!% %!!%!%%#%!", -" % %!! !!%%%## ", -" %%%!!!! %%%#$ ", -" %)%!!!!%!!%%#% ", -" $%#!%!!!!%!%%! ", -" !%%$!!%%!!%! ", -" !%%%%%%% ", -" ! !! ", -" ! ", -" ! " -}; diff --git a/fdmdv2/src/res/logo_24x24x32bit.gif b/fdmdv2/src/res/logo_24x24x32bit.gif deleted file mode 100644 index bcdaf9fb..00000000 Binary files a/fdmdv2/src/res/logo_24x24x32bit.gif and /dev/null differ diff --git a/fdmdv2/src/res/logo_full_circle.png b/fdmdv2/src/res/logo_full_circle.png deleted file mode 100644 index cd4ecddc..00000000 Binary files a/fdmdv2/src/res/logo_full_circle.png and /dev/null differ diff --git a/fdmdv2/src/res/logo_full_circle.svg b/fdmdv2/src/res/logo_full_circle.svg deleted file mode 100644 index 5d5d7df8..00000000 --- a/fdmdv2/src/res/logo_full_circle.svg +++ /dev/null @@ -1,796 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fdmdv2/src/res/logo_full_circle_grouped.png b/fdmdv2/src/res/logo_full_circle_grouped.png deleted file mode 100644 index 1ea8d3c2..00000000 Binary files a/fdmdv2/src/res/logo_full_circle_grouped.png and /dev/null differ diff --git a/fdmdv2/src/res/logo_full_circle_grouped.svg b/fdmdv2/src/res/logo_full_circle_grouped.svg deleted file mode 100644 index c56dbf4b..00000000 --- a/fdmdv2/src/res/logo_full_circle_grouped.svg +++ /dev/null @@ -1,1145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fdmdv2/src/res/logo_grouped_layers.svg b/fdmdv2/src/res/logo_grouped_layers.svg deleted file mode 100644 index 3cc34ade..00000000 --- a/fdmdv2/src/res/logo_grouped_layers.svg +++ /dev/null @@ -1,1030 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fdmdv2/src/res/logo_layers_inverted.svg b/fdmdv2/src/res/logo_layers_inverted.svg deleted file mode 100644 index 80305e9f..00000000 --- a/fdmdv2/src/res/logo_layers_inverted.svg +++ /dev/null @@ -1,1031 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fdmdv2/src/res/logo_ungrouped_layers.svg b/fdmdv2/src/res/logo_ungrouped_layers.svg deleted file mode 100644 index 65216ad9..00000000 --- a/fdmdv2/src/res/logo_ungrouped_layers.svg +++ /dev/null @@ -1,1334 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fdmdv2/src/res/megaphone (1).ico b/fdmdv2/src/res/megaphone (1).ico deleted file mode 100644 index 6a806244..00000000 Binary files a/fdmdv2/src/res/megaphone (1).ico and /dev/null differ diff --git a/fdmdv2/src/res/megaphone (1).png b/fdmdv2/src/res/megaphone (1).png deleted file mode 100644 index cafc6021..00000000 Binary files a/fdmdv2/src/res/megaphone (1).png and /dev/null differ diff --git a/fdmdv2/src/res/megaphone.ico b/fdmdv2/src/res/megaphone.ico deleted file mode 100644 index 5df84a37..00000000 Binary files a/fdmdv2/src/res/megaphone.ico and /dev/null differ diff --git a/fdmdv2/src/res/megaphone.jpg b/fdmdv2/src/res/megaphone.jpg deleted file mode 100644 index d22078a2..00000000 Binary files a/fdmdv2/src/res/megaphone.jpg and /dev/null differ diff --git a/fdmdv2/src/res/megaphone.png b/fdmdv2/src/res/megaphone.png deleted file mode 100644 index df5686b6..00000000 Binary files a/fdmdv2/src/res/megaphone.png and /dev/null differ diff --git a/fdmdv2/src/res/megaphone.svg b/fdmdv2/src/res/megaphone.svg deleted file mode 100644 index 32c18193..00000000 --- a/fdmdv2/src/res/megaphone.svg +++ /dev/null @@ -1,4101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fdmdv2/src/res/spectrogram.png b/fdmdv2/src/res/spectrogram.png deleted file mode 100644 index 3e8dcb8d..00000000 Binary files a/fdmdv2/src/res/spectrogram.png and /dev/null differ diff --git a/fdmdv2/tests/image/Makefile b/fdmdv2/tests/image/Makefile deleted file mode 100644 index b6926b0b..00000000 --- a/fdmdv2/tests/image/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -WX_GTK_PATH=/home/david/Desktop/wxWidgets-2.9.4/build_gtk - -WX_CONFIG=$(WX_GTK_PATH)/wx-config -WX_CPPFLAGS = $(shell $(WX_CONFIG) --cxxflags) -WX_LIBS = $(shell $(WX_CONFIG) --libs core, base, aui) - -CPP_FLAGS = $(WX_CPPFLAGS) -g -Wall -LIBS = $(WX_LIBS) -lm -lportaudiocpp -lpthread - -all: image - -image: image.cpp - g++ -o image image.cpp $(CPP_FLAGS) $(LIBS) - -clean: - rm -f *.o image diff --git a/fdmdv2/tests/image/README.txt b/fdmdv2/tests/image/README.txt deleted file mode 100644 index 38186324..00000000 --- a/fdmdv2/tests/image/README.txt +++ /dev/null @@ -1,2 +0,0 @@ -David Rowe 19 October 2012 -Test directory to experiment with wxWidgets bit mapped image functions. diff --git a/fdmdv2/tests/image/image.cpp b/fdmdv2/tests/image/image.cpp deleted file mode 100644 index 6015272a..00000000 --- a/fdmdv2/tests/image/image.cpp +++ /dev/null @@ -1,129 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: samples/image/image.cpp -// Purpose: sample showing operations with wxImage -// Author: Robert Roebling -// Modified by: Francesco Montorsi -// Created: 1998 -// RCS-ID: $Id$ -// Copyright: (c) 1998-2005 Robert Roebling -// (c) 2005-2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// -#include "wx/wx.h" -#include "wx/image.h" -#include "wx/graphics.h" -#include "wx/versioninfo.h" -#include "wx/rawbmp.h" - -//----------------------------------------------------------------------------- -// MyApp -//----------------------------------------------------------------------------- -class MyApp: public wxApp -{ -public: - virtual bool OnInit(); -}; - -class MyRawBitmapFrame : public wxFrame -{ -public: - enum - { - BORDER = 15, - SIZE = 150, - REAL_SIZE = SIZE - 2*BORDER - }; - - /* - MyRawBitmapFrame(wxFrame *parent) - : wxFrame(parent, wxID_ANY, wxT("Raw bitmaps (how exciting)")), - m_bitmap(SIZE, SIZE, 24), - m_alphaBitmap(SIZE, SIZE, 32) - */ - - MyRawBitmapFrame(): wxFrame( (wxFrame *)NULL, wxID_ANY, wxT("wxImage sample"), - wxPoint(20, 20), wxSize(950, 700) ) - { - m_pBitmap = new wxBitmap(SIZE, SIZE, 24); - InitBitmap(); - SetClientSize(SIZE, SIZE*2+25); - - } - ~MyRawBitmapFrame() { - delete m_pBitmap; - } - - void InitBitmap() - { - // draw some colourful stripes without alpha - wxNativePixelData data(*m_pBitmap); - if ( !data ) - { - wxLogError(wxT("Failed to gain raw access to bitmap data")); - return; - } - - wxNativePixelData::Iterator p(data); - for ( int y = 0; y < SIZE; ++y ) - { - wxNativePixelData::Iterator rowStart = p; - - int r = y < SIZE/3 ? 255 : 0, - g = (SIZE/3 <= y) && (y < 2*(SIZE/3)) ? 255 : 0, - b = 2*(SIZE/3) <= y ? 255 : 0; - for ( int x = 0; x < SIZE; ++x ) - { - p.Red() = r; - p.Green() = g; - p.Blue() = b; - ++p; // same as p.OffsetX(1) - } - p = rowStart; - p.OffsetY(data, 1); - } - } - - void OnPaint(wxPaintEvent& WXUNUSED(event)) - { - wxPaintDC dc( this ); - dc.DrawText(wxT("This is alpha and raw bitmap test"), 0, BORDER); - - dc.DrawText(wxT("Raw bitmap access without alpha"), 0, SIZE+5); - dc.DrawBitmap( *m_pBitmap, 0, SIZE+5+dc.GetCharHeight()); - } - -private: - wxBitmap *m_pBitmap; - - DECLARE_EVENT_TABLE() -}; - - -//----------------------------------------------------------------------------- -// MyRawBitmapFrame -//----------------------------------------------------------------------------- - - -BEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame) - EVT_PAINT(MyRawBitmapFrame::OnPaint) -END_EVENT_TABLE() - - -//----------------------------------------------------------------------------- -// MyApp -//----------------------------------------------------------------------------- - -IMPLEMENT_APP(MyApp) - -bool MyApp::OnInit() -{ - if ( !wxApp::OnInit() ) - return false; - - wxInitAllImageHandlers(); - - wxFrame *frame = new MyRawBitmapFrame(); - frame->Show( true ); - - return true; -} diff --git a/fdmdv2/tests/pa_cppbinding_test/Release/libportaudio-2.dll b/fdmdv2/tests/pa_cppbinding_test/Release/libportaudio-2.dll deleted file mode 100644 index 302e6635..00000000 Binary files a/fdmdv2/tests/pa_cppbinding_test/Release/libportaudio-2.dll and /dev/null differ diff --git a/fdmdv2/tests/pa_cppbinding_test/Release/libportaudiocpp-0.dll b/fdmdv2/tests/pa_cppbinding_test/Release/libportaudiocpp-0.dll deleted file mode 100644 index eae7e694..00000000 Binary files a/fdmdv2/tests/pa_cppbinding_test/Release/libportaudiocpp-0.dll and /dev/null differ diff --git a/fdmdv2/tests/pa_cppbinding_test/asio_libs/.gitignore b/fdmdv2/tests/pa_cppbinding_test/asio_libs/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/fdmdv2/tests/pa_cppbinding_test/gui.cpp b/fdmdv2/tests/pa_cppbinding_test/gui.cpp deleted file mode 100644 index 5a2d98bf..00000000 --- a/fdmdv2/tests/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/tests/pa_cppbinding_test/gui.fbp b/fdmdv2/tests/pa_cppbinding_test/gui.fbp deleted file mode 100644 index 58075679..00000000 --- a/fdmdv2/tests/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/tests/pa_cppbinding_test/gui.h b/fdmdv2/tests/pa_cppbinding_test/gui.h deleted file mode 100644 index 540d6bcb..00000000 --- a/fdmdv2/tests/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/tests/pa_cppbinding_test/gui.py b/fdmdv2/tests/pa_cppbinding_test/gui.py deleted file mode 100644 index 7b4d2fa2..00000000 --- a/fdmdv2/tests/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/tests/pa_cppbinding_test/gui.xrc b/fdmdv2/tests/pa_cppbinding_test/gui.xrc deleted file mode 100644 index 67b45ae9..00000000 --- a/fdmdv2/tests/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/tests/pa_cppbinding_test/libportaudio-2.dll b/fdmdv2/tests/pa_cppbinding_test/libportaudio-2.dll deleted file mode 100644 index 302e6635..00000000 Binary files a/fdmdv2/tests/pa_cppbinding_test/libportaudio-2.dll and /dev/null differ diff --git a/fdmdv2/tests/pa_cppbinding_test/libportaudiocpp-0.dll b/fdmdv2/tests/pa_cppbinding_test/libportaudiocpp-0.dll deleted file mode 100644 index eae7e694..00000000 Binary files a/fdmdv2/tests/pa_cppbinding_test/libportaudiocpp-0.dll and /dev/null differ diff --git a/fdmdv2/tests/pa_cppbinding_test/main.cpp b/fdmdv2/tests/pa_cppbinding_test/main.cpp deleted file mode 100644 index 26dd162d..00000000 --- a/fdmdv2/tests/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/tests/pa_cppbinding_test/main.h b/fdmdv2/tests/pa_cppbinding_test/main.h deleted file mode 100644 index 974b512d..00000000 --- a/fdmdv2/tests/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/tests/pa_cppbinding_test/pa_cppbinding_test.mk b/fdmdv2/tests/pa_cppbinding_test/pa_cppbinding_test.mk deleted file mode 100644 index 114619aa..00000000 --- a/fdmdv2/tests/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/tests/pa_cppbinding_test/pa_cppbinding_test.project b/fdmdv2/tests/pa_cppbinding_test/pa_cppbinding_test.project deleted file mode 100644 index 6728a3af..00000000 --- a/fdmdv2/tests/pa_cppbinding_test/pa_cppbinding_test.project +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - - diff --git a/fdmdv2/tests/pa_cppbinding_test/pa_cppbinding_test.txt b/fdmdv2/tests/pa_cppbinding_test/pa_cppbinding_test.txt deleted file mode 100644 index 8e987060..00000000 --- a/fdmdv2/tests/pa_cppbinding_test/pa_cppbinding_test.txt +++ /dev/null @@ -1 +0,0 @@ -./Release/gui.o ./Release/main.o diff --git a/fdmdv2/tests/pa_enum/AudioOptsDialog.cpp b/fdmdv2/tests/pa_enum/AudioOptsDialog.cpp deleted file mode 100644 index 68d46ffb..00000000 --- a/fdmdv2/tests/pa_enum/AudioOptsDialog.cpp +++ /dev/null @@ -1,726 +0,0 @@ -//========================================================================= -// Name: AudioOptsDialog.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" -#include "AudioOptsDialog.h" - -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -// AudioOptsDialog() -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -AudioOptsDialog::AudioOptsDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) : wxDialog(parent, id, title, pos, size, style) -{ - this->SetSizeHints(wxSize(650, 400), wxDefaultSize); - - m_isPaInitialized = false; - - // Make an image list containing large icons - m_imageListNormal = new wxImageList(32, 32, true); - m_imageListSmall = new wxImageList(16, 16, true); - -#ifdef __WXMSW__ - // Give it an icon - SetIcon(wxICON("bitmaps/sample.ico")); - - m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchec.ico"), wxBITMAP_TYPE_ICO)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/transparent.ico"), wxBITMAP_TYPE_ICO)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchar.ico"), wxBITMAP_TYPE_ICO)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/tooldata.ico"), wxBITMAP_TYPE_ICO)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolgame.ico"), wxBITMAP_TYPE_ICO)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolnote.ico"), wxBITMAP_TYPE_ICO)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/tooltime.ico"), wxBITMAP_TYPE_ICO)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/inArrow16x16.ico"), wxBITMAP_TYPE_ICO)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/outArrow16x16.ico"), wxBITMAP_TYPE_ICO)); -#else - // Give it an icon - SetIcon(wxICON("bitmaps/sample.xpm")); - - m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchec.xpm"), wxBITMAP_TYPE_XPM, -1, -1)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/transparent.xpm"), wxBITMAP_TYPE_XPM, -1, -1)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchar.xpm"), wxBITMAP_TYPE_XPM, -1, -1)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/tooldata.xpm"), wxBITMAP_TYPE_XPM, -1, -1)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolgame.xpm"), wxBITMAP_TYPE_XPM, -1, -1)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolnote.xpm"), wxBITMAP_TYPE_XPM, -1, -1)); - m_imageListSmall->Add(wxIcon(wxT("bitmaps/tooltime.xpm"), wxBITMAP_TYPE_XPM, -1, -1)); -// m_imageListSmall->Add(wxIcon(wxT("bitmaps/inArrow16x16.xpm"), wxBITMAP_TYPE_XPM)); -// m_imageListSmall->Add(wxIcon(wxT("bitmaps/outArrow16x16.xpm"), wxBITMAP_TYPE_XPM)); - #endif - if(!m_isPaInitialized) - { - if((pa_err = Pa_Initialize()) == paNoError) - { - m_isPaInitialized = true; - } - else - { - wxMessageBox(wxT("Port Audio failed to initialize"), wxT("Pa_Initialize"), wxOK); - return; - } - } - - 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); - 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_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); - 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); - m_notebook1->AddPage(m_panelRx, _("Receive"), true); - 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); - 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_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); - 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); - m_notebook1->AddPage(m_panelTx, _("Transmit"), false); - 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); - m_sdbSizer1Apply = new wxButton(this, wxID_APPLY); - m_sdbSizer1->AddButton(m_sdbSizer1Apply); - 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); - - m_notebook1->SetSelection(0); - - showAPIInfo(); - m_RxInDevices.m_listDevices = m_listCtrlRxInDevices; - m_RxInDevices.direction = AUDIO_IN; - m_RxInDevices.m_textDevice = m_textCtrlRxIn; - m_RxInDevices.m_cbSampleRate = m_cbSampleRateRxIn; - - m_RxOutDevices.m_listDevices = m_listCtrlRxOutDevices; - m_RxOutDevices.direction = AUDIO_OUT; - m_RxOutDevices.m_textDevice = m_textCtrlRxOut; - m_RxOutDevices.m_cbSampleRate = m_cbSampleRateRxOut; - - m_TxInDevices.m_listDevices = m_listCtrlTxInDevices; - m_TxInDevices.direction = AUDIO_IN; - m_TxInDevices.m_textDevice = m_textCtrlTxIn; - m_TxInDevices.m_cbSampleRate = m_cbSampleRateTxIn; - - m_TxOutDevices.m_listDevices = m_listCtrlTxOutDevices; - m_TxOutDevices.direction = AUDIO_OUT; - m_TxOutDevices.m_textDevice = m_textCtrlTxOut; - m_TxOutDevices.m_cbSampleRate = m_cbSampleRateTxOut; - - populateParams(m_RxInDevices); - populateParams(m_RxOutDevices); - populateParams(m_TxInDevices); - populateParams(m_TxOutDevices); - - m_listCtrlRxInDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( AudioOptsDialog::OnRxInDeviceSelect ), NULL, this ); - m_listCtrlRxOutDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( AudioOptsDialog::OnRxOutDeviceSelect ), NULL, this ); - m_listCtrlTxInDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( AudioOptsDialog::OnTxInDeviceSelect ), NULL, this ); - m_listCtrlTxOutDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( AudioOptsDialog::OnTxOutDeviceSelect ), NULL, this ); - m_btnRefresh->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AudioOptsDialog::OnRefreshClick ), NULL, this ); - m_sdbSizer1Apply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AudioOptsDialog::OnApplyAudioParameters ), NULL, this ); - m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AudioOptsDialog::OnCancelAudioParameters ), NULL, this ); - m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AudioOptsDialog::OnOkAudioParameters ), NULL, this ); -/* - void OnClose( wxCloseEvent& event ) { event.Skip(); } - void OnHibernate( wxActivateEvent& event ) { event.Skip(); } - void OnIconize( wxIconizeEvent& event ) { event.Skip(); } - void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } -*/ -// this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(AudioOptsDialog::OnClose)); - this->Connect(wxEVT_HIBERNATE, wxActivateEventHandler(AudioOptsDialog::OnHibernate)); - this->Connect(wxEVT_ICONIZE, wxIconizeEventHandler(AudioOptsDialog::OnIconize)); - this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(AudioOptsDialog::OnInitDialog)); -} - -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -// ~AudioOptsDialog() -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -AudioOptsDialog::~AudioOptsDialog() -{ - // Disconnect Events - this->Disconnect(wxEVT_HIBERNATE, wxActivateEventHandler(AudioOptsDialog::OnHibernate)); - this->Disconnect(wxEVT_ICONIZE, wxIconizeEventHandler(AudioOptsDialog::OnIconize)); - this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(AudioOptsDialog::OnInitDialog)); - - m_listCtrlRxInDevices->Disconnect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(AudioOptsDialog::OnRxInDeviceSelect), NULL, this); - m_listCtrlRxOutDevices->Disconnect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(AudioOptsDialog::OnRxOutDeviceSelect), NULL, this); - m_listCtrlTxInDevices->Disconnect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(AudioOptsDialog::OnTxInDeviceSelect), NULL, this); - m_listCtrlTxOutDevices->Disconnect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(AudioOptsDialog::OnTxOutDeviceSelect), NULL, this); - m_btnRefresh->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(AudioOptsDialog::OnRefreshClick), NULL, this); - m_sdbSizer1Apply->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(AudioOptsDialog::OnApplyAudioParameters), NULL, this); - m_sdbSizer1Cancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(AudioOptsDialog::OnCancelAudioParameters), NULL, this); - m_sdbSizer1OK->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(AudioOptsDialog::OnOkAudioParameters), NULL, this); -} - -//------------------------------------------------------------------------- -// OnInitDialog() -//------------------------------------------------------------------------- -void AudioOptsDialog::OnInitDialog( wxInitDialogEvent& event ) -{ - ExchangeData(EXCHANGE_DATA_IN); - //populateAudioInfo(); -} - -//------------------------------------------------------------------------- -// ExchangeData() -//------------------------------------------------------------------------- -void AudioOptsDialog::ExchangeData(int inout) -{ - wxConfigBase *pConfig = wxConfigBase::Get(); - if(inout == EXCHANGE_DATA_IN) - { - m_textCtrlRxIn->SetValue(wxGetApp().m_strRxInAudio); - m_textCtrlRxOut->SetValue(wxGetApp().m_strRxOutAudio); - m_textCtrlTxIn->SetValue(wxGetApp().m_textVoiceInput); - m_textCtrlTxOut->SetValue(wxGetApp().m_textVoiceOutput); - } - if(inout == EXCHANGE_DATA_OUT) - { - wxGetApp().m_strRxInAudio = m_textCtrlRxIn->GetValue(); - wxGetApp().m_strRxOutAudio = m_textCtrlRxOut->GetValue(); - wxGetApp().m_textVoiceInput = m_textCtrlTxIn->GetValue(); - wxGetApp().m_textVoiceOutput = m_textCtrlTxOut->GetValue(); - - pConfig->Write(wxT("/Audio/RxIn"), wxGetApp().m_strRxInAudio); - pConfig->Write(wxT("/Audio/RxOut"), wxGetApp().m_strRxOutAudio); - pConfig->Write(wxT("/Audio/TxIn"), wxGetApp().m_textVoiceInput); - pConfig->Write(wxT("/Audio/TxOut"), wxGetApp().m_textVoiceOutput); - pConfig->Write(wxT("/Audio/SampleRate"), wxGetApp().m_strSampleRate); - pConfig->Flush(); - } - delete wxConfigBase::Set((wxConfigBase *) NULL); -} - -//------------------------------------------------------------------------- -// OnDeviceSelect() -//------------------------------------------------------------------------- -void AudioOptsDialog::OnDeviceSelect(wxListEvent& event) -{ - wxListItem info; - long item; - item = m_listCtrlRxInDevices->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - wxMessageBox(m_listCtrlRxInDevices->GetItemText(item, 2), wxT("Item"), wxOK); -} - -//------------------------------------------------------------------------- -// DisplaySupportedSampleRates() -//------------------------------------------------------------------------- -void AudioOptsDialog::DisplaySupportedSampleRates(AudioInfoDisplay ai) -{ - static double standardSampleRates[] = - { - 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 i; - //int printCount; - //PaError err; - wxString str; - - //printCount = 0; - for(i = 0; standardSampleRates[i] > 0; i++) - { - str.Printf("%8.2f", standardSampleRates[i]); - ai.m_cbSampleRate->AppendString(str); -/* - err = Pa_IsFormatSupported(ai.inputParameters, outputParameters, standardSampleRates[i]); - if(err == paFormatIsSupported) - { - str.Printf("%8.2f", standardSampleRates[i]); - ai.m_cbSampleRate->AppendString(str); - } - - err = Pa_IsFormatSupported(ai->inputParameters, outputParameters, standardSampleRates[i]); - if(err == paFormatIsSupported) - { - if(printCount == 0) - { - printf("\t%8.2f", standardSampleRates[i]); - printCount = 1; - } - else if(printCount == 4) - { - printf(",\n\t%8.2f", standardSampleRates[i]); - printCount = 1; - } - else - { - printf(", %8.2f", standardSampleRates[i]); - ++printCount; - } - } -*/ - } - ai.m_cbSampleRate->SetSelection(9); -} - -//------------------------------------------------------------------------- -// GetAPIInfo() -//------------------------------------------------------------------------- -void AudioOptsDialog::showAPIInfo() -{ - wxString strval; - int apiCount = 0; - int numDevices = 0; - - strval = Pa_GetVersionText(); - m_textStringVer->SetValue(strval); - - numDevices = Pa_GetVersion(); - strval.Printf(wxT("%d"), numDevices); - m_textIntVer->SetValue(strval); - - apiCount = Pa_GetHostApiCount(); - strval.Printf(wxT("%d"), apiCount); - m_textAPICount->SetValue(strval); - - numDevices = Pa_GetDeviceCount(); - strval.Printf(wxT("%d"), numDevices); - m_textCDevCount->SetValue(strval); -} - -//------------------------------------------------------------------------- -// populateParams() -//------------------------------------------------------------------------- -void AudioOptsDialog::populateParams(AudioInfoDisplay ai) -{ - const PaDeviceInfo *deviceInfo = NULL; - int j = 0; - wxListCtrl* ctrl = ai.m_listDevices; - int in_out = ai.direction; - long idx; - bool defaultDisplayed = false; - int numDevices; - wxListItem listItem; - wxString buf; - int devn; - - numDevices = Pa_GetDeviceCount(); - - if(ctrl->GetColumnCount() > 0) - { - ctrl->ClearAll(); - } - //ctrl->SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL); - - listItem.SetAlign(wxLIST_FORMAT_CENTRE); - listItem.SetText(wxT("Sel")); - idx = ctrl->InsertColumn(0, listItem); - ctrl->SetColumnWidth(0, 37); - - listItem.SetAlign(wxLIST_FORMAT_CENTRE); - listItem.SetText(wxT("Dflt")); - idx = ctrl->InsertColumn(1, listItem); - ctrl->SetColumnWidth(1, 37); - - listItem.SetAlign(wxLIST_FORMAT_LEFT); - listItem.SetText(wxT("Device")); - idx = ctrl->InsertColumn(2, listItem); - ctrl->SetColumnWidth(2, 190); - - listItem.SetAlign(wxLIST_FORMAT_LEFT); - listItem.SetText(wxT("API")); - idx = ctrl->InsertColumn(3, listItem); - ctrl->SetColumnWidth(3, 190); - - if(in_out == AUDIO_IN) - { - listItem.SetAlign(wxLIST_FORMAT_CENTRE); - listItem.SetText(wxT("# Inputs")); - idx = ctrl->InsertColumn(4, listItem); - ctrl->SetColumnWidth(4, 75); - } - else if(in_out == AUDIO_OUT) - { - listItem.SetAlign(wxLIST_FORMAT_CENTRE); - listItem.SetText(wxT("# Outputs")); - idx = ctrl->InsertColumn(4, listItem); - ctrl->SetColumnWidth(4, 75); - } - - listItem.SetAlign(wxLIST_FORMAT_CENTRE); - listItem.SetText(wxT("Min Latency")); - ctrl->InsertColumn(5, listItem); - ctrl->SetColumnWidth(5, 100); - - listItem.SetAlign(wxLIST_FORMAT_CENTRE); - listItem.SetText(wxT("Max Latency")); - ctrl->InsertColumn(6, listItem); - ctrl->SetColumnWidth(6, 100); - - for(devn = 0; devn < numDevices; devn++) - { - buf.Printf(wxT("")); - deviceInfo = Pa_GetDeviceInfo(devn); - if(in_out == AUDIO_IN) - { - if(deviceInfo->maxInputChannels > 0) - { - idx = ctrl->InsertItem(j, ICON_TRANSPARENT); - defaultDisplayed = false; - if(devn == Pa_GetDefaultInputDevice()) - { - buf.Printf("->>"); - ctrl->SetItem(idx, 1, buf); - defaultDisplayed = true; - } - else if(devn == Pa_GetHostApiInfo(deviceInfo->hostApi)->defaultInputDevice) - { - buf.Printf("-->"); - ctrl->SetItem(idx, 1, buf); - defaultDisplayed = true; - } - else - { - buf.Printf("---"); - ctrl->SetItem(idx, 1, buf); - defaultDisplayed = false; - } - buf.Printf(wxT("%s"), deviceInfo->name); - ctrl->SetItem(idx, 2, buf); - if(defaultDisplayed) - { - ai.m_textDevice->SetValue(buf); - } - - buf.Printf(wxT("%s"), Pa_GetHostApiInfo(deviceInfo->hostApi)->name); - ctrl->SetItem(idx, 3, buf); - - buf.Printf(wxT("%i"), deviceInfo->maxInputChannels); - ctrl->SetItem(idx, 4, buf); - - buf.Printf(wxT("%8.4f"), deviceInfo->defaultLowInputLatency); - ctrl->SetItem(idx, 5, buf); - - buf.Printf(wxT("%8.4f"), deviceInfo->defaultHighInputLatency); - ctrl->SetItem(idx, 6, buf); - } - } - else if(in_out == AUDIO_OUT) - { - if(deviceInfo->maxOutputChannels > 0) - { - idx = ctrl->InsertItem(j, ICON_TRANSPARENT); - defaultDisplayed = false; - if(devn == Pa_GetDefaultOutputDevice()) - { - buf.Printf("<<-"); - ctrl->SetItem(idx, 1, buf); - defaultDisplayed = true; - } - else if(devn == Pa_GetHostApiInfo(deviceInfo->hostApi)->defaultOutputDevice) - { - buf.Printf("<--"); - ctrl->SetItem(idx, 1, buf); - defaultDisplayed = true; - } - else - { - buf.Printf("---"); - ctrl->SetItem(idx, 1, buf); - } - buf.Printf(wxT("%s"), deviceInfo->name); - ctrl->SetItem(idx, 2, buf); - if(defaultDisplayed) - { - ai.m_textDevice->SetValue(buf); - } - - buf.Printf(wxT("%s"), Pa_GetHostApiInfo(deviceInfo->hostApi)->name); - ctrl->SetItem(idx, 3, buf); - - buf.Printf(wxT("%i"), deviceInfo->maxOutputChannels); - ctrl->SetItem(idx, 4, buf); - - buf.Printf(wxT("%8.4f"), deviceInfo->defaultLowOutputLatency); - ctrl->SetItem(idx, 5, buf); - - buf.Printf(wxT("%8.4f"), deviceInfo->defaultHighOutputLatency); - ctrl->SetItem(idx, 6, buf); - } - } - j++; - } - DisplaySupportedSampleRates(ai); -} - -//------------------------------------------------------------------------- -// OnRxInDeviceSelect() -//------------------------------------------------------------------------- -void AudioOptsDialog::OnRxInDeviceSelect(wxListEvent& evt) -{ - wxString str; - int index = evt.GetIndex(); - - str = m_listCtrlRxInDevices->GetItemText(index, 2); - m_textCtrlRxIn->SetValue(str); -} - -//------------------------------------------------------------------------- -// OnRxOutDeviceSelect() -//------------------------------------------------------------------------- -void AudioOptsDialog::OnRxOutDeviceSelect(wxListEvent& evt) -{ - wxString str; - int index = evt.GetIndex(); - - str = m_listCtrlRxOutDevices->GetItemText(index, 2); - m_textCtrlRxOut->SetValue(str); -} - -//------------------------------------------------------------------------- -// OnTxInDeviceSelect() -//------------------------------------------------------------------------- -void AudioOptsDialog::OnTxInDeviceSelect(wxListEvent& evt) -{ - wxString str; - int index = evt.GetIndex(); - - str = m_listCtrlTxInDevices->GetItemText(index, 2); - m_textCtrlTxIn->SetValue(str); -} - -//------------------------------------------------------------------------- -// OnTxOutDeviceSelect() -//------------------------------------------------------------------------- -void AudioOptsDialog::OnTxOutDeviceSelect(wxListEvent& evt) -{ - wxString str; - int index = evt.GetIndex(); - - str = m_listCtrlTxOutDevices->GetItemText(index, 2); - m_textCtrlTxOut->SetValue(str); -} - -//------------------------------------------------------------------------- -// OnRefreshClick() -//------------------------------------------------------------------------- -void AudioOptsDialog::OnRefreshClick(wxCommandEvent& event) -{ - m_notebook1->SetSelection(0); - showAPIInfo(); - populateParams(m_RxInDevices); - populateParams(m_RxOutDevices); - populateParams(m_TxInDevices); - populateParams(m_TxOutDevices); -} - -//------------------------------------------------------------------------- -// OnApplyAudioParameters() -//------------------------------------------------------------------------- -void AudioOptsDialog::OnApplyAudioParameters(wxCommandEvent& event) -{ - ExchangeData(EXCHANGE_DATA_OUT); - if(m_isPaInitialized) - { - if((pa_err = Pa_Terminate()) == paNoError) - { - m_isPaInitialized = false; - } - else - { - wxMessageBox(wxT("Port Audio failed to Terminate"), wxT("Pa_Terminate"), wxOK); - } - } -} - -//------------------------------------------------------------------------- -// OnCancelAudioParameters() -//------------------------------------------------------------------------- -void AudioOptsDialog::OnCancelAudioParameters(wxCommandEvent& event) -{ - if(m_isPaInitialized) - { - if((pa_err = Pa_Terminate()) == paNoError) - { - m_isPaInitialized = false; - } - else - { - wxMessageBox(wxT("Port Audio failed to Terminate"), wxT("Pa_Terminate"), wxOK); - } - } - EndModal(wxCANCEL); -} - -//------------------------------------------------------------------------- -// OnOkAudioParameters() -//------------------------------------------------------------------------- -void AudioOptsDialog::OnOkAudioParameters(wxCommandEvent& event) -{ - ExchangeData(EXCHANGE_DATA_OUT); - if(m_isPaInitialized) - { - if((pa_err = Pa_Terminate()) == paNoError) - { - m_isPaInitialized = false; - } - else - { - wxMessageBox(wxT("Port Audio failed to Terminate"), wxT("Pa_Terminate"), wxOK); - } - } - EndModal(wxOK); -} diff --git a/fdmdv2/tests/pa_enum/AudioOptsDialog.h b/fdmdv2/tests/pa_enum/AudioOptsDialog.h deleted file mode 100644 index 15330bd7..00000000 --- a/fdmdv2/tests/pa_enum/AudioOptsDialog.h +++ /dev/null @@ -1,144 +0,0 @@ -//========================================================================= -// Name: AudioInfoDisplay.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 __AudioOptsDialog__ -#define __AudioOptsDialog__ - -#include "main.h" - -#define ID_AUDIO_OPTIONS 1000 -#define AUDIO_IN 0 -#define AUDIO_OUT 1 - -#define ICON_TRANSPARENT 1 -#define ICON_CHECK 0 -#define ICON_toolchar 2 -#define ICON_tooldata 3 -#define ICON_toolgame 4 -#define ICON_toolnote 5 -#define ICON_TOOLTIME 6 -#define ICON_INARROW 7 -#define ICON_OUTARROW 8 -#define EXCHANGE_DATA_IN 0 -#define EXCHANGE_DATA_OUT 1 - -// gui classes generated by wxFormBuilder -#include "gui.h" -#include "portaudio.h" -#ifdef WIN32 -#if PA_USE_ASIO -#include "pa_asio.h" -#endif -#endif - -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -// AudioInfoDisplay -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -class AudioInfoDisplay -{ - public: - wxListCtrl* m_listDevices; - int direction; - wxTextCtrl* m_textDevice; - wxComboBox* m_cbSampleRate; -}; - -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -// class AudioOptsDialog -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -class AudioOptsDialog : public wxDialog -{ - private: - - protected: - PaError pa_err; - bool m_isPaInitialized; - wxImageList *m_imageListNormal; - wxImageList *m_imageListSmall; - - // protected event handlers - //void OnCloseFrame( wxCloseEvent& event ); - void OnDeviceSelect( wxListEvent& event ); - - //void OnExitClick( wxCommandEvent& event ); - //void DisplaySupportedSampleRates(const PaStreamParameters *inputParameters, const PaStreamParameters *outputParameters); - void DisplaySupportedSampleRates(AudioInfoDisplay ai); - void populateParams(AudioInfoDisplay); - void showAPIInfo(); - - AudioInfoDisplay m_RxInDevices; - AudioInfoDisplay m_RxOutDevices; - AudioInfoDisplay m_TxInDevices; - AudioInfoDisplay m_TxOutDevices; - wxPanel* m_panel1; - wxNotebook* m_notebook1; - wxPanel* m_panelRx; - wxListCtrl* m_listCtrlRxInDevices; - wxStaticText* m_staticText51; - wxTextCtrl* m_textCtrlRxIn; - wxStaticText* m_staticText6; - wxComboBox* m_cbSampleRateRxIn; - wxListCtrl* m_listCtrlRxOutDevices; - wxStaticText* m_staticText9; - wxTextCtrl* m_textCtrlRxOut; - wxStaticText* m_staticText10; - wxComboBox* m_cbSampleRateRxOut; - wxPanel* m_panelTx; - wxListCtrl* m_listCtrlTxInDevices; - wxStaticText* m_staticText12; - wxTextCtrl* m_textCtrlTxIn; - wxStaticText* m_staticText11; - wxComboBox* m_cbSampleRateTxIn; - wxListCtrl* m_listCtrlTxOutDevices; - wxStaticText* m_staticText81; - wxTextCtrl* m_textCtrlTxOut; - wxStaticText* m_staticText71; - wxComboBox* m_cbSampleRateTxOut; - wxPanel* m_panelAPI; - wxStaticText* m_staticText7; - wxTextCtrl* m_textStringVer; - wxStaticText* m_staticText8; - wxTextCtrl* m_textIntVer; - wxStaticText* m_staticText5; - wxTextCtrl* m_textCDevCount; - wxStaticText* m_staticText4; - wxTextCtrl* m_textAPICount; - wxButton* m_btnRefresh; - wxStdDialogButtonSizer* m_sdbSizer1; - 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(); } - 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 ); - // Virtual event handlers, overide them in your derived class - void OnClose( wxCloseEvent& event ) { event.Skip(); } - void OnHibernate( wxActivateEvent& event ) { event.Skip(); } - void OnIconize( wxIconizeEvent& event ) { event.Skip(); } - void OnInitDialog( wxInitDialogEvent& event ); - - public: - - AudioOptsDialog( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Audio Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 300,300 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~AudioOptsDialog(); - void ExchangeData(int inout); -}; -#endif //__AudioOptsDialog__ diff --git a/fdmdv2/tests/pa_enum/Debug/.gitignore b/fdmdv2/tests/pa_enum/Debug/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/fdmdv2/tests/pa_enum/Makefile.linux.dmw b/fdmdv2/tests/pa_enum/Makefile.linux.dmw deleted file mode 100644 index 2d87336b..00000000 --- a/fdmdv2/tests/pa_enum/Makefile.linux.dmw +++ /dev/null @@ -1,31 +0,0 @@ -# src/tests/pa_enum Makefile.linux.dmw -# David Witten 25 Oct 2012 -# -# $ make -f Makefile.linux.dmw - -WX_GTK_PATH=/home/wittend/Projects/wxWidgets-2.9.4/build_gtk - -WX_CONFIG=$(WX_GTK_PATH)/wx-config -WX_CPPFLAGS = $(shell $(WX_CONFIG) --cxxflags) -WX_LIBS = $(shell $(WX_CONFIG) --libs core, base, aui, adv) - -CPP_FLAGS = $(WX_CPPFLAGS) -I../../extern/include -g -Wall -LIBS = $(WX_LIBS) -lm -lportaudiocpp -lpthread - -OBJS = main.o \ - gui.o - -HDRS = main.h gui.h - -all: pa_enum - -pa_enum: $(OBJS) - g++ -o pa_enum $(OBJS) $(CPP_FLAGS) $(LIBS) - -%.o: %.cpp $(HDRS) - g++ $(CPP_FLAGS) -c $< -o $@ - - -clean: - rm -f *.o pa_enum - diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/blank.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/blank.ico deleted file mode 100644 index accc4cc8..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/blank.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/inArrow.ICO b/fdmdv2/tests/pa_enum/Release/bitmaps/inArrow.ICO deleted file mode 100644 index cc7c9176..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/inArrow.ICO and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/inArrow16x16.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/inArrow16x16.ico deleted file mode 100644 index 6ed297b4..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/inArrow16x16.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/inArrow32x32.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/inArrow32x32.ico deleted file mode 100644 index ffc748e9..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/inArrow32x32.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/outArrow.ICO b/fdmdv2/tests/pa_enum/Release/bitmaps/outArrow.ICO deleted file mode 100644 index b8b46ea5..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/outArrow.ICO and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/outArrow16x16.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/outArrow16x16.ico deleted file mode 100644 index dffb649e..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/outArrow16x16.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/outArrow16x16.xpm b/fdmdv2/tests/pa_enum/Release/bitmaps/outArrow16x16.xpm deleted file mode 100644 index 9a33ea53..00000000 --- a/fdmdv2/tests/pa_enum/Release/bitmaps/outArrow16x16.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * outArrow16x16_xpm[] = { -"16 16 4 1", -" c None", -". c #C0C0C0", -"+ c #808080", -"@ c #000000", -" ", -" ", -" . ", -" .. ", -" ... ", -" .... ", -".............. ", -"+.............. ", -"+++.............", -"++++@@@@@@@@@@@@", -"+++@@@@@@@@@@@@@", -"++@@@@@@@@@@@@@ ", -" @@@@ ", -" @@@ ", -" @@ ", -" @ "}; diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/outArrow32x32.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/outArrow32x32.ico deleted file mode 100644 index 42f8e3a2..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/outArrow32x32.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/sample.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/sample.ico deleted file mode 100644 index 435cca24..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/sample.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/small1.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/small1.ico deleted file mode 100644 index 4cac633c..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/small1.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/small1.xpm b/fdmdv2/tests/pa_enum/Release/bitmaps/small1.xpm deleted file mode 100644 index 650f1b1e..00000000 --- a/fdmdv2/tests/pa_enum/Release/bitmaps/small1.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static const char *const small1_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 16 6 1", -". c Black", -"o c #FFFFFF", -"X c #000080", -"O c #FFFF00", -" c None", -"+ c #FF0000", -/* pixels */ -" ", -" ", -" ", -" ....... ", -" .XXXXX. ", -" .oXXXX. ", -" .oXXX.......", -".....oXXX.OOOOO.", -".+++.XXXX.oOOOO.", -".o++......oOOOO.", -".o++++. .oOOOO.", -".o++++. .OOOOO.", -".+++++. .......", -"....... ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/toolbrai.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/toolbrai.ico deleted file mode 100644 index 99069f7c..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/toolbrai.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/toolbrai.xpm b/fdmdv2/tests/pa_enum/Release/bitmaps/toolbrai.xpm deleted file mode 100644 index 7dc20afc..00000000 --- a/fdmdv2/tests/pa_enum/Release/bitmaps/toolbrai.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *const toolbrai_xpm[] = { -/* width height ncolors chars_per_pixel */ -"32 32 4 1", -/* colors */ -" s None c None", -". c #000080", -"+ c #ff0000", -"@ c #00ffff", -/* pixels */ -" ", -" ", -" ..... ", -" ..... .+++++. ", -" .+++++. .+++++. ", -" .+++++++. .+++++. ", -" .+++++. ..... ", -" ..... @ ", -" @ @ ", -" @ @ ", -" @ @ ", -" @ ..... ", -" ..+++++.. ", -" .+++++++++. ", -" .+++++++++. ", -" .+++++++++. ", -" @..+++++.. ", -" @ .....@ ", -" @ @ @ ", -" @ @ @ ...... ", -" @ @ @.++++++. ", -" @ @ .++++++. ", -" @ @ .++++++. ", -" ...... @ .++++++. ", -" .++++++. @ ...... ", -" .++++++. .... ", -" .++++++. .++++. ", -" .++++++. .++++. ", -" ...... .++++. ", -" .++++. ", -" .... ", -" "}; diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/toolchar.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/toolchar.ico deleted file mode 100644 index cec94e6b..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/toolchar.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/toolchar.xpm b/fdmdv2/tests/pa_enum/Release/bitmaps/toolchar.xpm deleted file mode 100644 index 0f1ac793..00000000 --- a/fdmdv2/tests/pa_enum/Release/bitmaps/toolchar.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *const toolchar_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 4 1", -". c Black", -"X c #FFFF00", -" c None", -"o c #C00000", -/* pixels */ -" ", -" ..... ", -" ...XXXXX... ", -" ..XXXXXXXXXXX.. ", -" .XXXXXXXXXXXXXXX. ", -" ..XXXXXXXXXXXXXXXXX.. ", -" .XXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXX.XXXXXXX.XXXXXX. ", -" .XXXXXX.X.XXXXX.X.XXXXXX. ", -" .XXXXX.XXX.XXX.XXX.XXXXXX. ", -" .XXXXX.XXXXXXXXXXXXX.XXXXX. ", -" .XXXXXXXX.XXXXXXX.XXXXXXXX. ", -" .XXXXXXXX.XXXXXXX.XXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXX.XXXXXXXXXXX.XXXXXXX. ", -" .XXXXXX...XXXXXXX...XXXXXX. ", -" .XXXXXX.oo..XXX..oo.XXXXXX. ", -" .XXXXXXX.ooo...ooo.XXXXXXX. ", -" .XXXXXXX.ooooooo.XXXXXXXX. ", -" .XXXXXXXX..ooo..XXXXXXXX. ", -" .XXXXXXXXX...XXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXX. ", -" ..XXXXXXXXXXXXXXXXX.. ", -" .XXXXXXXXXXXXXXX. ", -" ..XXXXXXXXXXX.. ", -" ...XXXXX... ", -" ..... ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/toolchec.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/toolchec.ico deleted file mode 100644 index 1989d57e..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/toolchec.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/toolchec.xpm b/fdmdv2/tests/pa_enum/Release/bitmaps/toolchec.xpm deleted file mode 100644 index 90951a72..00000000 --- a/fdmdv2/tests/pa_enum/Release/bitmaps/toolchec.xpm +++ /dev/null @@ -1,54 +0,0 @@ -/* XPM */ -static const char *const toolchec_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 16 1", -"X c Black", -". c #4B4B4B", -"% c #696969", -": c #353535", -"o c #181818", -"O c #CCCCCC", -"@ c #0B0B0B", -" c None", -"+ c #292929", -"= c #383838", -"; c #747474", -"# c #8B8B8B", -"& c #A9A9A9", -"- c #575757", -"* c #B2B2B2", -"$ c #959595", -/* pixels */ -" ", -" ", -" .XX ", -" oXXO ", -" .XX+ ", -" oXX@# ", -" oXX@ ", -" oXX# ", -" @XX$ ", -" oXX$ ", -" oXX. ", -" +XXX ", -" %XXX ", -" &XXX* ", -" .XXX= ", -" XXXo ", -" . @XXX ", -" -XXo +XXX. ", -" XXXXX; $XXXX ", -" .+XXXXX XXXX. ", -" +XXXX= XXXX= ", -" @XXXX *XXXX ", -" XXXX$XXXX$ ", -" +XXXXXXXX ", -" XXXXXXX. ", -" oXXXXX: ", -" ;XXXXX. ", -" XXXX# ", -" @XX ", -" = ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/tooldata.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/tooldata.ico deleted file mode 100644 index ed7ebbe5..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/tooldata.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/tooldata.xpm b/fdmdv2/tests/pa_enum/Release/bitmaps/tooldata.xpm deleted file mode 100644 index d8f7d4c8..00000000 --- a/fdmdv2/tests/pa_enum/Release/bitmaps/tooldata.xpm +++ /dev/null @@ -1,41 +0,0 @@ -/* XPM */ -static const char *const tooldata_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 3 1", -" c Black", -"X c #FFFFFF", -". c #C0C0C0", -/* pixels */ -" ", -" ", -" ............................ ", -" ............................ ", -" .. .. .. .. ", -" .. .. .. .. ", -" ............................ ", -" ............................ ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XX XX XX XX ", -" XX XX XX XX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XX XX XX XX ", -" XX XX XX XX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XX XX XX XX ", -" XX XX XX XX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XX XX XX XX ", -" XX XX XX XX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XX XX XX XX ", -" XX XX XX XX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/toolgame.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/toolgame.ico deleted file mode 100644 index b3d6190b..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/toolgame.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/toolgame.xpm b/fdmdv2/tests/pa_enum/Release/bitmaps/toolgame.xpm deleted file mode 100644 index 7488bd8c..00000000 --- a/fdmdv2/tests/pa_enum/Release/bitmaps/toolgame.xpm +++ /dev/null @@ -1,41 +0,0 @@ -/* XPM */ -static const char *const toolgame_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 3 1", -"X c #808080", -" c None", -". c #FF0000", -/* pixels */ -" ", -" ", -" ", -" ", -" .. ", -" .... ", -" ...... ", -" ........ ", -" .......... ", -" ............ ", -" .............. ", -" ................ ", -" .................. ", -" .................... ", -" ...................... ", -" ........................ ", -" .......................... ", -" ........................X ", -" ......................X ", -" ....................X ", -" ..................X ", -" ................X ", -" ..............X ", -" ............X ", -" ..........X ", -" ........X ", -" ......X ", -" ....X ", -" ..X ", -" ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/toolnote.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/toolnote.ico deleted file mode 100644 index ff0ec28b..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/toolnote.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/toolnote.xpm b/fdmdv2/tests/pa_enum/Release/bitmaps/toolnote.xpm deleted file mode 100644 index e86035cb..00000000 --- a/fdmdv2/tests/pa_enum/Release/bitmaps/toolnote.xpm +++ /dev/null @@ -1,43 +0,0 @@ -/* XPM */ -static const char *const toolnote_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 5 1", -"O c Black", -"o c #FFFFFF", -". c #808080", -" c None", -"X c #C0C0C0", -/* pixels */ -" ", -" ", -" ", -" . . . . . ", -" XXX.XX.XX.XX.XX.XXX ", -" Xoo.oo.oo.oo.oo.ooX ", -" XoooooooooooooooooX. ", -" XooOOO..OOOO.OOOooX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XooOOOOOOoooooooooX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XooOOO.OOOOOOOooooX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XooOOOOOO.OOOoooooX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XooOO.OOOO.OOOOOooX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XooOOO.OOOOO.OOOOoX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XXXXXXXXXXXXXXXXXXX. ", -" .................. ", -" ", -" ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/tooltime.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/tooltime.ico deleted file mode 100644 index 141bcaa5..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/tooltime.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/tooltime.xpm b/fdmdv2/tests/pa_enum/Release/bitmaps/tooltime.xpm deleted file mode 100644 index f75477d9..00000000 --- a/fdmdv2/tests/pa_enum/Release/bitmaps/tooltime.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *const tooltime_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 4 1", -". c Black", -"o c #FFFFFF", -" c None", -"X c #C0C0C0", -/* pixels */ -" ", -" ", -" ", -" ", -" ..... ", -" ...XX.oo... ", -" .XXXoo.ooooo. ", -" ..Xoooooooooooo.. ", -" .Xoooooo.ooooooo. ", -" .Xooooooo.Xooooooo. ", -" .Xoooooooo.Xoooooooo. ", -" .Xoooooooo.Xoooooooo. ", -" .Xoooooooo.Xoooooooo. ", -" .Xooooooooo.Xooooooooo. ", -" .Xooooooooo.Xooooooooo.X ", -" ...oo.......Xooooooo...X ", -" .oooooXXXXXXXooooooooo.X ", -" .ooooooooooooooooooooo.X ", -" .ooooooooooooooooooo.XX ", -" .ooooooooooooooooooo.XX ", -" .ooooooooooooooooooo.X ", -" .ooooooooooooooooo.XX ", -" .ooooooooooooooo.XX ", -" ..ooooooooooooo..X ", -" .ooooo.ooooo.XX ", -" ...oo.oo...XX ", -" XX.....XXXX ", -" XXXXXXX ", -" ", -" ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/tooltodo.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/tooltodo.ico deleted file mode 100644 index 6b93a945..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/tooltodo.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/tooltodo.xpm b/fdmdv2/tests/pa_enum/Release/bitmaps/tooltodo.xpm deleted file mode 100644 index 9ba1e31a..00000000 --- a/fdmdv2/tests/pa_enum/Release/bitmaps/tooltodo.xpm +++ /dev/null @@ -1,194 +0,0 @@ -/* XPM */ -static const char *const tooltodo_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 156 2", -"0 c #A08020", -"+. c #D0C066", -"q c #A08022", -"T c #98752D", -"6. c #D0C072", -"w c #A88B28", -"@. c #987540", -"l c #A08037", -"~ c #A0803F", -"4. c #A08048", -"7 c #808080", -"m c #704012", -"P c #704013", -"] c #704014", -"B c #704016", -"{ c #704017", -":. c #704019", -"k c #70401B", -"A c #70401C", -"W c #70401D", -".. c #70401E", -"F c #70401F", -"1. c #704020", -"H c #704022", -"s c #EFEA37", -") c #704024", -"5. c #704025", -"} c #784B1E", -"z c #784B22", -"2. c #784B26", -"/ c #784B28", -"Y c #EFEA55", -"N c #E0D547", -"D c #EFEA6C", -"X. c #EFEA70", -"o. c #EFEA74", -"R c #E0D554", -"| c #E0D558", -"#. c #EFEA83", -"y c #E8E05D", -"3. c #E0D570", -"x c #E8E069", -"G c #BFAA57", -"J c #BFAA5D", -">. c #B0953D", -" c None", -"<. c #B8A04D", -"^ c #B8A052", -"X c #FFFF30", -"o c #FFFF34", -"O c #FFFF38", -"+ c #FFFF3C", -"b c #FFFF40", -"@ c #FFFF41", -"' c #FFFF43", -"n c #FFFF44", -"# c #FFFF45", -"*. c #FFFF47", -"L c #FFFF48", -"$ c #FFFF49", -"8. c #FFFF4B", -"M c #FFFF4C", -"V c #906B27", -"% c #FFFF4D", -"p. c #FFFF4F", -"I c #FFFF50", -"& c #FFFF51", -"a. c #FFFF53", -"U c #FFFF54", -"e c #FFFF55", -"* c #FFFF56", -"g. c #FFFF57", -"[ c #FFFF58", -"r c #FFFF59", -"= c #FFFF5A", -"l. c #FFFF5B", -". c #C0C0C0", -"-. c #FFFF5C", -"j c #FFFF5D", -"- c #FFFF5E", -"b. c #FFFF5F", -"9. c #FFFF60", -"C c #FFFF61", -"; c #FFFF62", -"n. c #FFFF63", -"0. c #FFFF64", -": c #FFFF66", -"N. c #FFFF67", -"s. c #FFFF68", -"E c #FFFF69", -"Z c #FFFF6A", -"> c #FFFF6B", -"h. c #FFFF6C", -" . c #FFFF6D", -"u c #FFFF6E", -", c #FFFF6F", -"z. c #FFFF70", -",. c #FFFF71", -"S c #FFFF72", -"< c #FFFF73", -"x. c #FFFF74", -"q. c #FFFF75", -"Q c #FFFF76", -"f c #602B0B", -"1 c #FFFF77", -"m. c #FFFF78", -"w. c #FFFF79", -"! c #FFFF7A", -"2 c #FFFF7B", -"B. c #FFFF7C", -"d. c #FFFF7D", -"e. c #FFFF7E", -"i c #FFFF7F", -"3 c #FFFF80", -"j. c #FFFF81", -"r. c #FFFF82", -"p c #FFFF83", -"4 c #FFFF84", -"c. c #FFFF85", -"k. c #FFFF86", -"c c #FFFF87", -"5 c #FFFF88", -"v. c #FFFF89", -"y. c #FFFF8A", -"( c #FFFF8B", -"6 c #FFFF8C", -"t. c #FFFF8D", -"u. c #FFFF8E", -"O. c #68361C", -"a c #FFFF90", -"V. c #FFFF91", -"f. c #FFFF92", -"$. c #68361F", -"_ c #FFFF93", -"v c #FFFF94", -"Z. c #FFFF95", -"M. c #FFFF96", -"%. c #FFFF97", -"K c #FFFF98", -"A. c #FFFF99", -"C. c #FFFF9A", -"7. c #FFFF9B", -"` c #FFFF9C", -"D. c #FFFF9D", -"S. c #FFFF9E", -"i. c #FFFF9F", -"&. c #FFFFA0", -"F. c #FFFFA1", -"8 c #D0C02A", -"d c #D0C030", -"g c #D0C036", -"h c #D0C03A", -";. c #C8B545", -"t c #C8B548", -"=. c #987527", -"9 c #A0801E", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" . . . . . . . . . . . . . . . . . . . . . . . . . ", -" . X o O + @ # $ % & * = - ; : > , < 1 2 3 4 5 6 . 7 ", -" . o 8 9 0 q w % & e r - ; t y u < 1 2 i p 5 6 a . 7 ", -" . O s d f g h & e r j ; : k l z x 2 i p c 6 a v . 7 ", -" . + b n m M & N B V C : Z A S D F i G H J a v K . 7 ", -" . b n L P I U B Y T R E u W Q ! ~ ^ / ( ) _ K ` . 7 ", -" . ' L M ] U [ { C } | .S ..X.o.O.+.@.#.$.%.` &.. 7 ", -" . *.M I =.[ -.;.:.>. .,.Q <.1.2.3.( 4.5.6.7.&.. . 7 ", -" . 8.I U [ -.9.0.E .,.q.w.e.r.t.y.u._ %.7.i.. . . 7 ", -" . p.a.[ -.9.0.s. .,.q.w.d.r.t.t.u.f.%.7.. . . o . 7 ", -" . a.g.-.9.0.s.h.,.q.w.d.j.k.y.t.. . . . . o o . 7 ", -" . g.l.9.0.s.h.z.x.w.d.j.c.v.u.f.. o o o o o . 7 ", -" . l.b.n.s.h.z.x.m.d.j.c.v.t.f.M.. o o o o . 7 ", -" . b.n.N.h.z.x.m.B.j.c.v.t.V.M.C.. o o o . 7 ", -" . n.N.> z.x.m.B.3 4 v.t.V.Z.A.S.. o o . 7 ", -" . N.> , < m.B.3 4 5 t.V.Z.A.D.. o o . 7 ", -" . > , < 1 B.3 4 5 6 V.Z.A.D.. . o . 7 ", -" . , < 1 2 3 4 5 6 a v A.D.F.. o . 7 ", -" . < 1 2 i p 5 6 a v K D.F.. o . 7 ", -" . . . . . . . . . . . . . . . 7 ", -" 7 7 7 7 7 7 7 7 7 7 7 7 7 7 ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/toolword.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/toolword.ico deleted file mode 100644 index a1a8838c..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/toolword.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/toolword.xpm b/fdmdv2/tests/pa_enum/Release/bitmaps/toolword.xpm deleted file mode 100644 index b2e96a12..00000000 --- a/fdmdv2/tests/pa_enum/Release/bitmaps/toolword.xpm +++ /dev/null @@ -1,41 +0,0 @@ -/* XPM */ -static const char *const toolword_xpm[] = { -/* width height ncolors chars_per_pixel */ -"32 32 3 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #ffffff", -/* pixels */ -" ", -" ", -" ........ ........ ", -" .++++++. ...........++++++. ", -" .++++++. .++++++++..++++++. ", -" ........ .++++++++......... ", -" .++++++++. ", -" .......... ", -" ", -" ", -" ", -" ..... ", -"...... ......... .+++. .........", -".++++. .+++++++. .+++. .+++++++.", -".++++. .+++++++. .+++. .+++++++.", -".++++. .+++++++. ..... .+++++++.", -"...... ......... .........", -" ", -" ", -" ", -" ", -" .......... ", -" .. .++++++++. ", -" .++. .++++++++. ", -" .++++. .++++++++. ", -" .++++. .......... ", -" ...........+++. ", -" .++++++++. .+. ", -" .++++++++. . ", -" .......... ", -" ", -" "}; diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/transparent.ico b/fdmdv2/tests/pa_enum/Release/bitmaps/transparent.ico deleted file mode 100644 index eeba3067..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/bitmaps/transparent.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/bitmaps/transparent.xpm b/fdmdv2/tests/pa_enum/Release/bitmaps/transparent.xpm deleted file mode 100644 index 01f4737d..00000000 --- a/fdmdv2/tests/pa_enum/Release/bitmaps/transparent.xpm +++ /dev/null @@ -1,36 +0,0 @@ -/* XPM */ -static char * transparent_xpm[] = { -"32 32 1 1", -" c None", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/fdmdv2/tests/pa_enum/Release/libportaudio-2.dll b/fdmdv2/tests/pa_enum/Release/libportaudio-2.dll deleted file mode 100644 index 302e6635..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/libportaudio-2.dll and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/libportaudiocpp-0.dll b/fdmdv2/tests/pa_enum/Release/libportaudiocpp-0.dll deleted file mode 100644 index eae7e694..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/libportaudiocpp-0.dll and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/Release/libstdc++-6.dll b/fdmdv2/tests/pa_enum/Release/libstdc++-6.dll deleted file mode 100644 index f8e6c78a..00000000 Binary files a/fdmdv2/tests/pa_enum/Release/libstdc++-6.dll and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/blank.ico b/fdmdv2/tests/pa_enum/bitmaps/blank.ico deleted file mode 100644 index accc4cc8..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/blank.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/inArrow.ICO b/fdmdv2/tests/pa_enum/bitmaps/inArrow.ICO deleted file mode 100644 index cc7c9176..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/inArrow.ICO and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/inArrow16x16.ico b/fdmdv2/tests/pa_enum/bitmaps/inArrow16x16.ico deleted file mode 100644 index 6ed297b4..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/inArrow16x16.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/inArrow32x32.ico b/fdmdv2/tests/pa_enum/bitmaps/inArrow32x32.ico deleted file mode 100644 index ffc748e9..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/inArrow32x32.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/outArrow.ICO b/fdmdv2/tests/pa_enum/bitmaps/outArrow.ICO deleted file mode 100644 index b8b46ea5..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/outArrow.ICO and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/outArrow16x16.ico b/fdmdv2/tests/pa_enum/bitmaps/outArrow16x16.ico deleted file mode 100644 index dffb649e..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/outArrow16x16.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/outArrow16x16.xpm b/fdmdv2/tests/pa_enum/bitmaps/outArrow16x16.xpm deleted file mode 100644 index 9a33ea53..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/outArrow16x16.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -static char * outArrow16x16_xpm[] = { -"16 16 4 1", -" c None", -". c #C0C0C0", -"+ c #808080", -"@ c #000000", -" ", -" ", -" . ", -" .. ", -" ... ", -" .... ", -".............. ", -"+.............. ", -"+++.............", -"++++@@@@@@@@@@@@", -"+++@@@@@@@@@@@@@", -"++@@@@@@@@@@@@@ ", -" @@@@ ", -" @@@ ", -" @@ ", -" @ "}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/outArrow32x32.ico b/fdmdv2/tests/pa_enum/bitmaps/outArrow32x32.ico deleted file mode 100644 index 42f8e3a2..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/outArrow32x32.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/sample.ico b/fdmdv2/tests/pa_enum/bitmaps/sample.ico deleted file mode 100644 index 435cca24..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/sample.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/sample.xpm b/fdmdv2/tests/pa_enum/bitmaps/sample.xpm deleted file mode 100644 index 13c10c4c..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/sample.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static char *sample[] = { -"32 32 6 1 0 0", -" c #000000", -"! c #000080", -"# c #FFFFFF", -"$ c #FFFF00", -"% c #FF0000", -"& c None", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&& &&&&&&&&&&", -"&&&&&&&& !!!!!!!!!!!! &&&&&&&&&&", -"&&&&&&&& !!!!!!!!!!!! &&&&&&&&&&", -"&&&&&&&& !##!!!!!!!!! &&&&&&&&&&", -"&&&&&&&& !##!!!!!!!!! &&&&&&&&&&", -"&&&&&&&& !##!!!!!!!!! &&&&&&&&&&", -"&&&&&&&& !##!!!!!! ", -"&&&&&&&& !##!!!!!! $$$$$$$$$$$$ ", -" !##!!!!!! $$$$$$$$$$$$ ", -" %%%%%%% !##!!!!!! $##$$$$$$$$$ ", -" %%%%%%% !##!!!!!! $##$$$$$$$$$ ", -" %##%%%% !!!!!!!!! $##$$$$$$$$$ ", -" %##%%%% !!!!!!!!! $##$$$$$$$$$ ", -" %##%%%% $##$$$$$$$$$ ", -" %##%%%%%%%%% &&&& $##$$$$$$$$$ ", -" %##%%%%%%%%% &&&& $##$$$$$$$$$ ", -" %##%%%%%%%%% &&&& $##$$$$$$$$$ ", -" %##%%%%%%%%% &&&& $$$$$$$$$$$$ ", -" %##%%%%%%%%% &&&& $$$$$$$$$$$$ ", -" %%%%%%%%%%%% &&&& ", -" %%%%%%%%%%%% &&&&&&&&&&&&&&&&&&", -" &&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" -}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/sample2.xpm b/fdmdv2/tests/pa_enum/bitmaps/sample2.xpm deleted file mode 100644 index 5b8900f8..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/sample2.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static char *sample2[] = { -"32 32 6 1 0 0", -" c #000000", -"! c #000080", -"# c #FFFFFF", -"$ c #FFFF00", -"% c #FF0000", -"& c None", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&& &&&&&&&&&&", -"&&&&&&&& !!!!!!!!!!!! &&&&&&&&&&", -"&&&&&&&& !!!!!!!!!!!! &&&&&&&&&&", -"&&&&&&&& !##!!!!!!!!! &&&&&&&&&&", -"&&&&&&&& !##!!!!!!!!! &&&&&&&&&&", -"&&&&&&&& !##!!!!!!!!! &&&&&&&&&&", -"&&&&&&&& !##!!!!!! ", -"&&&&&&&& !##!!!!!! $$$$$$$$$$$$ ", -" !##!!!!!! $$$$$$$$$$$$ ", -" %%%%%%% !##!!!!!! $##$$$$$$$$$ ", -" %%%%%%% !##!!!!!! $##$$$$$$$$$ ", -" %##%%%% !!!!!!!!! $##$$$$$$$$$ ", -" %##%%%% !!!!!!!!! $##$$$$$$$$$ ", -" %##%%%% $##$$$$$$$$$ ", -" %##%%%%%%%%% &&&& $##$$$$$$$$$ ", -" %##%%%%%%%%% &&&& $##$$$$$$$$$ ", -" %##%%%%%%%%% &&&& $##$$$$$$$$$ ", -" %##%%%%%%%%% &&&& $$$$$$$$$$$$ ", -" %##%%%%%%%%% &&&& $$$$$$$$$$$$ ", -" %%%%%%%%%%%% &&&& ", -" %%%%%%%%%%%% &&&&&&&&&&&&&&&&&&", -" &&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", -"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" -}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/small1.ico b/fdmdv2/tests/pa_enum/bitmaps/small1.ico deleted file mode 100644 index 4cac633c..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/small1.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/small1.xpm b/fdmdv2/tests/pa_enum/bitmaps/small1.xpm deleted file mode 100644 index 650f1b1e..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/small1.xpm +++ /dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static const char *const small1_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 16 6 1", -". c Black", -"o c #FFFFFF", -"X c #000080", -"O c #FFFF00", -" c None", -"+ c #FF0000", -/* pixels */ -" ", -" ", -" ", -" ....... ", -" .XXXXX. ", -" .oXXXX. ", -" .oXXX.......", -".....oXXX.OOOOO.", -".+++.XXXX.oOOOO.", -".o++......oOOOO.", -".o++++. .oOOOO.", -".o++++. .OOOOO.", -".+++++. .......", -"....... ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/toolbrai.ico b/fdmdv2/tests/pa_enum/bitmaps/toolbrai.ico deleted file mode 100644 index 99069f7c..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/toolbrai.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/toolbrai.xpm b/fdmdv2/tests/pa_enum/bitmaps/toolbrai.xpm deleted file mode 100644 index 7dc20afc..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/toolbrai.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *const toolbrai_xpm[] = { -/* width height ncolors chars_per_pixel */ -"32 32 4 1", -/* colors */ -" s None c None", -". c #000080", -"+ c #ff0000", -"@ c #00ffff", -/* pixels */ -" ", -" ", -" ..... ", -" ..... .+++++. ", -" .+++++. .+++++. ", -" .+++++++. .+++++. ", -" .+++++. ..... ", -" ..... @ ", -" @ @ ", -" @ @ ", -" @ @ ", -" @ ..... ", -" ..+++++.. ", -" .+++++++++. ", -" .+++++++++. ", -" .+++++++++. ", -" @..+++++.. ", -" @ .....@ ", -" @ @ @ ", -" @ @ @ ...... ", -" @ @ @.++++++. ", -" @ @ .++++++. ", -" @ @ .++++++. ", -" ...... @ .++++++. ", -" .++++++. @ ...... ", -" .++++++. .... ", -" .++++++. .++++. ", -" .++++++. .++++. ", -" ...... .++++. ", -" .++++. ", -" .... ", -" "}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/toolchar.ico b/fdmdv2/tests/pa_enum/bitmaps/toolchar.ico deleted file mode 100644 index cec94e6b..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/toolchar.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/toolchar.xpm b/fdmdv2/tests/pa_enum/bitmaps/toolchar.xpm deleted file mode 100644 index 0f1ac793..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/toolchar.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *const toolchar_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 4 1", -". c Black", -"X c #FFFF00", -" c None", -"o c #C00000", -/* pixels */ -" ", -" ..... ", -" ...XXXXX... ", -" ..XXXXXXXXXXX.. ", -" .XXXXXXXXXXXXXXX. ", -" ..XXXXXXXXXXXXXXXXX.. ", -" .XXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXX.XXXXXXX.XXXXXX. ", -" .XXXXXX.X.XXXXX.X.XXXXXX. ", -" .XXXXX.XXX.XXX.XXX.XXXXXX. ", -" .XXXXX.XXXXXXXXXXXXX.XXXXX. ", -" .XXXXXXXX.XXXXXXX.XXXXXXXX. ", -" .XXXXXXXX.XXXXXXX.XXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXXXXXXXXX. ", -" .XXXXXXX.XXXXXXXXXXX.XXXXXXX. ", -" .XXXXXX...XXXXXXX...XXXXXX. ", -" .XXXXXX.oo..XXX..oo.XXXXXX. ", -" .XXXXXXX.ooo...ooo.XXXXXXX. ", -" .XXXXXXX.ooooooo.XXXXXXXX. ", -" .XXXXXXXX..ooo..XXXXXXXX. ", -" .XXXXXXXXX...XXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXXXX. ", -" ..XXXXXXXXXXXXXXXXX.. ", -" .XXXXXXXXXXXXXXX. ", -" ..XXXXXXXXXXX.. ", -" ...XXXXX... ", -" ..... ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/toolchec.ico b/fdmdv2/tests/pa_enum/bitmaps/toolchec.ico deleted file mode 100644 index 1989d57e..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/toolchec.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/toolchec.xpm b/fdmdv2/tests/pa_enum/bitmaps/toolchec.xpm deleted file mode 100644 index 90951a72..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/toolchec.xpm +++ /dev/null @@ -1,54 +0,0 @@ -/* XPM */ -static const char *const toolchec_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 16 1", -"X c Black", -". c #4B4B4B", -"% c #696969", -": c #353535", -"o c #181818", -"O c #CCCCCC", -"@ c #0B0B0B", -" c None", -"+ c #292929", -"= c #383838", -"; c #747474", -"# c #8B8B8B", -"& c #A9A9A9", -"- c #575757", -"* c #B2B2B2", -"$ c #959595", -/* pixels */ -" ", -" ", -" .XX ", -" oXXO ", -" .XX+ ", -" oXX@# ", -" oXX@ ", -" oXX# ", -" @XX$ ", -" oXX$ ", -" oXX. ", -" +XXX ", -" %XXX ", -" &XXX* ", -" .XXX= ", -" XXXo ", -" . @XXX ", -" -XXo +XXX. ", -" XXXXX; $XXXX ", -" .+XXXXX XXXX. ", -" +XXXX= XXXX= ", -" @XXXX *XXXX ", -" XXXX$XXXX$ ", -" +XXXXXXXX ", -" XXXXXXX. ", -" oXXXXX: ", -" ;XXXXX. ", -" XXXX# ", -" @XX ", -" = ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/tooldata.ico b/fdmdv2/tests/pa_enum/bitmaps/tooldata.ico deleted file mode 100644 index ed7ebbe5..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/tooldata.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/tooldata.xpm b/fdmdv2/tests/pa_enum/bitmaps/tooldata.xpm deleted file mode 100644 index d8f7d4c8..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/tooldata.xpm +++ /dev/null @@ -1,41 +0,0 @@ -/* XPM */ -static const char *const tooldata_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 3 1", -" c Black", -"X c #FFFFFF", -". c #C0C0C0", -/* pixels */ -" ", -" ", -" ............................ ", -" ............................ ", -" .. .. .. .. ", -" .. .. .. .. ", -" ............................ ", -" ............................ ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XX XX XX XX ", -" XX XX XX XX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XX XX XX XX ", -" XX XX XX XX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XX XX XX XX ", -" XX XX XX XX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XX XX XX XX ", -" XX XX XX XX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XX XX XX XX ", -" XX XX XX XX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" XXXXXXXXXXXXXXXXXXXXXXXXXXXX ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/toolgame.ico b/fdmdv2/tests/pa_enum/bitmaps/toolgame.ico deleted file mode 100644 index b3d6190b..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/toolgame.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/toolgame.xpm b/fdmdv2/tests/pa_enum/bitmaps/toolgame.xpm deleted file mode 100644 index 7488bd8c..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/toolgame.xpm +++ /dev/null @@ -1,41 +0,0 @@ -/* XPM */ -static const char *const toolgame_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 3 1", -"X c #808080", -" c None", -". c #FF0000", -/* pixels */ -" ", -" ", -" ", -" ", -" .. ", -" .... ", -" ...... ", -" ........ ", -" .......... ", -" ............ ", -" .............. ", -" ................ ", -" .................. ", -" .................... ", -" ...................... ", -" ........................ ", -" .......................... ", -" ........................X ", -" ......................X ", -" ....................X ", -" ..................X ", -" ................X ", -" ..............X ", -" ............X ", -" ..........X ", -" ........X ", -" ......X ", -" ....X ", -" ..X ", -" ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/toolnote.ico b/fdmdv2/tests/pa_enum/bitmaps/toolnote.ico deleted file mode 100644 index ff0ec28b..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/toolnote.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/toolnote.xpm b/fdmdv2/tests/pa_enum/bitmaps/toolnote.xpm deleted file mode 100644 index e86035cb..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/toolnote.xpm +++ /dev/null @@ -1,43 +0,0 @@ -/* XPM */ -static const char *const toolnote_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 5 1", -"O c Black", -"o c #FFFFFF", -". c #808080", -" c None", -"X c #C0C0C0", -/* pixels */ -" ", -" ", -" ", -" . . . . . ", -" XXX.XX.XX.XX.XX.XXX ", -" Xoo.oo.oo.oo.oo.ooX ", -" XoooooooooooooooooX. ", -" XooOOO..OOOO.OOOooX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XooOOOOOOoooooooooX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XooOOO.OOOOOOOooooX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XooOOOOOO.OOOoooooX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XooOO.OOOO.OOOOOooX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XooOOO.OOOOO.OOOOoX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XoooooooooooooooooX. ", -" XXXXXXXXXXXXXXXXXXX. ", -" .................. ", -" ", -" ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/tooltime.ico b/fdmdv2/tests/pa_enum/bitmaps/tooltime.ico deleted file mode 100644 index 141bcaa5..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/tooltime.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/tooltime.xpm b/fdmdv2/tests/pa_enum/bitmaps/tooltime.xpm deleted file mode 100644 index f75477d9..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/tooltime.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *const tooltime_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 4 1", -". c Black", -"o c #FFFFFF", -" c None", -"X c #C0C0C0", -/* pixels */ -" ", -" ", -" ", -" ", -" ..... ", -" ...XX.oo... ", -" .XXXoo.ooooo. ", -" ..Xoooooooooooo.. ", -" .Xoooooo.ooooooo. ", -" .Xooooooo.Xooooooo. ", -" .Xoooooooo.Xoooooooo. ", -" .Xoooooooo.Xoooooooo. ", -" .Xoooooooo.Xoooooooo. ", -" .Xooooooooo.Xooooooooo. ", -" .Xooooooooo.Xooooooooo.X ", -" ...oo.......Xooooooo...X ", -" .oooooXXXXXXXooooooooo.X ", -" .ooooooooooooooooooooo.X ", -" .ooooooooooooooooooo.XX ", -" .ooooooooooooooooooo.XX ", -" .ooooooooooooooooooo.X ", -" .ooooooooooooooooo.XX ", -" .ooooooooooooooo.XX ", -" ..ooooooooooooo..X ", -" .ooooo.ooooo.XX ", -" ...oo.oo...XX ", -" XX.....XXXX ", -" XXXXXXX ", -" ", -" ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/tooltodo.ico b/fdmdv2/tests/pa_enum/bitmaps/tooltodo.ico deleted file mode 100644 index 6b93a945..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/tooltodo.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/tooltodo.xpm b/fdmdv2/tests/pa_enum/bitmaps/tooltodo.xpm deleted file mode 100644 index 9ba1e31a..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/tooltodo.xpm +++ /dev/null @@ -1,194 +0,0 @@ -/* XPM */ -static const char *const tooltodo_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 156 2", -"0 c #A08020", -"+. c #D0C066", -"q c #A08022", -"T c #98752D", -"6. c #D0C072", -"w c #A88B28", -"@. c #987540", -"l c #A08037", -"~ c #A0803F", -"4. c #A08048", -"7 c #808080", -"m c #704012", -"P c #704013", -"] c #704014", -"B c #704016", -"{ c #704017", -":. c #704019", -"k c #70401B", -"A c #70401C", -"W c #70401D", -".. c #70401E", -"F c #70401F", -"1. c #704020", -"H c #704022", -"s c #EFEA37", -") c #704024", -"5. c #704025", -"} c #784B1E", -"z c #784B22", -"2. c #784B26", -"/ c #784B28", -"Y c #EFEA55", -"N c #E0D547", -"D c #EFEA6C", -"X. c #EFEA70", -"o. c #EFEA74", -"R c #E0D554", -"| c #E0D558", -"#. c #EFEA83", -"y c #E8E05D", -"3. c #E0D570", -"x c #E8E069", -"G c #BFAA57", -"J c #BFAA5D", -">. c #B0953D", -" c None", -"<. c #B8A04D", -"^ c #B8A052", -"X c #FFFF30", -"o c #FFFF34", -"O c #FFFF38", -"+ c #FFFF3C", -"b c #FFFF40", -"@ c #FFFF41", -"' c #FFFF43", -"n c #FFFF44", -"# c #FFFF45", -"*. c #FFFF47", -"L c #FFFF48", -"$ c #FFFF49", -"8. c #FFFF4B", -"M c #FFFF4C", -"V c #906B27", -"% c #FFFF4D", -"p. c #FFFF4F", -"I c #FFFF50", -"& c #FFFF51", -"a. c #FFFF53", -"U c #FFFF54", -"e c #FFFF55", -"* c #FFFF56", -"g. c #FFFF57", -"[ c #FFFF58", -"r c #FFFF59", -"= c #FFFF5A", -"l. c #FFFF5B", -". c #C0C0C0", -"-. c #FFFF5C", -"j c #FFFF5D", -"- c #FFFF5E", -"b. c #FFFF5F", -"9. c #FFFF60", -"C c #FFFF61", -"; c #FFFF62", -"n. c #FFFF63", -"0. c #FFFF64", -": c #FFFF66", -"N. c #FFFF67", -"s. c #FFFF68", -"E c #FFFF69", -"Z c #FFFF6A", -"> c #FFFF6B", -"h. c #FFFF6C", -" . c #FFFF6D", -"u c #FFFF6E", -", c #FFFF6F", -"z. c #FFFF70", -",. c #FFFF71", -"S c #FFFF72", -"< c #FFFF73", -"x. c #FFFF74", -"q. c #FFFF75", -"Q c #FFFF76", -"f c #602B0B", -"1 c #FFFF77", -"m. c #FFFF78", -"w. c #FFFF79", -"! c #FFFF7A", -"2 c #FFFF7B", -"B. c #FFFF7C", -"d. c #FFFF7D", -"e. c #FFFF7E", -"i c #FFFF7F", -"3 c #FFFF80", -"j. c #FFFF81", -"r. c #FFFF82", -"p c #FFFF83", -"4 c #FFFF84", -"c. c #FFFF85", -"k. c #FFFF86", -"c c #FFFF87", -"5 c #FFFF88", -"v. c #FFFF89", -"y. c #FFFF8A", -"( c #FFFF8B", -"6 c #FFFF8C", -"t. c #FFFF8D", -"u. c #FFFF8E", -"O. c #68361C", -"a c #FFFF90", -"V. c #FFFF91", -"f. c #FFFF92", -"$. c #68361F", -"_ c #FFFF93", -"v c #FFFF94", -"Z. c #FFFF95", -"M. c #FFFF96", -"%. c #FFFF97", -"K c #FFFF98", -"A. c #FFFF99", -"C. c #FFFF9A", -"7. c #FFFF9B", -"` c #FFFF9C", -"D. c #FFFF9D", -"S. c #FFFF9E", -"i. c #FFFF9F", -"&. c #FFFFA0", -"F. c #FFFFA1", -"8 c #D0C02A", -"d c #D0C030", -"g c #D0C036", -"h c #D0C03A", -";. c #C8B545", -"t c #C8B548", -"=. c #987527", -"9 c #A0801E", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" . . . . . . . . . . . . . . . . . . . . . . . . . ", -" . X o O + @ # $ % & * = - ; : > , < 1 2 3 4 5 6 . 7 ", -" . o 8 9 0 q w % & e r - ; t y u < 1 2 i p 5 6 a . 7 ", -" . O s d f g h & e r j ; : k l z x 2 i p c 6 a v . 7 ", -" . + b n m M & N B V C : Z A S D F i G H J a v K . 7 ", -" . b n L P I U B Y T R E u W Q ! ~ ^ / ( ) _ K ` . 7 ", -" . ' L M ] U [ { C } | .S ..X.o.O.+.@.#.$.%.` &.. 7 ", -" . *.M I =.[ -.;.:.>. .,.Q <.1.2.3.( 4.5.6.7.&.. . 7 ", -" . 8.I U [ -.9.0.E .,.q.w.e.r.t.y.u._ %.7.i.. . . 7 ", -" . p.a.[ -.9.0.s. .,.q.w.d.r.t.t.u.f.%.7.. . . o . 7 ", -" . a.g.-.9.0.s.h.,.q.w.d.j.k.y.t.. . . . . o o . 7 ", -" . g.l.9.0.s.h.z.x.w.d.j.c.v.u.f.. o o o o o . 7 ", -" . l.b.n.s.h.z.x.m.d.j.c.v.t.f.M.. o o o o . 7 ", -" . b.n.N.h.z.x.m.B.j.c.v.t.V.M.C.. o o o . 7 ", -" . n.N.> z.x.m.B.3 4 v.t.V.Z.A.S.. o o . 7 ", -" . N.> , < m.B.3 4 5 t.V.Z.A.D.. o o . 7 ", -" . > , < 1 B.3 4 5 6 V.Z.A.D.. . o . 7 ", -" . , < 1 2 3 4 5 6 a v A.D.F.. o . 7 ", -" . < 1 2 i p 5 6 a v K D.F.. o . 7 ", -" . . . . . . . . . . . . . . . 7 ", -" 7 7 7 7 7 7 7 7 7 7 7 7 7 7 ", -" ", -" ", -" ", -" ", -" " -}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/toolword.ico b/fdmdv2/tests/pa_enum/bitmaps/toolword.ico deleted file mode 100644 index a1a8838c..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/toolword.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/toolword.xpm b/fdmdv2/tests/pa_enum/bitmaps/toolword.xpm deleted file mode 100644 index b2e96a12..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/toolword.xpm +++ /dev/null @@ -1,41 +0,0 @@ -/* XPM */ -static const char *const toolword_xpm[] = { -/* width height ncolors chars_per_pixel */ -"32 32 3 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #ffffff", -/* pixels */ -" ", -" ", -" ........ ........ ", -" .++++++. ...........++++++. ", -" .++++++. .++++++++..++++++. ", -" ........ .++++++++......... ", -" .++++++++. ", -" .......... ", -" ", -" ", -" ", -" ..... ", -"...... ......... .+++. .........", -".++++. .+++++++. .+++. .+++++++.", -".++++. .+++++++. .+++. .+++++++.", -".++++. .+++++++. ..... .+++++++.", -"...... ......... .........", -" ", -" ", -" ", -" ", -" .......... ", -" .. .++++++++. ", -" .++. .++++++++. ", -" .++++. .++++++++. ", -" .++++. .......... ", -" ...........+++. ", -" .++++++++. .+. ", -" .++++++++. . ", -" .......... ", -" ", -" "}; diff --git a/fdmdv2/tests/pa_enum/bitmaps/transparent.ico b/fdmdv2/tests/pa_enum/bitmaps/transparent.ico deleted file mode 100644 index eeba3067..00000000 Binary files a/fdmdv2/tests/pa_enum/bitmaps/transparent.ico and /dev/null differ diff --git a/fdmdv2/tests/pa_enum/bitmaps/transparent.xpm b/fdmdv2/tests/pa_enum/bitmaps/transparent.xpm deleted file mode 100644 index 01f4737d..00000000 --- a/fdmdv2/tests/pa_enum/bitmaps/transparent.xpm +++ /dev/null @@ -1,36 +0,0 @@ -/* XPM */ -static char * transparent_xpm[] = { -"32 32 1 1", -" c None", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/fdmdv2/tests/pa_enum/gui.cpp b/fdmdv2/tests/pa_enum/gui.cpp deleted file mode 100644 index 4059e356..00000000 --- a/fdmdv2/tests/pa_enum/gui.cpp +++ /dev/null @@ -1,362 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 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 ); - 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('\t') + wxT("Alt+X"), wxEmptyString, wxITEM_NORMAL ); - m_menuFile->Append( menuFileExit ); - - m_menuBar->Append( m_menuFile, _("&File") ); - - tools = new wxMenu(); - wxMenuItem* audioOptions; - audioOptions = new wxMenuItem( tools, ID_AUDIO_OPTIONS, wxString( _("&Audio Options") ) , _("Audio options dialog."), wxITEM_NORMAL ); - tools->Append( audioOptions ); - - m_menuBar->Append( tools, _("&Tools") ); - - this->SetMenuBar( m_menuBar ); - - wxBoxSizer* mainSizer; - mainSizer = new wxBoxSizer( wxVERTICAL ); - - m_panel1 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - mainSizer->Add( m_panel1, 1, wxEXPAND | wxALL, 5 ); - - - this->SetSizer( mainSizer ); - this->Layout(); - m_statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY ); - - this->Centre( wxBOTH ); - this->Centre( wxBOTH ); - - // Connect Events - this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) ); - this->Connect( menuFileExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnExitClick ) ); - this->Connect( audioOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAudioOptsDialog ) ); -} - -MainFrameBase::~MainFrameBase() -{ - // Disconnect Events - this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) ); - this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnExitClick ) ); - this->Disconnect( ID_AUDIO_OPTIONS, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAudioOptsDialog ) ); -} - -/* -AudioOptsDialog::AudioOptsDialog( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( 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 ); - 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_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 ); - 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 ); - m_notebook1->AddPage( m_panelRx, _("Receive"), true ); - 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 ); - 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_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 ); - 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 ); - m_notebook1->AddPage( m_panelTx, _("Transmit"), false ); - 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 ); - m_sdbSizer1Apply = new wxButton( this, wxID_APPLY ); - m_sdbSizer1->AddButton( m_sdbSizer1Apply ); - 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( AudioOptsDialog::OnActivateApp ) ); -// this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AudioOptsDialog::OnCloseFrame ) ); - m_listCtrlRxInDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( AudioOptsDialog::OnRxInDeviceSelect ), NULL, this ); - m_listCtrlRxOutDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( AudioOptsDialog::OnRxOutDeviceSelect ), NULL, this ); - m_listCtrlTxInDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( AudioOptsDialog::OnTxInDeviceSelect ), NULL, this ); - m_listCtrlTxOutDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( AudioOptsDialog::OnTxOutDeviceSelect ), NULL, this ); - m_btnRefresh->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AudioOptsDialog::OnRefreshClick ), NULL, this ); - m_sdbSizer1Apply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AudioOptsDialog::OnApplyAudioParameters ), NULL, this ); - m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AudioOptsDialog::OnCancelAudioParameters ), NULL, this ); - m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AudioOptsDialog::OnOkAudioParameters ), NULL, this ); - // Connect Events - this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AudioOptsDialog::OnClose ) ); - this->Connect( wxEVT_HIBERNATE, wxActivateEventHandler( AudioOptsDialog::OnHibernate ) ); - this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( AudioOptsDialog::OnIconize ) ); - this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( AudioOptsDialog::OnInitDialog )); -} - -AudioOptsDialog::~AudioOptsDialog() -{ - // Disconnect Events - this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AudioOptsDialog::OnClose)); - this->Disconnect( wxEVT_HIBERNATE, wxActivateEventHandler( AudioOptsDialog::OnHibernate)); - this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( AudioOptsDialog::OnIconize)); - this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( AudioOptsDialog::OnInitDialog)); - - // Disconnect Events -// this->Disconnect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( AudioOptsDialog::OnActivateApp ) ); -// this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AudioOptsDialog::OnCloseFrame ) ); - m_listCtrlRxInDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( AudioOptsDialog::OnRxInDeviceSelect ), NULL, this ); - m_listCtrlRxOutDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( AudioOptsDialog::OnRxOutDeviceSelect ), NULL, this ); - m_listCtrlTxInDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( AudioOptsDialog::OnTxInDeviceSelect ), NULL, this ); - m_listCtrlTxOutDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( AudioOptsDialog::OnTxOutDeviceSelect ), NULL, this ); - m_btnRefresh->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AudioOptsDialog::OnRefreshClick ), NULL, this ); - m_sdbSizer1Apply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AudioOptsDialog::OnApplyAudioParameters ), NULL, this ); - m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AudioOptsDialog::OnCancelAudioParameters ), NULL, this ); - m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AudioOptsDialog::OnOkAudioParameters ), NULL, this ); - -} -*/ diff --git a/fdmdv2/tests/pa_enum/gui.fbp b/fdmdv2/tests/pa_enum/gui.fbp deleted file mode 100644 index 97f7182c..00000000 --- a/fdmdv2/tests/pa_enum/gui.fbp +++ /dev/null @@ -1,3385 +0,0 @@ - - - - - - C++|Python|XRC - 1 - source_name - 0 - 0 - res - UTF-8 - connect - gui - 1000 - none - 1 - PA_Enum - - . - - 1 - 1 - 1 - 0 - 0 - - 0 - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - MainFrameBase - - 690,400 - wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER - - PortAudio Device Enumeration - - - - wxTAB_TRAVERSAL - 1 - - OnActivateApp - - - - - - - - OnCloseFrame - - - - - - - - - - - - - - - - - - - - - - - - - - - - mainSizer - wxVERTICAL - none - - 1 - wxEXPAND | wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panel1 - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer4 - wxVERTICAL - none - - 0 - wxEXPAND | wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_notebook1 - 1 - - - protected - 1 - - Resizable - 1 - - wxNB_BOTTOM - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Receive - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelRx - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer20 - wxVERTICAL - none - - 1 - wxEXPAND - 1 - - 1 - 0 - - gSizer4 - none - 2 - 0 - - 5 - wxEXPAND - 1 - - wxID_ANY - Rx Radio Device - - sbSizer2 - wxVERTICAL - none - - - 1 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_listCtrlRxInDevices - 1 - - - protected - 1 - - Resizable - 1 - - wxLC_HRULES|wxLC_REPORT|wxLC_VRULES - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnRxInDeviceSelect - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - - bSizer811 - wxHORIZONTAL - 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 - Device: - - 0 - - - 0 - - 1 - m_staticText51 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrlRxIn - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - Sample Rate: - - 0 - - - 0 - - 1 - m_staticText6 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_cbSampleRateRxIn - 1 - - - protected - 1 - - Resizable - -1 - 1 - - wxCB_DROPDOWN - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxEXPAND - 1 - - wxID_ANY - Rx Speaker Stream - - sbSizer3 - wxVERTICAL - none - - - 1 - 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_listCtrlRxOutDevices - 1 - - - protected - 1 - - Resizable - 1 - - wxLC_HRULES|wxLC_REPORT|wxLC_VRULES - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnRxOutDeviceSelect - - - - - - - - - - - - - - - - - - 2 - wxEXPAND - 0 - - - bSizer81 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Device: - - 0 - - - 0 - - 1 - m_staticText9 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textRxOut - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - Sample Rate: - - 0 - - - 0 - - 1 - m_staticText10 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_cbSampleRateRxOut - 1 - - - protected - 1 - - Resizable - -1 - 1 - - wxCB_DROPDOWN - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Transmit - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelTx - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer18 - wxVERTICAL - none - - 1 - wxEXPAND - 1 - - 1 - 0 - - gSizer2 - none - 2 - 0 - - 5 - wxEXPAND - 1 - - wxID_ANY - Tx Microphone Stream - - sbSizer22 - wxVERTICAL - none - - - 1 - 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_listCtrlTxInDevices - 1 - - - protected - 1 - - Resizable - 1 - - wxLC_HRULES|wxLC_REPORT|wxLC_VRULES - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTxInDeviceSelect - - - - - - - - - - - - - - - - - - 2 - wxEXPAND - 0 - - - bSizer83 - wxHORIZONTAL - 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 - Device: - - 0 - - - 0 - - 1 - m_staticText12 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrlTxIn - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - Sample Rate: - - 0 - - - 0 - - 1 - m_staticText11 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_cbSampleRateTxIn - 1 - - - protected - 1 - - Resizable - -1 - 1 - - wxCB_DROPDOWN - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY - Tx Radio Stream - - sbSizer21 - wxVERTICAL - none - - - 2 - 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_listCtrlTxOutDevices - 1 - - - protected - 1 - - Resizable - 1 - - wxLC_HRULES|wxLC_REPORT|wxLC_VRULES - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTxOutDeviceSelect - - - - - - - - - - - - - - - - - - 2 - wxEXPAND - 0 - - - bSizer82 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Device: - - 0 - - - 0 - - 1 - m_staticText81 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrTxOut - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - Sample Rate: - - 0 - - - 0 - - 1 - m_staticText71 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_cbSampleRateTxOut - 1 - - - protected - 1 - - Resizable - -1 - 1 - - wxCB_DROPDOWN - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - API Info - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panelAPI - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer12 - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - 1 - 0 - - gSizer31 - none - 2 - 0 - - 2 - wxEXPAND - 1 - - wxID_ANY - PortAudio - - sbSizer1 - wxVERTICAL - none - - - 2 - wxEXPAND - 1 - - 2 - 0 - - gSizer3 - none - 4 - 0 - - 1 - wxALIGN_RIGHT|wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - PortAudio Version String: - - 0 - - - 0 - - 1 - m_staticText7 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxEXPAND - 1 - - - bSizer151 - wxVERTICAL - none - - 1 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textStringVer - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_READONLY - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - wxALIGN_RIGHT|wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - PortAudio Int Version: - - 0 - - - 0 - - 1 - m_staticText8 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizer13 - wxVERTICAL - none - - 1 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textIntVer - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_READONLY - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 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 - Device Count: - - 0 - - - 0 - - 1 - m_staticText5 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizer14 - wxVERTICAL - none - - 1 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - 45,-1 - 0 - - 0 - - 1 - m_textCDevCount - 1 - - - protected - 1 - - Resizable - 1 - 45,-1 - wxTE_READONLY - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 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 - API Count: - - 0 - - - 0 - - 1 - m_staticText4 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizer15 - wxVERTICAL - none - - 1 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - 45,-1 - 0 - - 0 - - 1 - m_textAPICount - 1 - - - protected - 1 - - Resizable - 1 - 45,-1 - wxTE_READONLY - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY - Other - - sbSizer6 - wxVERTICAL - none - - - - - - - - - - - - - - - 2 - wxEXPAND - 0 - - - bSizer6 - wxHORIZONTAL - none - - 2 - wxALIGN_CENTER|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Refresh - - 0 - - - 0 - - 1 - m_btnRefresh - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRefreshClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL - 1 - - 1 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - OnApplyAudioParameters - OnCancelAudioParameters - - - - OnOkAudioParameters - - - - - - - - - - diff --git a/fdmdv2/tests/pa_enum/gui.h b/fdmdv2/tests/pa_enum/gui.h deleted file mode 100644 index 7ab29552..00000000 --- a/fdmdv2/tests/pa_enum/gui.h +++ /dev/null @@ -1,62 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 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 -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// -#define ID_AUDIO_OPTIONS 1000 - -/////////////////////////////////////////////////////////////////////////////// -/// Class MainFrameBase -/////////////////////////////////////////////////////////////////////////////// -class MainFrameBase : public wxFrame -{ - private: - - protected: - wxMenuBar* m_menuBar; - wxMenu* m_menuFile; - wxMenu* tools; - wxPanel* m_panel1; - 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 OnAudioOptsDialog( 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( 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 deleted file mode 100644 index bb191f96..00000000 --- a/fdmdv2/tests/pa_enum/gui.py +++ /dev/null @@ -1,334 +0,0 @@ -# -*- coding: utf-8 -*- - -########################################################################### -## Python code generated with wxFormBuilder (version Apr 10 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 wx.Frame ): - - 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 ) - - self.m_panel1 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) - bSizer4 = wx.BoxSizer( wx.VERTICAL ) - - self.m_notebook1 = wx.Notebook( self.m_panel1, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.NB_BOTTOM ) - self.m_panelRx = wx.Panel( self.m_notebook1, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) - bSizer20 = wx.BoxSizer( wx.VERTICAL ) - - gSizer4 = wx.GridSizer( 2, 1, 0, 0 ) - - sbSizer2 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelRx, wx.ID_ANY, _(u"Rx Radio Device") ), wx.VERTICAL ) - - self.m_listCtrlRxInDevices = wx.ListCtrl( self.m_panelRx, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LC_HRULES|wx.LC_REPORT|wx.LC_VRULES ) - sbSizer2.Add( self.m_listCtrlRxInDevices, 1, wx.ALL|wx.EXPAND, 1 ) - - bSizer811 = wx.BoxSizer( wx.HORIZONTAL ) - - self.m_staticText51 = wx.StaticText( self.m_panelRx, wx.ID_ANY, _(u"Device:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText51.Wrap( -1 ) - bSizer811.Add( self.m_staticText51, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - self.m_textCtrlRxIn = wx.TextCtrl( self.m_panelRx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer811.Add( self.m_textCtrlRxIn, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 1 ) - - self.m_staticText6 = wx.StaticText( self.m_panelRx, wx.ID_ANY, _(u"Sample Rate:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText6.Wrap( -1 ) - bSizer811.Add( self.m_staticText6, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - m_cbSampleRateRxInChoices = [] - self.m_cbSampleRateRxIn = wx.ComboBox( self.m_panelRx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_cbSampleRateRxInChoices, wx.CB_DROPDOWN ) - bSizer811.Add( self.m_cbSampleRateRxIn, 0, wx.ALL, 1 ) - - - sbSizer2.Add( bSizer811, 0, wx.EXPAND, 5 ) - - - gSizer4.Add( sbSizer2, 1, wx.EXPAND, 5 ) - - sbSizer3 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelRx, wx.ID_ANY, _(u"Rx Speaker Stream") ), wx.VERTICAL ) - - self.m_listCtrlRxOutDevices = wx.ListCtrl( self.m_panelRx, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LC_HRULES|wx.LC_REPORT|wx.LC_VRULES ) - sbSizer3.Add( self.m_listCtrlRxOutDevices, 1, wx.ALL|wx.EXPAND, 1 ) - - bSizer81 = wx.BoxSizer( wx.HORIZONTAL ) - - self.m_staticText9 = wx.StaticText( self.m_panelRx, wx.ID_ANY, _(u"Device:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText9.Wrap( -1 ) - bSizer81.Add( self.m_staticText9, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - self.m_textRxOut = wx.TextCtrl( self.m_panelRx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer81.Add( self.m_textRxOut, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 1 ) - - self.m_staticText10 = wx.StaticText( self.m_panelRx, wx.ID_ANY, _(u"Sample Rate:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText10.Wrap( -1 ) - bSizer81.Add( self.m_staticText10, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - m_cbSampleRateRxOutChoices = [] - self.m_cbSampleRateRxOut = wx.ComboBox( self.m_panelRx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_cbSampleRateRxOutChoices, wx.CB_DROPDOWN ) - bSizer81.Add( self.m_cbSampleRateRxOut, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 1 ) - - - sbSizer3.Add( bSizer81, 0, wx.EXPAND, 2 ) - - - gSizer4.Add( sbSizer3, 1, wx.EXPAND, 2 ) - - - bSizer20.Add( gSizer4, 1, wx.EXPAND, 1 ) - - - self.m_panelRx.SetSizer( bSizer20 ) - self.m_panelRx.Layout() - bSizer20.Fit( self.m_panelRx ) - self.m_notebook1.AddPage( self.m_panelRx, _(u"Receive"), True ) - self.m_panelTx = wx.Panel( self.m_notebook1, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) - bSizer18 = wx.BoxSizer( wx.VERTICAL ) - - gSizer2 = wx.GridSizer( 2, 1, 0, 0 ) - - sbSizer22 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelTx, wx.ID_ANY, _(u"Tx Microphone Stream") ), wx.VERTICAL ) - - self.m_listCtrlTxInDevices = wx.ListCtrl( self.m_panelTx, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LC_HRULES|wx.LC_REPORT|wx.LC_VRULES ) - sbSizer22.Add( self.m_listCtrlTxInDevices, 1, wx.ALL|wx.EXPAND, 1 ) - - bSizer83 = wx.BoxSizer( wx.HORIZONTAL ) - - self.m_staticText12 = wx.StaticText( self.m_panelTx, wx.ID_ANY, _(u"Device:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText12.Wrap( -1 ) - bSizer83.Add( self.m_staticText12, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - self.m_textCtrlTxIn = wx.TextCtrl( self.m_panelTx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer83.Add( self.m_textCtrlTxIn, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 1 ) - - self.m_staticText11 = wx.StaticText( self.m_panelTx, wx.ID_ANY, _(u"Sample Rate:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText11.Wrap( -1 ) - bSizer83.Add( self.m_staticText11, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - m_cbSampleRateTxInChoices = [] - self.m_cbSampleRateTxIn = wx.ComboBox( self.m_panelTx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_cbSampleRateTxInChoices, wx.CB_DROPDOWN ) - bSizer83.Add( self.m_cbSampleRateTxIn, 0, wx.ALL, 1 ) - - - sbSizer22.Add( bSizer83, 0, wx.EXPAND, 2 ) - - - gSizer2.Add( sbSizer22, 1, wx.EXPAND, 5 ) - - sbSizer21 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelTx, wx.ID_ANY, _(u"Tx Radio Stream") ), wx.VERTICAL ) - - self.m_listCtrlTxOutDevices = wx.ListCtrl( self.m_panelTx, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LC_HRULES|wx.LC_REPORT|wx.LC_VRULES ) - sbSizer21.Add( self.m_listCtrlTxOutDevices, 1, wx.ALL|wx.EXPAND, 2 ) - - bSizer82 = wx.BoxSizer( wx.HORIZONTAL ) - - self.m_staticText81 = wx.StaticText( self.m_panelTx, wx.ID_ANY, _(u"Device:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText81.Wrap( -1 ) - bSizer82.Add( self.m_staticText81, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - - self.m_textCtrTxOut = wx.TextCtrl( self.m_panelTx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer82.Add( self.m_textCtrTxOut, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 1 ) - - self.m_staticText71 = wx.StaticText( self.m_panelTx, wx.ID_ANY, _(u"Sample Rate:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText71.Wrap( -1 ) - bSizer82.Add( self.m_staticText71, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - m_cbSampleRateTxOutChoices = [] - self.m_cbSampleRateTxOut = wx.ComboBox( self.m_panelTx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_cbSampleRateTxOutChoices, wx.CB_DROPDOWN ) - bSizer82.Add( self.m_cbSampleRateTxOut, 0, wx.ALL, 1 ) - - - sbSizer21.Add( bSizer82, 0, wx.EXPAND, 2 ) - - - gSizer2.Add( sbSizer21, 1, wx.EXPAND, 5 ) - - - bSizer18.Add( gSizer2, 1, wx.EXPAND, 1 ) - - - self.m_panelTx.SetSizer( bSizer18 ) - self.m_panelTx.Layout() - bSizer18.Fit( self.m_panelTx ) - self.m_notebook1.AddPage( self.m_panelTx, _(u"Transmit"), False ) - self.m_panelAPI = wx.Panel( self.m_notebook1, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) - bSizer12 = wx.BoxSizer( wx.HORIZONTAL ) - - gSizer31 = wx.GridSizer( 2, 1, 0, 0 ) - - sbSizer1 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelAPI, wx.ID_ANY, _(u"PortAudio") ), wx.VERTICAL ) - - gSizer3 = wx.GridSizer( 4, 2, 0, 0 ) - - self.m_staticText7 = wx.StaticText( self.m_panelAPI, wx.ID_ANY, _(u"PortAudio Version String:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText7.Wrap( -1 ) - gSizer3.Add( self.m_staticText7, 0, wx.ALIGN_RIGHT|wx.ALL|wx.ALIGN_CENTER_VERTICAL, 1 ) - - bSizer151 = wx.BoxSizer( wx.VERTICAL ) - - self.m_textStringVer = wx.TextCtrl( self.m_panelAPI, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.TE_READONLY ) - bSizer151.Add( self.m_textStringVer, 0, wx.ALL|wx.EXPAND, 1 ) - - - gSizer3.Add( bSizer151, 1, wx.EXPAND, 2 ) - - self.m_staticText8 = wx.StaticText( self.m_panelAPI, wx.ID_ANY, _(u"PortAudio Int Version:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText8.Wrap( -1 ) - gSizer3.Add( self.m_staticText8, 0, wx.ALIGN_RIGHT|wx.ALL|wx.ALIGN_CENTER_VERTICAL, 1 ) - - bSizer13 = wx.BoxSizer( wx.VERTICAL ) - - self.m_textIntVer = wx.TextCtrl( self.m_panelAPI, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.TE_READONLY ) - bSizer13.Add( self.m_textIntVer, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 1 ) - - - gSizer3.Add( bSizer13, 1, wx.EXPAND, 5 ) - - self.m_staticText5 = wx.StaticText( self.m_panelAPI, wx.ID_ANY, _(u"Device Count:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText5.Wrap( -1 ) - gSizer3.Add( self.m_staticText5, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 1 ) - - bSizer14 = wx.BoxSizer( wx.VERTICAL ) - - self.m_textCDevCount = wx.TextCtrl( self.m_panelAPI, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.Size( 45,-1 ), wx.TE_READONLY ) - self.m_textCDevCount.SetMaxSize( wx.Size( 45,-1 ) ) - - bSizer14.Add( self.m_textCDevCount, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 1 ) - - - gSizer3.Add( bSizer14, 1, wx.EXPAND, 5 ) - - self.m_staticText4 = wx.StaticText( self.m_panelAPI, wx.ID_ANY, _(u"API Count:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText4.Wrap( -1 ) - gSizer3.Add( self.m_staticText4, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 1 ) - - bSizer15 = wx.BoxSizer( wx.VERTICAL ) - - self.m_textAPICount = wx.TextCtrl( self.m_panelAPI, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.Size( 45,-1 ), wx.TE_READONLY ) - self.m_textAPICount.SetMaxSize( wx.Size( 45,-1 ) ) - - bSizer15.Add( self.m_textAPICount, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 1 ) - - - gSizer3.Add( bSizer15, 1, wx.EXPAND, 5 ) - - - sbSizer1.Add( gSizer3, 1, wx.EXPAND, 2 ) - - - gSizer31.Add( sbSizer1, 1, wx.EXPAND, 2 ) - - sbSizer6 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelAPI, wx.ID_ANY, _(u"Other") ), wx.VERTICAL ) - - - gSizer31.Add( sbSizer6, 1, wx.EXPAND, 5 ) - - - bSizer12.Add( gSizer31, 1, wx.EXPAND, 5 ) - - - self.m_panelAPI.SetSizer( bSizer12 ) - self.m_panelAPI.Layout() - bSizer12.Fit( self.m_panelAPI ) - self.m_notebook1.AddPage( self.m_panelAPI, _(u"API Info"), False ) - - bSizer4.Add( self.m_notebook1, 1, wx.EXPAND |wx.ALL, 0 ) - - - self.m_panel1.SetSizer( bSizer4 ) - self.m_panel1.Layout() - bSizer4.Fit( self.m_panel1 ) - mainSizer.Add( self.m_panel1, 1, wx.EXPAND |wx.ALL, 1 ) - - bSizer6 = wx.BoxSizer( wx.HORIZONTAL ) - - self.m_btnRefresh = wx.Button( self, wx.ID_ANY, _(u"Refresh"), wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer6.Add( self.m_btnRefresh, 0, wx.ALIGN_CENTER|wx.ALL, 2 ) - - m_sdbSizer1 = wx.StdDialogButtonSizer() - self.m_sdbSizer1OK = wx.Button( self, wx.ID_OK ) - m_sdbSizer1.AddButton( self.m_sdbSizer1OK ) - self.m_sdbSizer1Apply = wx.Button( self, wx.ID_APPLY ) - m_sdbSizer1.AddButton( self.m_sdbSizer1Apply ) - self.m_sdbSizer1Cancel = wx.Button( self, wx.ID_CANCEL ) - m_sdbSizer1.AddButton( self.m_sdbSizer1Cancel ) - m_sdbSizer1.Realize(); - - bSizer6.Add( m_sdbSizer1, 1, wx.ALIGN_CENTER_VERTICAL, 2 ) - - - mainSizer.Add( bSizer6, 0, wx.EXPAND, 2 ) - - - 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_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 ) - self.m_listCtrlTxOutDevices.Bind( wx.EVT_LIST_ITEM_SELECTED, self.OnTxOutDeviceSelect ) - self.m_btnRefresh.Bind( wx.EVT_BUTTON, self.OnRefreshClick ) - self.m_sdbSizer1Apply.Bind( wx.EVT_BUTTON, self.OnApplyAudioParameters ) - self.m_sdbSizer1Cancel.Bind( wx.EVT_BUTTON, self.OnCancelAudioParameters ) - self.m_sdbSizer1OK.Bind( wx.EVT_BUTTON, self.OnOkAudioParameters ) - - def __del__( self ): - pass - - - # Virtual event handlers, overide them in your derived class - def OnActivateApp( self, event ): - event.Skip() - - def OnCloseFrame( self, event ): - event.Skip() - - def OnRxInDeviceSelect( self, event ): - event.Skip() - - def OnRxOutDeviceSelect( self, event ): - event.Skip() - - def OnTxInDeviceSelect( self, event ): - event.Skip() - - def OnTxOutDeviceSelect( self, event ): - event.Skip() - - def OnRefreshClick( self, event ): - event.Skip() - - def OnApplyAudioParameters( self, event ): - event.Skip() - - def OnCancelAudioParameters( self, event ): - event.Skip() - - def OnOkAudioParameters( self, event ): - event.Skip() - - diff --git a/fdmdv2/tests/pa_enum/gui.xrc b/fdmdv2/tests/pa_enum/gui.xrc deleted file mode 100644 index 19cf18c9..00000000 --- a/fdmdv2/tests/pa_enum/gui.xrc +++ /dev/null @@ -1,527 +0,0 @@ - - - - - 690,400 - PortAudio Device Enumeration - 1 - 0 - - wxVERTICAL - - - wxEXPAND | wxALL - 1 - - - - wxVERTICAL - - - wxEXPAND | wxALL - 0 - - - - - 1 - - - - wxVERTICAL - - - wxEXPAND - 1 - - 2 - 1 - 0 - 0 - - - wxEXPAND - 5 - - wxVERTICAL - - - - wxALL|wxEXPAND - 1 - - - - - - - wxEXPAND - 5 - - wxHORIZONTAL - - - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 5 - - - -1 - - - - - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - - 0 - - - - - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 5 - - - -1 - - - - - wxALL - 1 - - - - - - - - - - - - - wxEXPAND - 2 - - wxVERTICAL - - - - wxALL|wxEXPAND - 1 - - - - - - - wxEXPAND - 2 - - wxHORIZONTAL - - - wxALIGN_CENTER_VERTICAL|wxALL - 5 - - - -1 - - - - - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - - 0 - - - - - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 5 - - - -1 - - - - - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - - - - - - - - - - - - - - - - - 0 - - - - wxVERTICAL - - - wxEXPAND - 1 - - 2 - 1 - 0 - 0 - - - wxEXPAND - 5 - - wxVERTICAL - - - - wxALL|wxEXPAND - 1 - - - - - - - wxEXPAND - 2 - - wxHORIZONTAL - - - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 5 - - - -1 - - - - - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - - 0 - - - - - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 5 - - - -1 - - - - - wxALL - 1 - - - - - - - - - - - - - wxEXPAND - 5 - - wxVERTICAL - - - - wxALL|wxEXPAND - 2 - - - - - - - wxEXPAND - 2 - - wxHORIZONTAL - - - wxALIGN_CENTER_VERTICAL|wxALL - 5 - - - -1 - - - - - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - - 0 - - - - - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 5 - - - -1 - - - - - wxALL - 1 - - - - - - - - - - - - - - - - - - 0 - - - - wxHORIZONTAL - - - wxEXPAND - 5 - - 2 - 1 - 0 - 0 - - - wxEXPAND - 2 - - wxVERTICAL - - - - wxEXPAND - 2 - - 4 - 2 - 0 - 0 - - - wxALIGN_RIGHT|wxALL|wxALIGN_CENTER_VERTICAL - 1 - - - -1 - - - - - wxEXPAND - 2 - - wxVERTICAL - - - wxALL|wxEXPAND - 1 - - - - 0 - - - - - - - wxALIGN_RIGHT|wxALL|wxALIGN_CENTER_VERTICAL - 1 - - - -1 - - - - - wxEXPAND - 5 - - wxVERTICAL - - - wxALL|wxALIGN_CENTER_VERTICAL - 1 - - - - 0 - - - - - - - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 1 - - - -1 - - - - - wxEXPAND - 5 - - wxVERTICAL - - - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - - 45,-1 - - 0 - - - - - - - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL - 1 - - - -1 - - - - - wxEXPAND - 5 - - wxVERTICAL - - - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - - 45,-1 - - 0 - - - - - - - - - - - wxEXPAND - 5 - - wxVERTICAL - - - - - - - - - - - - - - - - wxEXPAND - 2 - - wxHORIZONTAL - - - wxALIGN_CENTER|wxALL - 2 - - - 0 - - - - - wxALIGN_CENTER_VERTICAL - 2 - - - wxALIGN_CENTER_HORIZONTAL|wxALL - 5 - - - - - - wxALIGN_CENTER_HORIZONTAL|wxALL - 5 - - - - - - wxALIGN_CENTER_HORIZONTAL|wxALL - 5 - - - - - - - - - - - diff --git a/fdmdv2/tests/pa_enum/main.cpp b/fdmdv2/tests/pa_enum/main.cpp deleted file mode 100644 index f4ce742b..00000000 --- a/fdmdv2/tests/pa_enum/main.cpp +++ /dev/null @@ -1,130 +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" -#include "AudioOptsDialog.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; -} - -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -// class MainFrame() -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent) -{ - wxInitAllImageHandlers(); - wxConfigBase *pConfig = wxConfigBase::Get(); - - // restore frame position and size -// int x = pConfig->Read(wxT("/MainFrame/top"), 50); -// int y = pConfig->Read(wxT("/MainFrame/left"), 50); -// int w = pConfig->Read(wxT("/MainFrame/width"), 650); -// int h = pConfig->Read(wxT("/MainFrame/height"), 400); -// wxGetApp().m_show_wf = pConfig->Read(wxT("/MainFrame/show_wf"), 1); -// wxGetApp().m_show_spect = pConfig->Read(wxT("/MainFrame/show_spect"), 1); -// wxGetApp().m_show_scatter = pConfig->Read(wxT("/MainFrame/show_scatter"), 1); -// wxGetApp().m_show_timing = pConfig->Read(wxT("/MainFrame/show_timing"), 1); -// wxGetApp().m_show_freq = pConfig->Read(wxT("/MainFrame/show_freq"), 1); - - wxGetApp().m_strRxInAudio = pConfig->Read(wxT("/Audio/RxIn"), wxT("")); - wxGetApp().m_strRxOutAudio = pConfig->Read(wxT("/Audio/RxOut"), wxT("")); - wxGetApp().m_textVoiceInput = pConfig->Read(wxT("/Audio/TxIn"), wxT("")); - wxGetApp().m_textVoiceOutput = pConfig->Read(wxT("/Audio/TxOut"), wxT("")); - wxGetApp().m_strSampleRate = pConfig->Read(wxT("/Audio/SampleRate"), wxT("48000")); - -// wxGetApp().m_strRigCtrlPort = pConfig->Read("/Rig/Port", wxT("\\\\.\\com1")); -// wxGetApp().m_strRigCtrlBaud = pConfig->Read("/Rig/Baud", wxT("9600")); -// wxGetApp().m_strRigCtrlDatabits = pConfig->Read("/Rig/DataBits", wxT("8")); -// wxGetApp().m_strRigCtrlStopbits = pConfig->Read("/Rig/StopBits", wxT("1")); -// wxGetApp().m_strRigCtrlParity = pConfig->Read("/Rig/Parity", wxT("n")); - - pConfig->SetPath(wxT("/")); - - this->Connect(ID_AUDIO_OPTIONS, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnAudioOptsDialog)); -} - -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -// ~MainFrame() -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -MainFrame::~MainFrame() -{ - this->Disconnect(ID_AUDIO_OPTIONS, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnAudioOptsDialog)); - wxConfigBase *pConfig = wxConfigBase::Get(); - if(pConfig) - { -// GetClientSize(&w, &h); -// GetPosition(&x, &y); -// pConfig->Write(wxT("/MainFrame/top"), (long) x); -// pConfig->Write(wxT("/MainFrame/left"), (long) y); -// pConfig->Write(wxT("/MainFrame/width"), (long) w); -// pConfig->Write(wxT("/MainFrame/height"), (long) h); -// pConfig->Write(wxT("/MainFrame/show_wf"), wxGetApp().m_show_wf); -// pConfig->Write(wxT("/MainFrame/show_spect"), wxGetApp().m_show_spect); -// pConfig->Write(wxT("/MainFrame/show_scatter"), wxGetApp().m_show_scatter); -// pConfig->Write(wxT("/MainFrame/show_timing"), wxGetApp().m_show_timing); -// pConfig->Write(wxT("/MainFrame/show_freq"), wxGetApp().m_show_freq); - - pConfig->Write(wxT("/Audio/RxIn"), wxGetApp().m_strRxInAudio); - pConfig->Write(wxT("/Audio/RxOut"), wxGetApp().m_strRxOutAudio); - pConfig->Write(wxT("/Audio/TxIn"), wxGetApp().m_textVoiceInput); - pConfig->Write(wxT("/Audio/TxOut"), wxGetApp().m_textVoiceOutput); - pConfig->Write(wxT("/Audio/SampleRate"), wxGetApp().m_strSampleRate); - -// pConfig->Write(wxT("/Rig/Port"), wxGetApp().m_strRigCtrlPort); -// pConfig->Write(wxT("/Rig/Baud"), wxGetApp().m_strRigCtrlBaud); -// pConfig->Write(wxT("/Rig/DataBits"), wxGetApp().m_strRigCtrlDatabits); -// pConfig->Write(wxT("/Rig/StopBits"), wxGetApp().m_strRigCtrlStopbits); -// pConfig->Write(wxT("/Rig/Parity"), wxGetApp().m_strRigCtrlParity); - } -} - -//------------------------------------------------------------------------- -// OnToolsAudioUI() -//------------------------------------------------------------------------- -void MainFrame::OnCloseFrame(wxCloseEvent& event) -{ - Destroy(); -} - -//------------------------------------------------------------------------- -// OnToolsAudioUI() -//------------------------------------------------------------------------- -void MainFrame::OnExitClick(wxCommandEvent& event) -{ - Destroy(); -} - -//------------------------------------------------------------------------- -// OnToolsAudioUI() -//------------------------------------------------------------------------- -void MainFrame::OnAudioOptsDialog(wxCommandEvent& event) -{ - int rv = 0; - AudioOptsDialog *dlg = new AudioOptsDialog(NULL); - rv = dlg->ShowModal(); - if(rv == wxOK) - { -// dlg->ExchangeData(EXCHANGE_DATA_OUT); - } - dlg->Destroy();; -} - diff --git a/fdmdv2/tests/pa_enum/main.h b/fdmdv2/tests/pa_enum/main.h deleted file mode 100644 index 48b6809f..00000000 --- a/fdmdv2/tests/pa_enum/main.h +++ /dev/null @@ -1,79 +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 -#include -#include "wx/config.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "gui.h" - -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -// application class declaration -//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-= -class MainApp : public wxApp -{ - public: - virtual bool OnInit(); - wxString m_strRxInAudio; - wxString m_strRxOutAudio; - wxString m_textVoiceInput; - wxString m_textVoiceOutput; - wxString m_strSampleRate; - wxString m_strBitrate; -}; - -// 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 OnAudioOptsDialog( wxCommandEvent& event ); -}; - -#endif //__main__ diff --git a/fdmdv2/tests/pa_enum/pa_enum.mk b/fdmdv2/tests/pa_enum/pa_enum.mk deleted file mode 100644 index 75e43034..00000000 --- a/fdmdv2/tests/pa_enum/pa_enum.mk +++ /dev/null @@ -1,133 +0,0 @@ -## -## Auto Generated makefile by CodeLite IDE -## any manual changes will be erased -## -## Release -ProjectName :=pa_enum -ConfigurationName :=Release -WorkspacePath := "D:\Projects\Radio\fdmdv2\build" -ProjectPath := "D:\Projects\Radio\fdmdv2\tests\pa_enum" -IntermediateDirectory :=./Release -OutDir := $(IntermediateDirectory) -CurrentFileName := -CurrentFilePath := -CurrentFileFullPath := -User :=wittend -Date :=12/10/2012 -CodeLitePath :="D:\bin\CodeLite" -LinkerName :=g++ -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 -OutputFile :=$(IntermediateDirectory)/$(ProjectName) -Preprocessors :=$(PreprocessorSwitch)__WX__ -ObjectSwitch :=-o -ArchiveOutputSwitch := -PreprocessOnlySwitch :=-E -ObjectsFileList :="D:\Projects\Radio\fdmdv2\tests\pa_enum\pa_enum.txt" -PCHCompileFlags := -MakeDirCommand :=makedir -RcCmpOptions := $(shell wx-config --rcflags) -RcCompilerName :=windres -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/ -IncludePCH := -RcIncludePath := -Libs := $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp -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 := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"1128\" $(Preprocessors) -CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"1128\" $(Preprocessors) - - -## -## User defined environment variables -## -CodeLiteDir:=D:\bin\CodeLite -WXWIN:=D:\bin\wxWidgets-2.9.4 -PATH:=$(WXWIN)\lib\gcc_dll;$(PATH) -WXCFG:=gcc_dll\mswu -UNIT_TEST_PP_SRC_DIR:=D:\bin\UnitTest++-1.3 -Objects=$(IntermediateDirectory)/gui$(ObjectSuffix) $(IntermediateDirectory)/main$(ObjectSuffix) $(IntermediateDirectory)/AudioOptsDialog$(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) - $(CXX) $(IncludePCH) $(SourceSwitch) "D:/Projects/Radio/fdmdv2/tests/pa_enum/gui.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/gui$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/gui$(DependSuffix): gui.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/gui$(ObjectSuffix) -MF$(IntermediateDirectory)/gui$(DependSuffix) -MM "D:/Projects/Radio/fdmdv2/tests/pa_enum/gui.cpp" - -$(IntermediateDirectory)/gui$(PreprocessSuffix): gui.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/gui$(PreprocessSuffix) "D:/Projects/Radio/fdmdv2/tests/pa_enum/gui.cpp" - -$(IntermediateDirectory)/main$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "D:/Projects/Radio/fdmdv2/tests/pa_enum/main.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/main$(DependSuffix): main.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main$(ObjectSuffix) -MF$(IntermediateDirectory)/main$(DependSuffix) -MM "D:/Projects/Radio/fdmdv2/tests/pa_enum/main.cpp" - -$(IntermediateDirectory)/main$(PreprocessSuffix): main.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main$(PreprocessSuffix) "D:/Projects/Radio/fdmdv2/tests/pa_enum/main.cpp" - -$(IntermediateDirectory)/AudioOptsDialog$(ObjectSuffix): AudioOptsDialog.cpp $(IntermediateDirectory)/AudioOptsDialog$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "D:/Projects/Radio/fdmdv2/tests/pa_enum/AudioOptsDialog.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/AudioOptsDialog$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/AudioOptsDialog$(DependSuffix): AudioOptsDialog.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/AudioOptsDialog$(ObjectSuffix) -MF$(IntermediateDirectory)/AudioOptsDialog$(DependSuffix) -MM "D:/Projects/Radio/fdmdv2/tests/pa_enum/AudioOptsDialog.cpp" - -$(IntermediateDirectory)/AudioOptsDialog$(PreprocessSuffix): AudioOptsDialog.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/AudioOptsDialog$(PreprocessSuffix) "D:/Projects/Radio/fdmdv2/tests/pa_enum/AudioOptsDialog.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) $(IntermediateDirectory)/AudioOptsDialog$(ObjectSuffix) - $(RM) $(IntermediateDirectory)/AudioOptsDialog$(DependSuffix) - $(RM) $(IntermediateDirectory)/AudioOptsDialog$(PreprocessSuffix) - $(RM) $(OutputFile) - $(RM) $(OutputFile).exe - $(RM) "D:\Projects\Radio\fdmdv2\build\.build-release\pa_enum" - - diff --git a/fdmdv2/tests/pa_enum/pa_enum.project b/fdmdv2/tests/pa_enum/pa_enum.project deleted file mode 100644 index f7e11fc1..00000000 --- a/fdmdv2/tests/pa_enum/pa_enum.project +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - diff --git a/fdmdv2/tests/pa_enum/pa_enum.txt b/fdmdv2/tests/pa_enum/pa_enum.txt deleted file mode 100644 index f7a90027..00000000 --- a/fdmdv2/tests/pa_enum/pa_enum.txt +++ /dev/null @@ -1 +0,0 @@ -./Release/gui.o ./Release/main.o ./Release/AudioOptsDialog.o diff --git a/fdmdv2/tests/pa_test/Debug/pa_test.exe b/fdmdv2/tests/pa_test/Debug/pa_test.exe deleted file mode 100644 index 70ca4075..00000000 Binary files a/fdmdv2/tests/pa_test/Debug/pa_test.exe and /dev/null differ diff --git a/fdmdv2/tests/pa_test/Debug/portaudio.dll b/fdmdv2/tests/pa_test/Debug/portaudio.dll deleted file mode 100644 index 9b292864..00000000 Binary files a/fdmdv2/tests/pa_test/Debug/portaudio.dll and /dev/null differ diff --git a/fdmdv2/tests/pa_test/Release/portaudio.dll b/fdmdv2/tests/pa_test/Release/portaudio.dll deleted file mode 100644 index 9b292864..00000000 Binary files a/fdmdv2/tests/pa_test/Release/portaudio.dll and /dev/null differ diff --git a/fdmdv2/tests/pa_test/devs.cxx b/fdmdv2/tests/pa_test/devs.cxx deleted file mode 100644 index 31a560f8..00000000 --- a/fdmdv2/tests/pa_test/devs.cxx +++ /dev/null @@ -1,177 +0,0 @@ -#include -#include "portaudiocpp/PortAudioCpp.hxx" - -#ifdef WIN32 -#include "portaudiocpp/AsioDeviceAdapter.hxx" -#endif - -// --------------------------------------------------------------------------------------- - -void printSupportedStandardSampleRates( - 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, -1 }; // negative terminated list - - int printCount = 0; - - 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()) - { - if (printCount == 0) - { - std::cout << " " << STANDARD_SAMPLE_RATES[i]; // 8.2 - printCount = 1; - } - else if (printCount == 4) - { - std::cout << "," << std::endl; - std::cout << " " << STANDARD_SAMPLE_RATES[i]; // 8.2 - printCount = 1; - } - else - { - std::cout << ", " << STANDARD_SAMPLE_RATES[i]; // 8.2 - ++printCount; - } - } - } - - if (printCount == 0) - std::cout << "None" << std::endl; - else - std::cout << std::endl; -} - -// --------------------------------------------------------------------------------------- - -int main(int, char*[]); -int main(int, char*[]) -{ - try - { - portaudio::AutoSystem autoSys; - - portaudio::System &sys = portaudio::System::instance(); - - std::cout << "PortAudio version number = " << sys.version() << std::endl; - std::cout << "PortAudio version text = '" << sys.versionText() << "'" << std::endl; - - int numDevices = sys.deviceCount(); - std::cout << "Number of devices = " << numDevices << std::endl; - - for (portaudio::System::DeviceIterator i = sys.devicesBegin(); i != sys.devicesEnd(); ++i) - { - std::cout << "--------------------------------------- device #" << (*i).index() << std::endl; - - // Mark global and API specific default devices: - bool defaultDisplayed = false; - - if ((*i).isSystemDefaultInputDevice()) - { - std::cout << "[ Default Input"; - defaultDisplayed = true; - } - else if ((*i).isHostApiDefaultInputDevice()) - { - std::cout << "[ Default " << (*i).hostApi().name() << " Input"; - defaultDisplayed = true; - } - - if ((*i).isSystemDefaultOutputDevice()) - { - std::cout << (defaultDisplayed ? "," : "["); - std::cout << " Default Output"; - defaultDisplayed = true; - } - else if ((*i).isHostApiDefaultOutputDevice()) - { - std::cout << (defaultDisplayed ? "," : "["); - std::cout << " Default " << (*i).hostApi().name() << " Output"; - defaultDisplayed = true; - } - - if (defaultDisplayed) - std::cout << " ]" << std::endl; - - // Print device info: - std::cout << "Name = " << (*i).name() << std::endl; - std::cout << "Host API = " << (*i).hostApi().name() << std::endl; - std::cout << "Max inputs = " << (*i).maxInputChannels() << ", Max outputs = " << (*i).maxOutputChannels() << std::endl; - - std::cout << "Default low input latency = " << (*i).defaultLowInputLatency() << std::endl; // 8.3 - std::cout << "Default low output latency = " << (*i).defaultLowOutputLatency() << std::endl; // 8.3 - 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 - // 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 - - std::cout << "Default sample rate = " << (*i).defaultSampleRate() << std::endl; // 8.2 - - // 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) - { - std::cout << "Supported standard sample rates" << std::endl; - std::cout << " for half-duplex 16 bit " << inputParameters.numChannels() << " channel input = " << std::endl; - printSupportedStandardSampleRates(inputParameters, portaudio::DirectionSpecificStreamParameters::null()); - } - - if (outputParameters.numChannels() > 0) - { - std::cout << "Supported standard sample rates" << std::endl; - std::cout << " for half-duplex 16 bit " << outputParameters.numChannels() << " channel output = " << std::endl; - printSupportedStandardSampleRates(portaudio::DirectionSpecificStreamParameters::null(), outputParameters); - } - - if (inputParameters.numChannels() > 0 && outputParameters.numChannels() > 0) - { - std::cout << "Supported standard sample rates" << std::endl; - std::cout << " for full-duplex 16 bit " << inputParameters.numChannels() << " channel input, " << outputParameters.numChannels() << " channel output = " << std::endl; - printSupportedStandardSampleRates(inputParameters, outputParameters); - } - } - - std::cout << "----------------------------------------------" << std::endl; - } - catch (const portaudio::PaException &e) - { - std::cout << "A PortAudio error occured: " << e.paErrorText() << std::endl; - } - catch (const portaudio::PaCppException &e) - { - std::cout << "A PortAudioCpp error occured: " << e.what() << std::endl; - } - catch (const std::exception &e) - { - std::cout << "A generic exception occured: " << e.what() << std::endl; - } - catch (...) - { - std::cout << "An unknown exception occured." << std::endl; - } - - return 0; -} diff --git a/fdmdv2/tests/pa_test/pa_class.cpp b/fdmdv2/tests/pa_test/pa_class.cpp deleted file mode 100644 index 1a815869..00000000 --- a/fdmdv2/tests/pa_test/pa_class.cpp +++ /dev/null @@ -1,370 +0,0 @@ -#include "pa_class.h" - -PortAudioWrap::PortAudioWrap() -{ - stream = NULL; -// inputBuffer = 0; -// outputBuffer = NULL; - inputDevice = paNoDevice; - outputDevice = paNoDevice; - userData = NULL; - samplerate = 0; - framesPerBuffer = 0; - statusFlags = 0; - streamCallback = NULL; - streamFinishedCallback = NULL; - timeInfo = 0; -} - -PortAudioWrap::~PortAudioWrap() -{ -} - -PaError PortAudioWrap::init() -{ - return Pa_Initialize(); -} - -PaError PortAudioWrap::streamOpen() -{ - return Pa_OpenStream( - &stream, - &inputBuffer, - &outputBuffer, - samplerate, - framesPerBuffer, - statusFlags, - *streamCallback, - userData - ); -} - -PaError PortAudioWrap::streamStart() -{ - return Pa_StartStream(this->stream); -} - -PaError PortAudioWrap::streamClose() -{ - if (isOpen()) - { - return Pa_CloseStream(this->stream); - } - else - { - return 1; - } -} - -void PortAudioWrap::terminate() -{ - Pa_Terminate(); -} - -void PortAudioWrap::stop() -{ - Pa_StopStream(stream); -} - -void PortAudioWrap::abort() -{ - Pa_AbortStream(stream); -} - -bool PortAudioWrap::isStopped() const -{ - PaError ret = Pa_IsStreamStopped(stream); - return ret; -} - -bool PortAudioWrap::isActive() const -{ - PaError ret = Pa_IsStreamActive(stream); - return ret; -} - -bool PortAudioWrap::isOpen() const -{ - return (stream != NULL); -} - -PaDeviceIndex PortAudioWrap::getDefaultInputDevice() -{ - return Pa_GetDefaultInputDevice(); -} - -PaDeviceIndex PortAudioWrap::getDefaultOutputDevice() -{ - return Pa_GetDefaultOutputDevice(); -} - -PaError PortAudioWrap::setInputChannelCount(int count) -{ -// if(!isActive()) -// { - inputBuffer.channelCount = count; - return paNoError; -// } -// return paStreamIsNotStopped; -} - -PaError PortAudioWrap::setInputSampleFormat(PaSampleFormat format) -{ -// if(!isActive()) -// { - inputBuffer.sampleFormat = format; - return paNoError; -// } -// return paStreamIsNotStopped; -} - -PaError PortAudioWrap::setInputLatency(PaTime latency) -{ -// if(!isActive()) -// { - inputBuffer.suggestedLatency = latency; - return paNoError; -// } -// return paStreamIsNotStopped; -} - -void PortAudioWrap::setInputHostApiStreamInfo(void *info) -{ - inputBuffer.hostApiSpecificStreamInfo = info; -} - -PaTime PortAudioWrap::getInputDefaultLowLatency() -{ - return Pa_GetDeviceInfo(inputBuffer.device)->defaultLowInputLatency; -} - -PaError PortAudioWrap::setOutputChannelCount(int count) -{ -// if(!isActive()) -// { - outputBuffer.channelCount = count; - return paNoError; -// } -// return paStreamIsNotStopped; -} - -PaError PortAudioWrap::setOutputSampleFormat(PaSampleFormat format) -{ -// if(!isActive()) -// { - outputBuffer.sampleFormat = format; - return paNoError; -// } -// return paStreamIsNotStopped; -} - -PaError PortAudioWrap::setOutputLatency(PaTime latency) -{ -// if(!isOpen()) -// { - outputBuffer.suggestedLatency = latency; - return paNoError; -// } -// return paStreamIsNotStopped; -} - -void PortAudioWrap::setOutputHostApiStreamInfo(void *info) -{ - outputBuffer.hostApiSpecificStreamInfo = info; -} - -PaTime PortAudioWrap::getOutputDefaultLowLatency() -{ - return Pa_GetDeviceInfo(inputBuffer.device)->defaultLowInputLatency; -} - -PaError PortAudioWrap::setFramesPerBuffer(unsigned long size) -{ -// if(!isOpen()) -// { - framesPerBuffer = size; - return paNoError; -// } -// return paStreamIsNotStopped; -} - -PaError PortAudioWrap::setSampleRate(unsigned long rate) -{ -// if(!isOpen()) -// { - samplerate = rate; - return paNoError; -// } -// return paStreamIsNotStopped; -} - -PaError PortAudioWrap::setStreamFlags(PaStreamFlags flags) -{ -// if(!isOpen()) -// { - statusFlags = flags; - return paNoError; -// } -// return paStreamIsNotStopped; -} - -PaError PortAudioWrap::setInputDevice(PaDeviceIndex flags) -{ -// if(!isOpen()) -// { - inputDevice = flags; - return paNoError; -// } -// return paStreamIsNotStopped; -} - -PaError PortAudioWrap::setOutputDevice(PaDeviceIndex flags) -{ -// if(!isOpen()) -// { - outputDevice = flags; - return paNoError; -// } -// return paStreamIsNotStopped; -} - -PaError PortAudioWrap::setCallback(PaStreamCallback *callback) -{ -// if(!isOpen()) -// { - streamCallback = callback; - return paNoError; -// } -// return paStreamIsNotStopped; -} - - - -// Non-linear amplifier with soft distortion curve. -float CubicAmplifier(float input) -{ - float output, temp; - if(input < 0.0) - { - temp = input + 1.0f; - output = (temp * temp * temp) - 1.0f; - } - else - { - temp = input - 1.0f; - output = (temp * temp * temp) + 1.0f; - } - return output; -} - -#define FUZZ(x) CubicAmplifier(CubicAmplifier(CubicAmplifier(CubicAmplifier(x)))) - -static int gNumNoInputs = 0; - -static int fuzzCallback(const void *inputBuffer, - void *outputBuffer, - unsigned long framesPerBuffer, - const PaStreamCallbackTimeInfo* timeInfo, - PaStreamCallbackFlags statusFlags, - void *userData) -{ - SAMPLE *out = (SAMPLE*)outputBuffer; - const SAMPLE *in = (const SAMPLE*)inputBuffer; - unsigned int i; - (void) timeInfo; // Prevent unused variable warnings. - (void) statusFlags; - (void) userData; - - if(inputBuffer == NULL) - { - for(i = 0; i < framesPerBuffer; i++) - { - *out++ = 0; // left - silent - *out++ = 0; // right - silent - } - gNumNoInputs += 1; - } - else - { - for(i = 0; i < framesPerBuffer; i++) - { - *out++ = FUZZ(*in++); // left - distorted - *out++ = *in++; // right - clean - } - } - return paContinue; -} - - -#if 1 -int main(void) -{ - PaError err; - PaDeviceIndex inputDevice; - PaDeviceIndex outputDevice; - - PortAudioWrap pa = PortAudioWrap(); - err = pa.init(); - - inputDevice = pa.getDefaultInputDevice(); // default input device - if(inputDevice == paNoDevice) - { - fprintf(stderr, "Error: No default input device.\n"); - goto error; - } - err = pa.setInputDevice(inputDevice); - err = pa.setInputChannelCount(2); // stereo input - err = pa.setInputSampleFormat(PA_SAMPLE_TYPE); - err = pa.setInputLatency(pa.getInputDefaultLowLatency()); - pa.setInputHostApiStreamInfo(NULL); - - outputDevice = pa.getDefaultOutputDevice(); // default output device - if (outputDevice == paNoDevice) - { - fprintf(stderr,"Error: No default output device.\n"); - goto error; - } - err = pa.setOutputDevice(inputDevice); - err = pa.setOutputChannelCount(2); // stereo input - err = pa.setOutputSampleFormat(PA_SAMPLE_TYPE); - err = pa.setOutputLatency(pa.getOutputDefaultLowLatency()); - pa.setOutputHostApiStreamInfo(NULL); - - err = pa.setFramesPerBuffer(FRAMES_PER_BUFFER); - err = pa.setSampleRate(SAMPLE_RATE); - err = pa.setStreamFlags(0); - err = pa.setCallback(fuzzCallback); - err = pa.streamOpen(); - - if(err != paNoError) - { - goto error; - } - err = pa.streamStart(); - if(err != paNoError) - { - goto error; - } - - printf("Hit ENTER to stop program.\n"); - getchar(); - err = pa.streamClose(); - if( err != paNoError ) - { - goto error; - } - printf("Finished. gNumNoInputs = %d\n", gNumNoInputs ); - pa.terminate(); - return 0; - -error: - Pa_Terminate(); - fprintf( stderr, "An error occured while using the portaudio stream\n" ); - fprintf( stderr, "Error number: %d\n", err ); - fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) ); - return -1; - -} - -#endif - diff --git a/fdmdv2/tests/pa_test/pa_class.h b/fdmdv2/tests/pa_test/pa_class.h deleted file mode 100644 index e565e9dd..00000000 --- a/fdmdv2/tests/pa_test/pa_class.h +++ /dev/null @@ -1,75 +0,0 @@ -#include -#include -#include "portaudio.h" - -// Note that many of the older ISA sound cards on PCs do NOT support -// full duplex audio (simultaneous record and playback). -// And some only support full duplex at lower sample rates. -#define SAMPLE_RATE (44100) -#define PA_SAMPLE_TYPE paFloat32 -#define FRAMES_PER_BUFFER (64) - -typedef float SAMPLE; - -float CubicAmplifier(float input); - -class PortAudioWrap -{ - public: - PortAudioWrap(); - ~PortAudioWrap(); - - private: - PaStream *stream; - PaStreamParameters inputBuffer; - PaStreamParameters outputBuffer; - void *userData; - int samplerate; - unsigned long framesPerBuffer; - PaStreamCallbackFlags statusFlags; - PaStreamCallback *streamCallback; - PaStreamFinishedCallback *streamFinishedCallback; - const PaStreamCallbackTimeInfo *timeInfo; - PaDeviceIndex inputDevice; - PaDeviceIndex outputDevice; - - public: - - PaError streamOpen(); - - PaDeviceIndex getDefaultInputDevice(); - PaDeviceIndex getDefaultOutputDevice(); - - PaStreamParameters *getDeviceInfo(PaDeviceIndex idx); - PaError setFramesPerBuffer(unsigned long size); - PaError setSampleRate(unsigned long size); - PaError setStreamFlags(PaStreamFlags flags); - PaError setCallback(PaStreamCallback *streamCallback); - PaError setStreamCallback(PaStream *stream, PaStreamCallback* callback ) { streamCallback = callback; return 0;} - PaError setStreamFinishedCallback(PaStream *stream, PaStreamFinishedCallback* streamFinishedCallback ); - - PaError setInputDevice(PaDeviceIndex dev); - PaError setInputChannelCount(int count); - PaError setInputSampleFormat(PaSampleFormat format); - PaError setInputSampleRate(PaSampleFormat format); - PaError setInputLatency(PaTime latency); - void setInputHostApiStreamInfo(void *info = NULL); - PaTime getInputDefaultLowLatency(); - - PaError setOutputDevice(PaDeviceIndex dev); - PaError setOutputChannelCount(int count); - PaError setOutputSampleFormat(PaSampleFormat format); - PaError setOutputLatency(PaTime latency); - void setOutputHostApiStreamInfo(void *info = NULL); - PaTime getOutputDefaultLowLatency(); - - PaError init(); - PaError streamStart(); - PaError streamClose(); - void terminate(); - bool isOpen() const; - void stop(); - void abort(); - bool isStopped() const; - bool isActive() const; -}; diff --git a/fdmdv2/tests/pa_test/pa_test.mk b/fdmdv2/tests/pa_test/pa_test.mk deleted file mode 100644 index 710712d4..00000000 --- a/fdmdv2/tests/pa_test/pa_test.mk +++ /dev/null @@ -1,103 +0,0 @@ -## -## Auto Generated makefile by CodeLite IDE -## any manual changes will be erased -## -## Release -ProjectName :=pa_test -ConfigurationName :=Release -IntermediateDirectory :=./Release -OutDir := $(IntermediateDirectory) -WorkspacePath := "C:\Users\wittend\Projects\Radio\fdmdv2" -ProjectPath := "C:\Users\wittend\Projects\Radio\fdmdv2\pa_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 := -ObjectSwitch :=-o -ArchiveOutputSwitch := -PreprocessOnlySwitch :=-E -ObjectsFileList :="C:\Users\wittend\Projects\Radio\fdmdv2\pa_test\pa_test.txt" -PCHCompileFlags := -MakeDirCommand :=makedir -CmpOptions := -O2 -Wall $(Preprocessors) -C_CmpOptions := -O2 -Wall $(Preprocessors) -LinkOptions := -IncludePath := $(IncludeSwitch). $(IncludeSwitch). $(IncludeSwitch)extern/include -IncludePCH := -RcIncludePath := -Libs := $(LibrarySwitch)portaudio -LibPath := $(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)/pa_class$(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)/pa_class$(ObjectSuffix): pa_class.cpp $(IntermediateDirectory)/pa_class$(DependSuffix) - $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_test/pa_class.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/pa_class$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/pa_class$(DependSuffix): pa_class.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/pa_class$(ObjectSuffix) -MF$(IntermediateDirectory)/pa_class$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/pa_test/pa_class.cpp" - -$(IntermediateDirectory)/pa_class$(PreprocessSuffix): pa_class.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/pa_class$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/pa_test/pa_class.cpp" - - --include $(IntermediateDirectory)/*$(DependSuffix) -## -## Clean -## -clean: - $(RM) $(IntermediateDirectory)/pa_class$(ObjectSuffix) - $(RM) $(IntermediateDirectory)/pa_class$(DependSuffix) - $(RM) $(IntermediateDirectory)/pa_class$(PreprocessSuffix) - $(RM) $(OutputFile) - $(RM) $(OutputFile).exe - $(RM) "C:\Users\wittend\Projects\Radio\fdmdv2\.build-release\pa_test" - - diff --git a/fdmdv2/tests/pa_test/pa_test.project b/fdmdv2/tests/pa_test/pa_test.project deleted file mode 100644 index c479d7dd..00000000 --- a/fdmdv2/tests/pa_test/pa_test.project +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - - diff --git a/fdmdv2/tests/pa_test/pa_test.txt b/fdmdv2/tests/pa_test/pa_test.txt deleted file mode 100644 index 7a5e00db..00000000 --- a/fdmdv2/tests/pa_test/pa_test.txt +++ /dev/null @@ -1 +0,0 @@ -./Debug/pa_class.o diff --git a/fdmdv2/tests/pa_test/portaudio.dll b/fdmdv2/tests/pa_test/portaudio.dll deleted file mode 100644 index 9b292864..00000000 Binary files a/fdmdv2/tests/pa_test/portaudio.dll and /dev/null differ diff --git a/fdmdv2/tests/pa_test/sine.cxx b/fdmdv2/tests/pa_test/sine.cxx deleted file mode 100644 index 577a2472..00000000 --- a/fdmdv2/tests/pa_test/sine.cxx +++ /dev/null @@ -1,137 +0,0 @@ -// --------------------------------------------------------------------------------------- - -#include -#include -#include -#include -#include "portaudiocpp/PortAudioCpp.hxx" - -// --------------------------------------------------------------------------------------- - -// Some constants: -const int NUM_SECONDS = 5; -const double SAMPLE_RATE = 44100.0; -const int FRAMES_PER_BUFFER = 64; -const int TABLE_SIZE = 200; - -// --------------------------------------------------------------------------------------- - -// SineGenerator class: -class SineGenerator -{ -public: - SineGenerator(int tableSize) : tableSize_(tableSize), leftPhase_(0), rightPhase_(0) - { - const double PI = 3.14159265; - table_ = new float[tableSize]; - for (int i = 0; i < tableSize; ++i) - { - table_[i] = 0.125f * (float)sin(((double)i/(double)tableSize)*PI*2.); - } - } - - ~SineGenerator() - { - delete[] table_; - } - - int generate(const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, - const PaStreamCallbackTimeInfo *timeInfo, PaStreamCallbackFlags statusFlags) - { - assert(outputBuffer != NULL); - - float **out = static_cast(outputBuffer); - - for (unsigned int i = 0; i < framesPerBuffer; ++i) - { - out[0][i] = table_[leftPhase_]; - out[1][i] = table_[rightPhase_]; - - leftPhase_ += 1; - if (leftPhase_ >= tableSize_) - leftPhase_ -= tableSize_; - - rightPhase_ += 3; - if (rightPhase_ >= tableSize_) - rightPhase_ -= tableSize_; - } - - return paContinue; - } - -private: - float *table_; - int tableSize_; - int leftPhase_; - int rightPhase_; -}; - -// --------------------------------------------------------------------------------------- - -// main: -int main(int, char *[]); -int main(int, char *[]) -{ - try - { - // Create a SineGenerator object: - SineGenerator sineGenerator(TABLE_SIZE); - - std::cout << "Setting up PortAudio..." << std::endl; - - // Set up the System: - portaudio::AutoSystem autoSys; - portaudio::System &sys = portaudio::System::instance(); - - // Set up the parameters required to open a (Callback)Stream: - portaudio::DirectionSpecificStreamParameters outParams(sys.defaultOutputDevice(), 2, portaudio::FLOAT32, false, sys.defaultOutputDevice().defaultLowOutputLatency(), NULL); - portaudio::StreamParameters params(portaudio::DirectionSpecificStreamParameters::null(), outParams, SAMPLE_RATE, FRAMES_PER_BUFFER, paClipOff); - - std::cout << "Opening stereo output stream..." << std::endl; - - // Create (and open) a new Stream, using the SineGenerator::generate function as a callback: - portaudio::MemFunCallbackStream stream(params, sineGenerator, &SineGenerator::generate); - - std::cout << "Starting playback for " << NUM_SECONDS << " seconds." << std::endl; - - // Start the Stream (audio playback starts): - stream.start(); - - // Wait for 5 seconds: - sys.sleep(NUM_SECONDS * 1000); - - std::cout << "Closing stream..." < $(IntermediateDirectory)/.d - @echo $(Objects) > $(ObjectsFileList) - $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) - -$(IntermediateDirectory)/.d: - @$(MakeDirCommand) "./Release" - -PreBuild: - - -## -## Objects -## -$(IntermediateDirectory)/main$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "D:/Projects/Radio/fdmdv2/tests/serial_enum/main.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/main$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/main$(DependSuffix): main.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/main$(ObjectSuffix) -MF$(IntermediateDirectory)/main$(DependSuffix) -MM "D:/Projects/Radio/fdmdv2/tests/serial_enum/main.cpp" - -$(IntermediateDirectory)/main$(PreprocessSuffix): main.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main$(PreprocessSuffix) "D:/Projects/Radio/fdmdv2/tests/serial_enum/main.cpp" - - --include $(IntermediateDirectory)/*$(DependSuffix) -## -## Clean -## -clean: - $(RM) $(IntermediateDirectory)/main$(ObjectSuffix) - $(RM) $(IntermediateDirectory)/main$(DependSuffix) - $(RM) $(IntermediateDirectory)/main$(PreprocessSuffix) - $(RM) $(OutputFile) - $(RM) $(OutputFile).exe - $(RM) "D:\Projects\Radio\fdmdv2\build\.build-release\enumSerial" - - diff --git a/fdmdv2/tests/serial_enum/enumSerial.project b/fdmdv2/tests/serial_enum/enumSerial.project deleted file mode 100644 index 99160d90..00000000 --- a/fdmdv2/tests/serial_enum/enumSerial.project +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - diff --git a/fdmdv2/tests/serial_enum/enumSerial.txt b/fdmdv2/tests/serial_enum/enumSerial.txt deleted file mode 100644 index e9f35e35..00000000 --- a/fdmdv2/tests/serial_enum/enumSerial.txt +++ /dev/null @@ -1 +0,0 @@ -./Debug/main.o diff --git a/fdmdv2/tests/serial_enum/enumser.h b/fdmdv2/tests/serial_enum/enumser.h deleted file mode 100644 index 92b4ad9e..00000000 --- a/fdmdv2/tests/serial_enum/enumser.h +++ /dev/null @@ -1,257 +0,0 @@ -/* -Module : enumser.h -Purpose: Defines the interface for a class to enumerate the serial ports installed on a PC - using a number of different approaches -Created: PJN / 03-11-1998 - -Copyright (c) 1998 - 2012 by PJ Naughter (Web: www.naughter.com, Email: pjna@naughter.com) - -All rights reserved. - -Copyright / Usage Details: - -You are allowed to include the source code in any product (commercial, shareware, freeware or otherwise) -when your product is released in binary form. You are allowed to modify the source code in any way you want -except you cannot modify the copyright details at the top of each module. If you want to distribute source -code with your application, then you are only allowed to distribute versions released by the author. This is -to maintain a single distribution point for the source code. - -*/ - - -///////////////////////// Macros / Structs etc //////////////////////////////// - -#pragma once - -#ifndef __ENUMSER_H__ -#define __ENUMSER_H__ - -#ifndef CENUMERATESERIAL_EXT_CLASS -#define CENUMERATESERIAL_EXT_CLASS -#endif - - -///////////////////////// Includes //////////////////////////////////////////// - -#if defined CENUMERATESERIAL_USE_STL -#ifndef _VECTOR_ - #include - #pragma message("To avoid this message, please put vector in your pre compiled header (normally stdafx.h)") -#endif -#ifndef _STRING_ - #include - #pragma message("To avoid this message, please put string in your pre compiled header (normally stdafx.h)") -#endif -#endif - -#if defined _AFX - #ifndef __AFXTEMPL_H__ - #include - #pragma message("To avoid this message, please put afxtempl.h in your pre compiled header (normally stdafx.h)") - #endif -#else - #ifndef __ATLSTR_H__ - #include - #pragma message("To avoid this message, please put atlstr.h in your pre compiled header (normally stdafx.h)") - #endif -#endif - - -///////////////////////// Classes ///////////////////////////////////////////// - -class CENUMERATESERIAL_EXT_CLASS CEnumerateSerial -{ -public: -//Methods -#ifndef NO_ENUMSERIAL_USING_CREATEFILE - #if defined CENUMERATESERIAL_USE_STL - static BOOL UsingCreateFile(std::vector& ports); - #elif defined _AFX - static BOOL UsingCreateFile(CUIntArray& ports); - #else - static BOOL UsingCreateFile(CSimpleArray& ports); - #endif -#endif - -#ifndef NO_ENUMSERIAL_USING_QUERYDOSDEVICE - #if defined CENUMERATESERIAL_USE_STL - static BOOL UsingQueryDosDevice(std::vector& ports); - #elif defined _AFX - static BOOL UsingQueryDosDevice(CUIntArray& ports); - #else - static BOOL UsingQueryDosDevice(CSimpleArray& ports); - #endif -#endif - -#ifndef NO_ENUMSERIAL_USING_GETDEFAULTCOMMCONFIG - #if defined CENUMERATESERIAL_USE_STL - static BOOL UsingGetDefaultCommConfig(std::vector& ports); - #elif defined _AFX - static BOOL UsingGetDefaultCommConfig(CUIntArray& ports); - #else - static BOOL UsingGetDefaultCommConfig(CSimpleArray& ports); - #endif -#endif - -#ifndef NO_ENUMSERIAL_USING_SETUPAPI1 - #if defined CENUMERATESERIAL_USE_STL - #if defined _UNICODE - static BOOL UsingSetupAPI1(std::vector& ports, std::vector& friendlyNames); - #else - static BOOL UsingSetupAPI1(std::vector& ports, std::vector& friendlyNames); - #endif - #elif defined _AFX - static BOOL UsingSetupAPI1(CUIntArray& ports, CStringArray& friendlyNames); - #else - static BOOL UsingSetupAPI1(CSimpleArray& ports, CSimpleArray& friendlyNames); - #endif -#endif - -#ifndef NO_ENUMSERIAL_USING_SETUPAPI2 - #if defined CENUMERATESERIAL_USE_STL - #if defined _UNICODE - static BOOL UsingSetupAPI2(std::vector& ports, std::vector& friendlyNames); - #else - static BOOL UsingSetupAPI2(std::vector& ports, std::vector& friendlyNames); - #endif - #elif defined _AFX - static BOOL UsingSetupAPI2(CUIntArray& ports, CStringArray& friendlyNames); - #else - static BOOL UsingSetupAPI2(CSimpleArray& ports, CSimpleArray& friendlyNames); - #endif -#endif - -#ifndef NO_ENUMSERIAL_USING_ENUMPORTS - #if defined CENUMERATESERIAL_USE_STL - static BOOL UsingEnumPorts(std::vector& ports); - #elif defined _AFX - static BOOL UsingEnumPorts(CUIntArray& ports); - #else - static BOOL UsingEnumPorts(CSimpleArray& ports); - #endif -#endif - -#ifndef NO_ENUMSERIAL_USING_WMI - #if defined CENUMERATESERIAL_USE_STL - #if defined _UNICODE - static BOOL UsingWMI(std::vector& ports, std::vector& friendlyNames); - #else - static BOOL UsingWMI(std::vector& ports, std::vector& friendlyNames); - #endif - #elif defined _AFX - static BOOL UsingWMI(CUIntArray& ports, CStringArray& friendlyNames); - #else - static BOOL UsingWMI(CSimpleArray& ports, CSimpleArray& friendlyNames); - #endif -#endif - -#ifndef NO_ENUMSERIAL_USING_COMDB - #if defined CENUMERATESERIAL_USE_STL - static BOOL UsingComDB(std::vector& ports); - #elif defined _AFX - static BOOL UsingComDB(CUIntArray& ports); - #else - static BOOL UsingComDB(CSimpleArray& ports); - #endif -#endif - -#ifndef NO_ENUMSERIAL_USING_REGISTRY - #if defined CENUMERATESERIAL_USE_STL - #if defined _UNICODE - static BOOL UsingRegistry(std::vector& ports); - #else - static BOOL UsingRegistry(std::vector& ports); - #endif - #elif defined _AFX - static BOOL UsingRegistry(CStringArray& ports); - #else - static BOOL UsingRegistry(CSimpleArray& ports); - #endif -#endif - -protected: - -//Helper class which supports auto closing of a handle via CloseHandle - class CAutoHandle - { - public: - //Constructors / Destructors - CAutoHandle() : m_hHandle(INVALID_HANDLE_VALUE) - { - } - - explicit CAutoHandle(HANDLE hHandle) : m_hHandle(hHandle) - { - } - - ~CAutoHandle() - { - if (m_hHandle != INVALID_HANDLE_VALUE) - { - CloseHandle(m_hHandle); - m_hHandle = INVALID_HANDLE_VALUE; - } - } - - //Methods - operator HANDLE() - { - return m_hHandle; - } - - //Member variables - HANDLE m_hHandle; - }; - - -//Helper class which supports auto closing of a HMODULE via FreeLibrary and setting of the last Win32 error via SetLastError - class CAutoHModule - { - public: - //Constructors / Destructors - CAutoHModule() : m_hModule(NULL), - m_dwError(ERROR_SUCCESS) - { - } - - explicit CAutoHModule(HMODULE hModule) : m_hModule(hModule), - m_dwError(GetLastError()) - { - } - - explicit CAutoHModule(HMODULE hModule, DWORD dwError) : m_hModule(hModule), - m_dwError(dwError) - { - } - - ~CAutoHModule() - { - if (m_hModule != NULL) - { - FreeLibrary(m_hModule); - m_hModule = NULL; - } - SetLastError(m_dwError); - } - - operator HMODULE() - { - return m_hModule; - } - - //Member variables - HMODULE m_hModule; - DWORD m_dwError; - }; - - - -//Methods - static BOOL RegQueryValueString(HKEY kKey, LPCTSTR lpValueName, LPTSTR& pszValue); - static BOOL QueryRegistryPortName(HKEY hDeviceKey, int& nPort); - static HMODULE LoadLibraryFromSystem32(LPCTSTR lpFileName); - static BOOL IsNumeric(LPCSTR pszString, BOOL bIgnoreColon); - static BOOL IsNumeric(LPCWSTR pszString, BOOL bIgnoreColon); -}; - -#endif //__ENUMSER_H__ diff --git a/fdmdv2/tests/serial_enum/main.cpp b/fdmdv2/tests/serial_enum/main.cpp deleted file mode 100644 index b45d5ed1..00000000 --- a/fdmdv2/tests/serial_enum/main.cpp +++ /dev/null @@ -1,206 +0,0 @@ -#include -#include -#include -#include -//#include -//#include -#include - - -static bool getReg(); -//static bool UsingRegistryWxArrayString(wxArrayString ports); -//static bool UsingRegistry(std::vector& ports); -//static bool RegQueryValueString(HKEY kKey, LPCTSTR lpValueName, LPTSTR& pszValue); -//static bool QueryRegistryPortName(HKEY hDeviceKey, int& nPort); -//static HMODULE LoadLibraryFromSystem32(LPCTSTR lpFileName); -//static bool IsNumeric(LPCSTR pszString, bool bIgnoreColon); -//static bool IsNumeric(LPCWSTR pszString, bool bIgnoreColon); - -//std::vector friendlyNames; -int main( int argc, char** argv ) -{ - // initialize wxWidgets - wxInitializer init; - wxPrintf(wxT("Enumerating Serial Comm Ports\n\n")); - //std::vector sPorts; - wxArrayString sPorts; - if(getReg()) - { - wxPrintf("\nOk\n"); - } -/* - if(UsingRegistryWxArrayString(sPorts)) - { - for(int i = 0; i < sPorts.size(); i++) - { - wxPrintf("%s\n", sPorts[i].c_str()); - } - } -*/ - return 0; -} - -#ifdef __WXMSW__ - -bool getReg() -{ - //wxRegKey *key = new wxRegKey("HKEY_LOCAL_MACHINE\\HARDWARE\\DEVICEMAP\\SERIALCOMM"); - wxRegKey key(wxRegKey::HKLM, _T("HARDWARE\\DEVICEMAP\\SERIALCOMM")); - if(!key.Exists()) - { - wxPrintf("Key doesn't exist: %s\n", key.GetName()); - return false; - } - else - { - // Get the number of subkeys and enumerate them. - if(!key.Open(wxRegKey::Read)) - { - wxPrintf("Unable to open key: %s\n", key.GetName()); - return false; - } - size_t subkeys; - size_t values; - if(!key.GetKeyInfo(&subkeys, NULL, &values, NULL)) - { - wxPrintf("Unable get subkey info: %s\n", key.GetName()); - return false; - } - if(!key.HasValues()) - { - wxPrintf("Key does have values: %s\n", key.GetName()); - return false; - } - wxString key_name; - long el = 1; - key.GetFirstValue(key_name, el); - wxString valType; - wxString key_data; - for(unsigned int i = 0; i < values; i++) - { - key.QueryValue(key_name, key_data); - wxPrintf("Value: %s Data: %s\n", key_name, key_data); - //wxPrintf("Data: %s\n", key_data); - key.GetNextValue(key_name, el); - } - } - return true; -} - -bool UsingRegistry(std::vector& ports) -{ - //Make sure we clear out any elements which may already be in the array(s) - ports.clear(); - //What will be the return value from this function (assume the worst) - BOOL bSuccess = FALSE; - - HKEY hSERIALCOMM; - if(::RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("HARDWARE\\DEVICEMAP\\SERIALCOMM"), 0, KEY_QUERY_VALUE, &hSERIALCOMM) == ERROR_SUCCESS) - { - //Get the max value name and max value lengths - DWORD dwMaxValueNameLen; - DWORD dwMaxValueLen; - DWORD dwQueryInfo = ::RegQueryInfoKey(hSERIALCOMM, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &dwMaxValueNameLen, &dwMaxValueLen, NULL, NULL); - if(dwQueryInfo == ERROR_SUCCESS) - { - DWORD dwMaxValueNameSizeInChars = dwMaxValueNameLen + 1; //Include space for the NULL terminator - DWORD dwMaxValueNameSizeInBytes = dwMaxValueNameSizeInChars * sizeof(TCHAR); - DWORD dwMaxValueDataSizeInChars = dwMaxValueLen/sizeof(TCHAR) + 1; //Include space for the NULL terminator - DWORD dwMaxValueDataSizeInBytes = dwMaxValueDataSizeInChars * sizeof(TCHAR); - wxWCharBuffer *szValueName = new wxWCharBuffer(dwMaxValueNameSizeInBytes); - wxWCharBuffer *byValue = new wxWCharBuffer(dwMaxValueDataSizeInBytes); - bSuccess = TRUE; - - //Enumerate all the values underneath HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\SERIALCOMM - DWORD dwIndex = 0; - DWORD dwType; - DWORD dwValueNameSize = dwMaxValueNameSizeInChars; - DWORD dwDataSize = dwMaxValueDataSizeInBytes; - LONG nEnum = ::RegEnumValue(hSERIALCOMM, dwIndex, (wchar_t *) szValueName, &dwValueNameSize, NULL, &dwType, (LPBYTE) byValue, &dwDataSize); - - while(nEnum == ERROR_SUCCESS) - { - //If the value is of the correct type, then add it to the array - if(dwType == REG_SZ) - { - //TCHAR* szPort = reinterpret_cast(byValue.m_pData); - TCHAR *szPort; - szPort = (TCHAR *)byValue; - ports.push_back(szPort); - } - //Prepare for the next time around - dwValueNameSize = dwMaxValueNameSizeInChars; - dwDataSize = dwMaxValueDataSizeInBytes; - ++dwIndex; - nEnum = ::RegEnumValue(hSERIALCOMM, dwIndex, (wchar_t *) szValueName, &dwValueNameSize, NULL, &dwType, (LPBYTE) byValue, &dwDataSize); - } - } - //Close the registry key now that we are finished with it - ::RegCloseKey(hSERIALCOMM); - if(dwQueryInfo != ERROR_SUCCESS) - { - ::SetLastError(dwQueryInfo); - } - } - return bSuccess; -} - -bool UsingRegistryWxArrayString(wxArrayString ports) -{ - //Make sure we clear out any elements which may already be in the array(s) - ports.clear(); - //What will be the return value from this function (assume the worst) - BOOL bSuccess = FALSE; - - HKEY hSERIALCOMM; - if(::RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("HARDWARE\\DEVICEMAP\\SERIALCOMM"), 0, KEY_QUERY_VALUE, &hSERIALCOMM) == ERROR_SUCCESS) - { - //Get the max value name and max value lengths - DWORD dwMaxValueNameLen; - DWORD dwMaxValueLen; - DWORD dwQueryInfo = ::RegQueryInfoKey(hSERIALCOMM, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &dwMaxValueNameLen, &dwMaxValueLen, NULL, NULL); - if(dwQueryInfo == ERROR_SUCCESS) - { - DWORD dwMaxNameSizeInChars = dwMaxValueNameLen + 1; //Include space for the NULL terminator - DWORD dwMaxNameSizeInBytes = dwMaxNameSizeInChars * sizeof(TCHAR); - DWORD dwMaxDataSizeInChars = dwMaxValueLen/sizeof(TCHAR) + 1; //Include space for the NULL terminator - DWORD dwMaxDataSizeInBytes = dwMaxDataSizeInChars * sizeof(TCHAR); - wxWCharBuffer *szValueName = new wxWCharBuffer(dwMaxNameSizeInBytes); - wxWCharBuffer *byValue = new wxWCharBuffer(dwMaxDataSizeInBytes); - - bSuccess = TRUE; - - //Enumerate all the values underneath HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\SERIALCOMM - DWORD dwIndex = 0; - DWORD dwType; - DWORD dwValueNameSize = dwMaxNameSizeInChars; - DWORD dwDataSize = dwMaxDataSizeInBytes; - LONG nEnum = ::RegEnumValue(hSERIALCOMM, dwIndex, (wchar_t *)&szValueName, &dwValueNameSize, NULL, &dwType, (LPBYTE) byValue, &dwDataSize); - wxString szPort; - - while(nEnum == ERROR_SUCCESS) - { - //If the value is of the correct type, then add it to the array - if(dwType == REG_SZ) - { - szPort = wxString((LPBYTE)byValue); - ports.push_back(szPort); - } - //Prepare for the next time around - dwValueNameSize = dwMaxNameSizeInChars; - dwDataSize = dwMaxDataSizeInBytes; - ++dwIndex; - nEnum = ::RegEnumValue(hSERIALCOMM, dwIndex, (wchar_t *) &szValueName, &dwValueNameSize, NULL, &dwType, (LPBYTE) byValue, &dwDataSize); - } - } - //Close the registry key now that we are finished with it - ::RegCloseKey(hSERIALCOMM); - if (dwQueryInfo != ERROR_SUCCESS) - { - ::SetLastError(dwQueryInfo); - } - } - return bSuccess; -} - -#endif //__WXMSW__ diff --git a/fdmdv2/variants/fdmdv2basic/Release/.gitignore b/fdmdv2/variants/fdmdv2basic/Release/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/fdmdv2/variants/fdmdv2basic/fdmdv2basic.mk b/fdmdv2/variants/fdmdv2basic/fdmdv2basic.mk deleted file mode 100644 index 6359fa03..00000000 --- a/fdmdv2/variants/fdmdv2basic/fdmdv2basic.mk +++ /dev/null @@ -1,125 +0,0 @@ -## -## Auto Generated makefile by CodeLite IDE -## any manual changes will be erased -## -## Release -ProjectName :=fdmdv2basic -ConfigurationName :=Release -IntermediateDirectory :=./Release -OutDir := $(IntermediateDirectory) -WorkspacePath := "C:\Users\wittend\Projects\Radio\fdmdv2" -ProjectPath := "C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2basic" -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\fdmdv2basic\fdmdv2basic.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)./../extern/include -IncludePCH := -RcIncludePath := -Libs := $(LibrarySwitch)sndfile-1 $(LibrarySwitch)codec2 $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp -LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)./../libsndfile/bin $(LibraryPathSwitch)./../extern/lib - - -## -## 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) $(IntermediateDirectory)/paclass$(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/fdmdv2basic/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/fdmdv2basic/gui.cpp" - -$(IntermediateDirectory)/gui$(PreprocessSuffix): gui.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/gui$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2basic/gui.cpp" - -$(IntermediateDirectory)/main$(ObjectSuffix): main.cpp $(IntermediateDirectory)/main$(DependSuffix) - $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2basic/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/fdmdv2basic/main.cpp" - -$(IntermediateDirectory)/main$(PreprocessSuffix): main.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2basic/main.cpp" - -$(IntermediateDirectory)/paclass$(ObjectSuffix): paclass.cpp $(IntermediateDirectory)/paclass$(DependSuffix) - $(CompilerName) $(IncludePCH) $(SourceSwitch) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2basic/paclass.cpp" $(CmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/paclass$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/paclass$(DependSuffix): paclass.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/paclass$(ObjectSuffix) -MF$(IntermediateDirectory)/paclass$(DependSuffix) -MM "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2basic/paclass.cpp" - -$(IntermediateDirectory)/paclass$(PreprocessSuffix): paclass.cpp - @$(CompilerName) $(CmpOptions) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/paclass$(PreprocessSuffix) "C:/Users/wittend/Projects/Radio/fdmdv2/fdmdv2basic/paclass.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) $(IntermediateDirectory)/paclass$(ObjectSuffix) - $(RM) $(IntermediateDirectory)/paclass$(DependSuffix) - $(RM) $(IntermediateDirectory)/paclass$(PreprocessSuffix) - $(RM) $(OutputFile) - $(RM) $(OutputFile).exe - $(RM) "C:\Users\wittend\Projects\Radio\fdmdv2\.build-release\fdmdv2basic" - - diff --git a/fdmdv2/variants/fdmdv2basic/fdmdv2basic.project b/fdmdv2/variants/fdmdv2basic/fdmdv2basic.project deleted file mode 100644 index bce8cecc..00000000 --- a/fdmdv2/variants/fdmdv2basic/fdmdv2basic.project +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - None - - - - - - - - - - - - - - - - diff --git a/fdmdv2/variants/fdmdv2basic/fdmdv2basic.txt b/fdmdv2/variants/fdmdv2basic/fdmdv2basic.txt deleted file mode 100644 index 04bdf84a..00000000 --- a/fdmdv2/variants/fdmdv2basic/fdmdv2basic.txt +++ /dev/null @@ -1 +0,0 @@ -./Release/gui.o ./Release/main.o ./Release/paclass.o diff --git a/fdmdv2/variants/fdmdv2basic/gui.cpp b/fdmdv2/variants/fdmdv2basic/gui.cpp deleted file mode 100644 index a6a6cf71..00000000 --- a/fdmdv2/variants/fdmdv2basic/gui.cpp +++ /dev/null @@ -1,186 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 17 2012) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "gui.h" - -/////////////////////////////////////////////////////////////////////////// - -MainDialogBase::MainDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); - - wxBoxSizer* mainSizer; - mainSizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer2; - bSizer2 = new wxBoxSizer( wxHORIZONTAL ); - - wxStaticBoxSizer* sbSizer1; - sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Settings") ), wxVERTICAL ); - - wxGridSizer* gSizer4; - gSizer4 = new wxGridSizer( 3, 1, 0, 0 ); - - wxStaticBoxSizer* sbSizer3; - sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Audio") ), wxVERTICAL ); - - wxGridSizer* gSizer1; - gSizer1 = new wxGridSizer( 4, 2, 0, 0 ); - - m_staticText1 = new wxStaticText( this, wxID_ANY, _("Rx In (radio):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText1->Wrap( -1 ); - gSizer1->Add( m_staticText1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_comboRxIn = new wxComboBox( this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - gSizer1->Add( m_comboRxIn, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 2 ); - - m_staticText2 = new wxStaticText( this, wxID_ANY, _("Rx Out (spkr):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText2->Wrap( -1 ); - gSizer1->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_comboRxOut = new wxComboBox( this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - gSizer1->Add( m_comboRxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 2 ); - - m_staticText3 = new wxStaticText( this, wxID_ANY, _("Tx In (mic):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText3->Wrap( -1 ); - gSizer1->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_comboTxIn = new wxComboBox( this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - gSizer1->Add( m_comboTxIn, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 2 ); - - m_staticText4 = new wxStaticText( this, wxID_ANY, _("Tx Out (radio):"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText4->Wrap( -1 ); - gSizer1->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_comboTxOut = new wxComboBox( this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - gSizer1->Add( m_comboTxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 2 ); - - - sbSizer3->Add( gSizer1, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxFIXED_MINSIZE, 2 ); - - - gSizer4->Add( sbSizer3, 1, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxFIXED_MINSIZE, 5 ); - - wxStaticBoxSizer* sbSizer4; - sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("label") ), wxVERTICAL ); - - wxGridSizer* gSizer111; - gSizer111 = new wxGridSizer( 2, 2, 0, 0 ); - - m_staticText111 = new wxStaticText( this, wxID_ANY, _("Rate:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText111->Wrap( -1 ); - gSizer111->Add( m_staticText111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_comboBox111 = new wxComboBox( this, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - gSizer111->Add( m_comboBox111, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 2 ); - - m_staticText211 = new wxStaticText( this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText211->Wrap( -1 ); - gSizer111->Add( m_staticText211, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_comboBox211 = new wxComboBox( this, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - gSizer111->Add( m_comboBox211, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 2 ); - - - sbSizer4->Add( gSizer111, 0, wxALIGN_CENTER|wxEXPAND|wxFIXED_MINSIZE, 2 ); - - - gSizer4->Add( sbSizer4, 1, wxEXPAND|wxFIXED_MINSIZE, 5 ); - - wxStaticBoxSizer* sbSizer5; - sbSizer5 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comm Port") ), wxVERTICAL ); - - wxGridSizer* gSizer11; - gSizer11 = new wxGridSizer( 2, 2, 0, 0 ); - - m_staticText11 = new wxStaticText( this, wxID_ANY, _("Radio:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText11->Wrap( -1 ); - gSizer11->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_comboBox11 = new wxComboBox( this, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - gSizer11->Add( m_comboBox11, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 2 ); - - m_staticText21 = new wxStaticText( this, wxID_ANY, _("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText21->Wrap( -1 ); - gSizer11->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - - m_comboBox21 = new wxComboBox( this, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - gSizer11->Add( m_comboBox21, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 2 ); - - - sbSizer5->Add( gSizer11, 0, wxALIGN_CENTER|wxEXPAND|wxFIXED_MINSIZE, 2 ); - - - gSizer4->Add( sbSizer5, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); - - - sbSizer1->Add( gSizer4, 1, wxEXPAND, 5 ); - - - bSizer2->Add( sbSizer1, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* sbSizer2; - sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Operation") ), wxVERTICAL ); - - m_toggleStartStop = new wxToggleButton( this, wxID_ANY, _("Start"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizer2->Add( m_toggleStartStop, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); - - m_toggleRxTx = new wxToggleButton( this, wxID_ANY, _("Tx"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizer2->Add( m_toggleRxTx, 2, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); - - - bSizer2->Add( sbSizer2, 0, wxEXPAND, 5 ); - - - mainSizer->Add( bSizer2, 1, wxEXPAND, 5 ); - - m_staticLine = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( m_staticLine, 0, wxEXPAND | wxALL, 5 ); - - m_sdbSizer = new wxStdDialogButtonSizer(); - m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer->AddButton( m_sdbSizerCancel ); - m_sdbSizer->Realize(); - - mainSizer->Add( m_sdbSizer, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT, 5 ); - - - this->SetSizer( mainSizer ); - this->Layout(); - - this->Centre( wxBOTH ); - - // Connect Events - this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogBase::OnCloseDialog ) ); - this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( MainDialogBase::OnInitDialog ) ); - m_comboRxIn->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MainDialogBase::OnRxInSelect ), NULL, this ); - m_comboRxOut->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MainDialogBase::OnRxOutSelect ), NULL, this ); - m_comboTxIn->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MainDialogBase::OnTxInSelect ), NULL, this ); - m_comboTxOut->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MainDialogBase::OnTxOutSelect ), NULL, this ); - m_comboBox11->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MainDialogBase::OnRadioSelect ), NULL, this ); - m_comboBox21->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MainDialogBase::OnPortSelect ), NULL, this ); - m_toggleStartStop->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainDialogBase::OnToggleStartStop ), NULL, this ); - m_toggleRxTx->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainDialogBase::OnToggleRxRx ), NULL, this ); - m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogBase::OnCancelClick ), NULL, this ); -} - -MainDialogBase::~MainDialogBase() -{ - // Disconnect Events - this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogBase::OnCloseDialog ) ); - this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( MainDialogBase::OnInitDialog ) ); - m_comboRxIn->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MainDialogBase::OnRxInSelect ), NULL, this ); - m_comboRxOut->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MainDialogBase::OnRxOutSelect ), NULL, this ); - m_comboTxIn->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MainDialogBase::OnTxInSelect ), NULL, this ); - m_comboTxOut->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MainDialogBase::OnTxOutSelect ), NULL, this ); - m_comboBox11->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MainDialogBase::OnRadioSelect ), NULL, this ); - m_comboBox21->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( MainDialogBase::OnPortSelect ), NULL, this ); - m_toggleStartStop->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainDialogBase::OnToggleStartStop ), NULL, this ); - m_toggleRxTx->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( MainDialogBase::OnToggleRxRx ), NULL, this ); - m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogBase::OnCancelClick ), NULL, this ); - -} diff --git a/fdmdv2/variants/fdmdv2basic/gui.fbp b/fdmdv2/variants/fdmdv2basic/gui.fbp deleted file mode 100644 index 47e80022..00000000 --- a/fdmdv2/variants/fdmdv2basic/gui.fbp +++ /dev/null @@ -1,1977 +0,0 @@ - - - - - - C++|Python - 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,-1 - 1 - MainDialogBase - 1 - - - 1 - - Resizable - 1 - 523,526 - wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - FDMDV2Basic - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - OnCloseDialog - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - - - - mainSizer - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bSizer2 - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - wxID_ANY - Settings - - sbSizer1 - wxVERTICAL - none - - - 5 - wxEXPAND - 1 - - 1 - 0 - - gSizer4 - none - 3 - 0 - - 5 - wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxFIXED_MINSIZE - 1 - - wxID_ANY - Audio - - sbSizer3 - wxVERTICAL - none - - - 2 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxFIXED_MINSIZE - 0 - - 2 - 0 - - gSizer1 - none - 4 - 0 - - 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 - Rx In (radio): - - 0 - - - 0 - - 1 - m_staticText1 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|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_comboRxIn - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - <default> - - - - - OnRxInSelect - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - Rx Out (spkr): - - 0 - - - 0 - - 1 - m_staticText2 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|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_comboRxOut - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - <default> - - - - - OnRxOutSelect - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - Tx In (mic): - - 0 - - - 0 - - 1 - m_staticText3 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|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_comboTxIn - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - <default> - - - - - OnTxInSelect - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - Tx Out (radio): - - 0 - - - 0 - - 1 - m_staticText4 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|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_comboTxOut - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - <default> - - - - - OnTxOutSelect - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxFIXED_MINSIZE - 1 - - wxID_ANY - label - - sbSizer4 - wxVERTICAL - none - - - 2 - wxALIGN_CENTER|wxEXPAND|wxFIXED_MINSIZE - 0 - - 2 - 0 - - gSizer111 - none - 2 - 0 - - 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 - Rate: - - 0 - - - 0 - - 1 - m_staticText111 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|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_comboBox111 - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - Combo! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - MyLabel - - 0 - - - 0 - - 1 - m_staticText211 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|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_comboBox211 - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - Combo! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 1 - - wxID_ANY - Comm Port - - sbSizer5 - wxVERTICAL - none - - - 2 - wxALIGN_CENTER|wxEXPAND|wxFIXED_MINSIZE - 0 - - 2 - 0 - - gSizer11 - none - 2 - 0 - - 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 - Radio: - - 0 - - - 0 - - 1 - m_staticText11 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|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_comboBox11 - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - Combo! - - - - - OnRadioSelect - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - Port: - - 0 - - - 0 - - 1 - m_staticText21 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER_VERTICAL|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_comboBox21 - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - Combo! - - - - - OnPortSelect - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - wxID_ANY - Operation - - sbSizer2 - wxVERTICAL - none - - - 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Start - - 0 - - - 0 - - 1 - m_toggleStartStop - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - OnToggleStartStop - - - - - 5 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 2 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Tx - - 0 - - - 0 - - 1 - m_toggleRxTx - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - OnToggleRxRx - - - - - - - - - 5 - wxEXPAND | wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticLine - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT|wxBOTTOM|wxRIGHT - 0 - - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - - m_sdbSizer - protected - - OnCancelClick - - - - - - - - - - - - diff --git a/fdmdv2/variants/fdmdv2basic/gui.fbp.bak b/fdmdv2/variants/fdmdv2basic/gui.fbp.bak deleted file mode 100644 index fb922976..00000000 --- a/fdmdv2/variants/fdmdv2basic/gui.fbp.bak +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - C++ - 1 - UTF-8 - connect - impl_virtual - gui - 1000 - none - 1 - gui - - . - - 1 - 0 - 0 - - - wxBOTH - - 1 - - - - 0 - wxID_ANY - - -1,-1 - MainDialogBase - - 400,300 - wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE - - wxMiniApp - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - OnCloseDialog - - - - - - - - - - - - - - - - - - - - - - - - - - - - - mainSizer - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxEXPAND | wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_staticLine - protected - - - wxLI_HORIZONTAL - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT|wxBOTTOM|wxRIGHT - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer - protected - - OnCancelClick - - - - OnOKClick - - - - - - - - diff --git a/fdmdv2/variants/fdmdv2basic/gui.h b/fdmdv2/variants/fdmdv2basic/gui.h deleted file mode 100644 index a32529e6..00000000 --- a/fdmdv2/variants/fdmdv2basic/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 - -/////////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////////////// -/// Class MainDialogBase -/////////////////////////////////////////////////////////////////////////////// -class MainDialogBase : public wxDialog -{ - private: - - protected: - wxStaticText* m_staticText1; - wxComboBox* m_comboRxIn; - wxStaticText* m_staticText2; - wxComboBox* m_comboRxOut; - wxStaticText* m_staticText3; - wxComboBox* m_comboTxIn; - wxStaticText* m_staticText4; - wxComboBox* m_comboTxOut; - wxStaticText* m_staticText111; - wxComboBox* m_comboBox111; - wxStaticText* m_staticText211; - wxComboBox* m_comboBox211; - wxStaticText* m_staticText11; - wxComboBox* m_comboBox11; - wxStaticText* m_staticText21; - wxComboBox* m_comboBox21; - wxToggleButton* m_toggleStartStop; - wxToggleButton* m_toggleRxTx; - wxStaticLine* m_staticLine; - wxStdDialogButtonSizer* m_sdbSizer; - wxButton* m_sdbSizerCancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnCloseDialog( wxCloseEvent& event ) { event.Skip(); } - virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } - virtual void OnRxInSelect( wxCommandEvent& event ) { event.Skip(); } - virtual void OnRxOutSelect( wxCommandEvent& event ) { event.Skip(); } - virtual void OnTxInSelect( wxCommandEvent& event ) { event.Skip(); } - virtual void OnTxOutSelect( wxCommandEvent& event ) { event.Skip(); } - virtual void OnRadioSelect( wxCommandEvent& event ) { event.Skip(); } - virtual void OnPortSelect( wxCommandEvent& event ) { event.Skip(); } - virtual void OnToggleStartStop( wxCommandEvent& event ) { event.Skip(); } - virtual void OnToggleRxRx( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } - - - public: - - MainDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("FDMDV2Basic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 523,526 ), long style = wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~MainDialogBase(); - -}; - -#endif //__GUI_H__ diff --git a/fdmdv2/variants/fdmdv2basic/gui.py b/fdmdv2/variants/fdmdv2basic/gui.py deleted file mode 100644 index e2052cbe..00000000 --- a/fdmdv2/variants/fdmdv2basic/gui.py +++ /dev/null @@ -1,216 +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 MainDialogBase -########################################################################### - -class MainDialogBase ( wx.Dialog ): - - def __init__( self, parent ): - wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"FDMDV2Basic"), pos = wx.DefaultPosition, size = wx.Size( 523,526 ), style = wx.CLOSE_BOX|wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER ) - - self.SetSizeHintsSz( wx.Size( -1,-1 ), wx.DefaultSize ) - - mainSizer = wx.BoxSizer( wx.VERTICAL ) - - bSizer2 = wx.BoxSizer( wx.HORIZONTAL ) - - sbSizer1 = wx.StaticBoxSizer( wx.StaticBox( self, wx.ID_ANY, _(u"Settings") ), wx.VERTICAL ) - - gSizer4 = wx.GridSizer( 3, 1, 0, 0 ) - - sbSizer3 = wx.StaticBoxSizer( wx.StaticBox( self, wx.ID_ANY, _(u"Audio") ), wx.VERTICAL ) - - gSizer1 = wx.GridSizer( 4, 2, 0, 0 ) - - self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, _(u"Rx In (radio):"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText1.Wrap( -1 ) - gSizer1.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - m_comboRxInChoices = [] - self.m_comboRxIn = wx.ComboBox( self, wx.ID_ANY, _(u""), wx.DefaultPosition, wx.DefaultSize, m_comboRxInChoices, 0 ) - gSizer1.Add( self.m_comboRxIn, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 2 ) - - self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, _(u"Rx Out (spkr):"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText2.Wrap( -1 ) - gSizer1.Add( self.m_staticText2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - m_comboRxOutChoices = [] - self.m_comboRxOut = wx.ComboBox( self, wx.ID_ANY, _(u""), wx.DefaultPosition, wx.DefaultSize, m_comboRxOutChoices, 0 ) - gSizer1.Add( self.m_comboRxOut, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 2 ) - - self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, _(u"Tx In (mic):"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText3.Wrap( -1 ) - gSizer1.Add( self.m_staticText3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - m_comboTxInChoices = [] - self.m_comboTxIn = wx.ComboBox( self, wx.ID_ANY, _(u""), wx.DefaultPosition, wx.DefaultSize, m_comboTxInChoices, 0 ) - gSizer1.Add( self.m_comboTxIn, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 2 ) - - self.m_staticText4 = wx.StaticText( self, wx.ID_ANY, _(u"Tx Out (radio):"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText4.Wrap( -1 ) - gSizer1.Add( self.m_staticText4, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - m_comboTxOutChoices = [] - self.m_comboTxOut = wx.ComboBox( self, wx.ID_ANY, _(u""), wx.DefaultPosition, wx.DefaultSize, m_comboTxOutChoices, 0 ) - gSizer1.Add( self.m_comboTxOut, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 2 ) - - - sbSizer3.Add( gSizer1, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.EXPAND|wx.FIXED_MINSIZE, 2 ) - - - gSizer4.Add( sbSizer3, 1, wx.ALIGN_CENTER|wx.ALIGN_CENTER_HORIZONTAL|wx.EXPAND|wx.FIXED_MINSIZE, 5 ) - - sbSizer4 = wx.StaticBoxSizer( wx.StaticBox( self, wx.ID_ANY, _(u"label") ), wx.VERTICAL ) - - gSizer111 = wx.GridSizer( 2, 2, 0, 0 ) - - self.m_staticText111 = wx.StaticText( self, wx.ID_ANY, _(u"Rate:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText111.Wrap( -1 ) - gSizer111.Add( self.m_staticText111, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - m_comboBox111Choices = [] - self.m_comboBox111 = wx.ComboBox( self, wx.ID_ANY, _(u"Combo!"), wx.DefaultPosition, wx.DefaultSize, m_comboBox111Choices, 0 ) - gSizer111.Add( self.m_comboBox111, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 2 ) - - self.m_staticText211 = wx.StaticText( self, wx.ID_ANY, _(u"MyLabel"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText211.Wrap( -1 ) - gSizer111.Add( self.m_staticText211, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - m_comboBox211Choices = [] - self.m_comboBox211 = wx.ComboBox( self, wx.ID_ANY, _(u"Combo!"), wx.DefaultPosition, wx.DefaultSize, m_comboBox211Choices, 0 ) - gSizer111.Add( self.m_comboBox211, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 2 ) - - - sbSizer4.Add( gSizer111, 0, wx.ALIGN_CENTER|wx.EXPAND|wx.FIXED_MINSIZE, 2 ) - - - gSizer4.Add( sbSizer4, 1, wx.EXPAND|wx.FIXED_MINSIZE, 5 ) - - sbSizer5 = wx.StaticBoxSizer( wx.StaticBox( self, wx.ID_ANY, _(u"Comm Port") ), wx.VERTICAL ) - - gSizer11 = wx.GridSizer( 2, 2, 0, 0 ) - - self.m_staticText11 = wx.StaticText( self, wx.ID_ANY, _(u"Radio:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText11.Wrap( -1 ) - gSizer11.Add( self.m_staticText11, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - m_comboBox11Choices = [] - self.m_comboBox11 = wx.ComboBox( self, wx.ID_ANY, _(u"Combo!"), wx.DefaultPosition, wx.DefaultSize, m_comboBox11Choices, 0 ) - gSizer11.Add( self.m_comboBox11, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 2 ) - - self.m_staticText21 = wx.StaticText( self, wx.ID_ANY, _(u"Port:"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText21.Wrap( -1 ) - gSizer11.Add( self.m_staticText21, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - - m_comboBox21Choices = [] - self.m_comboBox21 = wx.ComboBox( self, wx.ID_ANY, _(u"Combo!"), wx.DefaultPosition, wx.DefaultSize, m_comboBox21Choices, 0 ) - gSizer11.Add( self.m_comboBox21, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 2 ) - - - sbSizer5.Add( gSizer11, 0, wx.ALIGN_CENTER|wx.EXPAND|wx.FIXED_MINSIZE, 2 ) - - - gSizer4.Add( sbSizer5, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.EXPAND, 5 ) - - - sbSizer1.Add( gSizer4, 1, wx.EXPAND, 5 ) - - - bSizer2.Add( sbSizer1, 1, wx.EXPAND, 5 ) - - sbSizer2 = wx.StaticBoxSizer( wx.StaticBox( self, wx.ID_ANY, _(u"Operation") ), wx.VERTICAL ) - - self.m_toggleStartStop = wx.ToggleButton( self, wx.ID_ANY, _(u"Start"), wx.DefaultPosition, wx.DefaultSize, 0 ) - sbSizer2.Add( self.m_toggleStartStop, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALL|wx.EXPAND, 5 ) - - self.m_toggleRxTx = wx.ToggleButton( self, wx.ID_ANY, _(u"Tx"), wx.DefaultPosition, wx.DefaultSize, 0 ) - sbSizer2.Add( self.m_toggleRxTx, 2, wx.ALIGN_CENTER_HORIZONTAL|wx.ALL|wx.EXPAND, 5 ) - - - bSizer2.Add( sbSizer2, 0, wx.EXPAND, 5 ) - - - mainSizer.Add( bSizer2, 1, wx.EXPAND, 5 ) - - self.m_staticLine = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - mainSizer.Add( self.m_staticLine, 0, wx.EXPAND |wx.ALL, 5 ) - - m_sdbSizer = wx.StdDialogButtonSizer() - self.m_sdbSizerCancel = wx.Button( self, wx.ID_CANCEL ) - m_sdbSizer.AddButton( self.m_sdbSizerCancel ) - m_sdbSizer.Realize(); - - mainSizer.Add( m_sdbSizer, 0, wx.ALIGN_RIGHT|wx.BOTTOM|wx.RIGHT, 5 ) - - - self.SetSizer( mainSizer ) - self.Layout() - - self.Centre( wx.BOTH ) - - # Connect Events - self.Bind( wx.EVT_CLOSE, self.OnCloseDialog ) - self.Bind( wx.EVT_INIT_DIALOG, self.OnInitDialog ) - self.m_comboRxIn.Bind( wx.EVT_COMBOBOX, self.OnRxInSelect ) - self.m_comboRxOut.Bind( wx.EVT_COMBOBOX, self.OnRxOutSelect ) - self.m_comboTxIn.Bind( wx.EVT_COMBOBOX, self.OnTxInSelect ) - self.m_comboTxOut.Bind( wx.EVT_COMBOBOX, self.OnTxOutSelect ) - self.m_comboBox11.Bind( wx.EVT_COMBOBOX, self.OnRadioSelect ) - self.m_comboBox21.Bind( wx.EVT_COMBOBOX, self.OnPortSelect ) - self.m_toggleStartStop.Bind( wx.EVT_TOGGLEBUTTON, self.OnToggleStartStop ) - self.m_toggleRxTx.Bind( wx.EVT_TOGGLEBUTTON, self.OnToggleRxRx ) - self.m_sdbSizerCancel.Bind( wx.EVT_BUTTON, self.OnCancelClick ) - - def __del__( self ): - pass - - - # Virtual event handlers, overide them in your derived class - def OnCloseDialog( self, event ): - event.Skip() - - def OnInitDialog( self, event ): - event.Skip() - - def OnRxInSelect( self, event ): - event.Skip() - - def OnRxOutSelect( self, event ): - event.Skip() - - def OnTxInSelect( self, event ): - event.Skip() - - def OnTxOutSelect( self, event ): - event.Skip() - - def OnRadioSelect( self, event ): - event.Skip() - - def OnPortSelect( self, event ): - event.Skip() - - def OnToggleStartStop( self, event ): - event.Skip() - - def OnToggleRxRx( self, event ): - event.Skip() - - def OnCancelClick( self, event ): - event.Skip() - - diff --git a/fdmdv2/variants/fdmdv2basic/main.cpp b/fdmdv2/variants/fdmdv2basic/main.cpp deleted file mode 100644 index a8578d29..00000000 --- a/fdmdv2/variants/fdmdv2basic/main.cpp +++ /dev/null @@ -1,545 +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 MainDialog( NULL ) ); - GetTopWindow()->Show(); - - // true = enter the main loop - return true; -} - -//////////////////////////////////////////////////////////////////////////////// -// main application frame implementation -//////////////////////////////////////////////////////////////////////////////// - -MainDialog::MainDialog(wxWindow *parent) : MainDialogBase( parent ) -{ - m_RxRunning = false; - m_TxRunning = false; - if(Pa_Initialize()) - { - wxMessageBox(wxT("Port Audio failed to initialize"), wxT("Pa_Initialize"), wxOK); - } -} - -MainDialog::~MainDialog() -{ -} - -void MainDialog::OnInitDialog( wxInitDialogEvent& event ) -{ - populateAudioInfo(); -} - -//------------------------------------------------------------------------- -// populateStandardSampleRates() -//------------------------------------------------------------------------- -void MainDialog::populateStandardSampleRates( - wxComboBox* 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, - -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("%i %8.2f", printCount, STANDARD_SAMPLE_RATES[i]); - target->Append(tStr); - ++printCount; - } - } - if (printCount == 0) - { - tStr = "None\n"; - target->Append(tStr); - } -} - -//------------------------------------------------------------------------- -// OnActivate() -//------------------------------------------------------------------------- -int MainDialog::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); - wxComboBox* m_comboAudioCodec; - wxComboBox* m_comboCodecTx; - wxComboBox* m_comboRadioRx; - wxComboBox* m_comboCodecSpkr; -*/ - // 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_comboAudioCodec->Append(tStr); -// tStr.Printf(" for half-duplex 16 bit %i channel input = ", inputParameters.numChannels()); -// m_comboAudioCodec->InsertItems(1, &tStr, 0); -// m_comboAudioCodec->Append(tStr); - populateStandardSampleRates(m_comboRxIn, inputParameters, portaudio::DirectionSpecificStreamParameters::null()); - } - if (outputParameters.numChannels() > 0) - { -// tStr = "Supported standard Output sample rates\n"; -// m_comboRadioRx->Append(tStr); -// tStr.Printf(" for half-duplex 16 bit %i channel output = ", outputParameters.numChannels()); -// m_comboRadioRx->Append(tStr); - populateStandardSampleRates(m_comboRxOut, portaudio::DirectionSpecificStreamParameters::null(), outputParameters); - } - if (inputParameters.numChannels() > 0 && inputParameters.numChannels() > 0) - { -// tStr = "Supported full-duplex sample rates\n"; -// m_comboCodecTx->Append(tStr); -// tStr.Printf(" for full-duplex 16 bit %i channel input, %i", inputParameters.numChannels(), outputParameters.numChannels()); -// m_comboCodecTx->InsertItems(1, &tStr, 0); -// m_comboCodecTx->Append(tStr); - populateStandardSampleRates(m_comboTxIn, inputParameters, outputParameters); - } - if (outputParameters.numChannels() > 0 && outputParameters.numChannels() > 0) - { -// tStr = "Supported full-duplex sample rates\n"; -// m_comboCodecSpkr->Append(tStr); -// tStr.Printf(" for full-duplex 16 bit %i channel input, %i", inputParameters.numChannels(), outputParameters.numChannels()); -// m_comboCodecTx->InsertItems(1, &tStr, 0); - populateStandardSampleRates(m_comboTxOut, inputParameters, outputParameters); - } - } - } - catch (const portaudio::PaException &e) - { - tStr.Printf("A PortAudio error occured: %s\n", e.paErrorText()); - wxMessageBox(tStr, wxT("Portaudio exception"), wxOK); - } - catch (const portaudio::PaCppException &e) - { - tStr.Printf("A PortAudioCpp error occured: %s\n", e.what()); - wxMessageBox(tStr, wxT("PortAudioCpp error"), wxOK); - } - catch (const std::exception &e) - { - tStr.Printf("A generic exception occured: %s\n", e.what()); - wxMessageBox(tStr, wxT("Generic Exception"), wxOK); - } - catch (...) - { - tStr.Printf("An unknown exception occured.\n"); - wxMessageBox(tStr, wxT("Unknown error"), wxOK); - } - return 0; -} - -void MainDialog::OnToggleStartStop( wxCommandEvent& event ) -{ - if((!m_TxRunning) || (!m_RxRunning)) - { - startRxStream(); - startTxStream(); - } - else - { - stopRxStream(); - stopTxStream(); - } -} - -void MainDialog::OnToggleRxRx( wxCommandEvent& event ) -{ -} - -void MainDialog::OnRxInSelect(wxCommandEvent& event) -{ -} - -void MainDialog::OnRxOutSelect(wxCommandEvent& event) -{ -} - -void MainDialog::OnTxInSelect(wxCommandEvent& event) -{ -} - -void MainDialog::OnTxOutSelect(wxCommandEvent& event) -{ -} - -void MainDialog::OnRadioSelect(wxCommandEvent& event) -{ -} - -void MainDialog::OnPortSelect(wxCommandEvent& event) -{ -} - -void MainDialog::OnCloseDialog(wxCloseEvent& event) -{ - Pa_Terminate(); - Destroy(); -} - -void MainDialog::OnOKClick(wxCommandEvent& event) -{ - Pa_Terminate(); - Destroy(); -} - -void MainDialog::OnCancelClick(wxCommandEvent& event) -{ - Pa_Terminate(); - Destroy(); -} - -//------------------------------------------------------------------------- -// rxCallback() -//------------------------------------------------------------------------- -static int rxCallback( const void *inBuffer, - void *outBuffer, - unsigned long framesPerBuffer, - const PaStreamCallbackTimeInfo *outTime, - PaStreamCallbackFlags statusFlags, - void *userData - ) -{ - float *out = (float *) outBuffer; - float *in = (float *) inBuffer; - float leftIn; - float rightIn; - unsigned int i; - - if(inBuffer == NULL) - { - return 0; - } - // Read input buffer, process data, and fill output buffer. - for(i = 0; i < framesPerBuffer; i++) - { - leftIn = *in++; // Get interleaved samples from input buffer. - rightIn = *in++; - *out++ = leftIn * rightIn; // ring modulation - *out++ = 0.5f * (leftIn + rightIn); // mixing - } - return paContinue; // 0; -} - -//------------------------------------------------------------------------- -// txCallback() -//------------------------------------------------------------------------- -static int txCallback( const void *inBuffer, - void *outBuffer, - unsigned long framesPerBuffer, - const PaStreamCallbackTimeInfo *outTime, - PaStreamCallbackFlags statusFlags, - void *userData - ) -{ - float *out = (float *) outBuffer; - float *in = (float *) inBuffer; - float leftIn; - float rightIn; - unsigned int i; - - if(inBuffer == NULL) - { - return 0; - } - // Read input buffer, process data, and fill output buffer. - for(i = 0; i < framesPerBuffer; i++) - { - leftIn = *in++; // Get interleaved samples from input buffer. - rightIn = *in++; - *out++ = leftIn * rightIn; // ring modulation - *out++ = 0.5f * (leftIn + rightIn); // mixing - } - return paContinue; // 0; -} - -//------------------------------------------------------------------------- -// startRxStream() -//------------------------------------------------------------------------- -void MainDialog::startRxStream() -{ - if(!m_RxRunning) - { - m_RxRunning = true; - m_rxPa = new PortAudioWrap(); - - m_rxDevIn = m_rxPa->getDefaultInputDevice(); // default input device - if(m_rxDevIn == paNoDevice) - { - wxMessageBox(wxT("Rx Error: No default input device."), wxT("Error"), wxOK); - return; - } - m_rxErr = m_rxPa->setInputDevice(m_rxDevIn); - m_rxErr = m_rxPa->setInputChannelCount(2); // stereo input - m_rxErr = m_rxPa->setInputSampleFormat(PA_SAMPLE_TYPE); - m_rxErr = m_rxPa->setInputLatency(m_rxPa->getInputDefaultLowLatency()); - m_rxPa->setInputHostApiStreamInfo(NULL); - - m_rxDevOut = m_rxPa->getDefaultOutputDevice(); // default output device - if (m_rxDevOut == paNoDevice) - { - wxMessageBox(wxT("Rx Error: No default output device."), wxT("Error"), wxOK); - return; - } - m_rxErr = m_rxPa->setOutputDevice(m_rxDevOut); - m_rxErr = m_rxPa->setOutputChannelCount(2); // stereo input - m_rxErr = m_rxPa->setOutputSampleFormat(PA_SAMPLE_TYPE); - - m_rxErr = m_rxPa->setOutputLatency(m_rxPa->getOutputDefaultLowLatency()); - m_rxPa->setOutputHostApiStreamInfo(NULL); - - m_rxErr = m_rxPa->setFramesPerBuffer(FRAMES_PER_BUFFER); - m_rxErr = m_rxPa->setSampleRate(SAMPLE_RATE); - m_rxErr = m_rxPa->setStreamFlags(0); - m_rxErr = m_rxPa->setCallback(rxCallback); - m_rxErr = m_rxPa->streamOpen(); - - if(m_rxErr != paNoError) - { - wxMessageBox(wxT("Rx Stream Open/Setup error."), wxT("Error"), wxOK); - return; - } - m_rxErr = m_rxPa->streamStart(); - if(m_rxErr != paNoError) - { - wxMessageBox(wxT("Rx Stream Start Error."), wxT("Error"), wxOK); - return; - } - m_toggleStartStop->SetLabel(wxT("Stop")); - } -} - -//------------------------------------------------------------------------- -// stopRxStream() -//------------------------------------------------------------------------- -void MainDialog::stopRxStream() -{ - if(m_RxRunning) - { - m_RxRunning = false; - m_rxPa->stop(); - m_rxPa->streamClose(); - m_toggleStartStop->SetLabel(wxT("Start")); - } -} - -//------------------------------------------------------------------------- -// abortRxStream() -//------------------------------------------------------------------------- -void MainDialog::abortRxStream() -{ - if(m_RxRunning) - { - m_RxRunning = false; - m_rxPa->abort(); - m_toggleStartStop->SetLabel(wxT("Start")); - } -} - -//------------------------------------------------------------------------- -// startTxStream() -//------------------------------------------------------------------------- -void MainDialog::startTxStream() -{ - if(!m_TxRunning) - { - m_TxRunning = true; - m_txPa = new PortAudioWrap(); - - m_txDevIn = m_txPa->getDefaultInputDevice(); // default input device - if(m_txDevIn == paNoDevice) - { - wxMessageBox(wxT("Tx Error: No default input device."), wxT("Error"), wxOK); - return; - } - m_txErr = m_txPa->setInputDevice(m_txDevIn); - m_txErr = m_txPa->setInputChannelCount(2); // stereo input - m_txErr = m_txPa->setInputSampleFormat(PA_SAMPLE_TYPE); - m_txErr = m_txPa->setInputLatency(m_txPa->getInputDefaultLowLatency()); - m_txPa->setInputHostApiStreamInfo(NULL); - - m_txDevOut = m_txPa->getDefaultOutputDevice(); // default output device - if (m_txDevOut == paNoDevice) - { - wxMessageBox(wxT("Tx Error: No default output device."), wxT("Error"), wxOK); - return; - } - m_txErr = m_txPa->setOutputDevice(m_txDevOut); - m_txErr = m_txPa->setOutputChannelCount(2); // stereo input - m_txErr = m_txPa->setOutputSampleFormat(PA_SAMPLE_TYPE); - - m_txErr = m_txPa->setOutputLatency(m_txPa->getOutputDefaultLowLatency()); - m_txPa->setOutputHostApiStreamInfo(NULL); - - m_txErr = m_txPa->setFramesPerBuffer(FRAMES_PER_BUFFER); - m_txErr = m_txPa->setSampleRate(SAMPLE_RATE); - m_txErr = m_txPa->setStreamFlags(0); - m_txErr = m_txPa->setCallback(txCallback); - m_txErr = m_txPa->streamOpen(); - - if(m_txErr != paNoError) - { - wxMessageBox(wxT("Tx Stream Open/Setup error."), wxT("Error"), wxOK); - return; - } - m_txErr = m_txPa->streamStart(); - if(m_txErr != paNoError) - { - wxMessageBox(wxT("Tx Stream Start Error."), wxT("Error"), wxOK); - return; - } - m_toggleStartStop->SetLabel(wxT("Stop")); - } -} - -//------------------------------------------------------------------------- -// stopTxStream() -//------------------------------------------------------------------------- -void MainDialog::stopTxStream() -{ - if(m_TxRunning) - { - m_TxRunning = false; - m_txPa->stop(); - m_txPa->streamClose(); - m_toggleStartStop->SetLabel(wxT("Start")); - } -} - -//------------------------------------------------------------------------- -// abortTxStream() -//------------------------------------------------------------------------- -void MainDialog::abortTxStream() -{ - if(m_TxRunning) - { - m_TxRunning = false; - m_txPa->abort(); - m_toggleStartStop->SetLabel(wxT("Start")); - } -} diff --git a/fdmdv2/variants/fdmdv2basic/main.h b/fdmdv2/variants/fdmdv2basic/main.h deleted file mode 100644 index a8326ee1..00000000 --- a/fdmdv2/variants/fdmdv2basic/main.h +++ /dev/null @@ -1,97 +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 - -// Necessary Audio Stuff -#include "../libsndfile/include/sndfile.h" -#include "../extern/include/portaudio.h" -#include "../extern/include/portaudiocpp/PortAudioCpp.hxx" -#ifdef WIN32 -#include "../extern/include/portaudiocpp/AsioDeviceAdapter.hxx" -#endif -#include "paclass.h" - -// Fdmdv2 & Codec2 stuff -#include "C:\Users\wittend\Projects\Radio\codec2-dev\src\codec2.h" -#include "C:\Users\wittend\Projects\Radio\codec2-dev\src\fdmdv.h" - -// 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 MainDialog : public MainDialogBase -{ - public: - MainDialog( wxWindow *parent ); - virtual ~MainDialog(); - bool m_RxRunning; - bool m_TxRunning; - CODEC2 *m_RXCodec2; - CODEC2 *m_TXCodec2; - PortAudioWrap *m_rxPa; - PortAudioWrap *m_txPa; - PaDeviceIndex m_rxDevIn; - PaDeviceIndex m_rxDevOut; - PaDeviceIndex m_txDevIn; - PaDeviceIndex m_txDevOut; - PaError m_rxErr; - PaError m_txErr; - - protected: - // protected event handlers - void startTxStream(); - void startRxStream(); - void stopTxStream(); - void stopRxStream(); - void abortTxStream(); - void abortRxStream(); - void OnInitDialog( wxInitDialogEvent& event ); - void OnCloseDialog( wxCloseEvent& event ); - void OnOKClick( wxCommandEvent& event ); - void OnCancelClick( wxCommandEvent& event ); - void OnToggleStartStop( wxCommandEvent& event ); - void OnToggleRxRx( wxCommandEvent& event ); - void OnRxInSelect( wxCommandEvent& event ); - void OnRxOutSelect( wxCommandEvent& event ); - void OnTxInSelect( wxCommandEvent& event ); - void OnTxOutSelect( wxCommandEvent& event ); - void OnRadioSelect( wxCommandEvent& event ); - void OnPortSelect( wxCommandEvent& event ); - - void populateStandardSampleRates(wxComboBox* target, const portaudio::DirectionSpecificStreamParameters &inputParameters, const portaudio::DirectionSpecificStreamParameters &outputParameters); - int populateAudioInfo(); - -}; - -#endif //__main__ diff --git a/fdmdv2/variants/fdmdv2basic/paclass.cpp b/fdmdv2/variants/fdmdv2basic/paclass.cpp deleted file mode 100644 index 6e98b3b3..00000000 --- a/fdmdv2/variants/fdmdv2basic/paclass.cpp +++ /dev/null @@ -1,211 +0,0 @@ -#include "paclass.h" - -PortAudioWrap::PortAudioWrap() -{ - stream = NULL; - userData = NULL; - samplerate = 0; - framesPerBuffer = 0; - statusFlags = 0; - streamCallback = NULL; - streamFinishedCallback = NULL; - timeInfo = 0; -} - -PortAudioWrap::~PortAudioWrap() -{ -} - -//PaError PortAudioWrap::init() -//{ -// return Pa_Initialize(); -//} - -PaError PortAudioWrap::streamOpen() -{ - return Pa_OpenStream( - &stream, - &inputBuffer, - &outputBuffer, - samplerate, - framesPerBuffer, - statusFlags, - *streamCallback, - userData - ); -} - -PaError PortAudioWrap::streamStart() -{ - return Pa_StartStream(stream); -} - -PaError PortAudioWrap::streamClose() -{ - if(isOpen()) - { - PaError rv = Pa_CloseStream(stream); - return rv; - } - else - { - return paNoError; - } -} - -void PortAudioWrap::terminate() -{ - if(Pa_IsStreamStopped(stream) != paNoError) - { - Pa_StopStream(stream); - } - Pa_Terminate(); -} - -void PortAudioWrap::stop() -{ - Pa_StopStream(stream); -} - -void PortAudioWrap::abort() -{ - Pa_AbortStream(stream); -} - -bool PortAudioWrap::isStopped() const -{ - PaError ret = Pa_IsStreamStopped(stream); - return ret; -} - -bool PortAudioWrap::isActive() const -{ - PaError ret = Pa_IsStreamActive(stream); - return ret; -} - -bool PortAudioWrap::isOpen() const -{ - return (stream != NULL); -} - -PaDeviceIndex PortAudioWrap::getDefaultInputDevice() -{ - return Pa_GetDefaultInputDevice(); -} - -PaDeviceIndex PortAudioWrap::getDefaultOutputDevice() -{ - return Pa_GetDefaultOutputDevice(); -} - -PaError PortAudioWrap::setInputChannelCount(int count) -{ - inputBuffer.channelCount = count; - return paNoError; -} - -PaError PortAudioWrap::getInputChannelCount() -{ - return inputBuffer.channelCount; -} - -PaError PortAudioWrap::setInputSampleFormat(PaSampleFormat format) -{ - inputBuffer.sampleFormat = format; - return paNoError; -} - -PaError PortAudioWrap::setInputLatency(PaTime latency) -{ - inputBuffer.suggestedLatency = latency; - return paNoError; -} - -void PortAudioWrap::setInputHostApiStreamInfo(void *info) -{ - inputBuffer.hostApiSpecificStreamInfo = info; -} - -PaTime PortAudioWrap::getInputDefaultLowLatency() -{ - return Pa_GetDeviceInfo(inputBuffer.device)->defaultLowInputLatency; -} - -PaError PortAudioWrap::setOutputChannelCount(int count) -{ - outputBuffer.channelCount = count; - return paNoError; -} - -int PortAudioWrap::getOutputChannelCount() -{ - return outputBuffer.channelCount; -} - -const char *PortAudioWrap::getDeviceName(PaDeviceIndex dev) -{ - const PaDeviceInfo *info; - info = Pa_GetDeviceInfo(dev); - return info->name; -} - -PaError PortAudioWrap::setOutputSampleFormat(PaSampleFormat format) -{ - outputBuffer.sampleFormat = format; - return paNoError; -} - -PaError PortAudioWrap::setOutputLatency(PaTime latency) -{ - outputBuffer.suggestedLatency = latency; - return paNoError; -} - -void PortAudioWrap::setOutputHostApiStreamInfo(void *info) -{ - outputBuffer.hostApiSpecificStreamInfo = info; -} - -PaTime PortAudioWrap::getOutputDefaultLowLatency() -{ - return Pa_GetDeviceInfo(outputBuffer.device)->defaultLowOutputLatency; -} - -PaError PortAudioWrap::setFramesPerBuffer(unsigned long size) -{ - framesPerBuffer = size; - return paNoError; -} - -PaError PortAudioWrap::setSampleRate(unsigned long rate) -{ - samplerate = rate; - return paNoError; -} - -PaError PortAudioWrap::setStreamFlags(PaStreamFlags flags) -{ - statusFlags = flags; - return paNoError; -} - -PaError PortAudioWrap::setInputDevice(PaDeviceIndex index) -{ -// inputDevice = index; - inputBuffer.device = index; - return paNoError; -} - -PaError PortAudioWrap::setOutputDevice(PaDeviceIndex index) -{ -// outputDevice = index; - outputBuffer.device = index; - return paNoError; -} - -PaError PortAudioWrap::setCallback(PaStreamCallback *callback) -{ - streamCallback = callback; - return paNoError; -} diff --git a/fdmdv2/variants/fdmdv2basic/paclass.h b/fdmdv2/variants/fdmdv2basic/paclass.h deleted file mode 100644 index a20b272f..00000000 --- a/fdmdv2/variants/fdmdv2basic/paclass.h +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include -#include "portaudio.h" - -// Note that many of the older ISA sound cards on PCs do NOT support -// full duplex audio (simultaneous record and playback). -// And some only support full duplex at lower sample rates. -#define SAMPLE_RATE (44100) -#define PA_SAMPLE_TYPE paFloat32 //paInt16 -#define FRAMES_PER_BUFFER (64) - -typedef float SAMPLE; - -float CubicAmplifier(float input); - -class PortAudioWrap -{ - public: - PortAudioWrap(); - ~PortAudioWrap(); - - private: - PaStream *stream; - PaStreamParameters inputBuffer; - PaStreamParameters outputBuffer; - void *userData; - int samplerate; - unsigned long framesPerBuffer; - PaStreamCallbackFlags statusFlags; - PaStreamCallback *streamCallback; - PaStreamFinishedCallback *streamFinishedCallback; - const PaStreamCallbackTimeInfo *timeInfo; - - public: - - PaError streamOpen(); - - PaDeviceIndex getDefaultInputDevice(); - PaDeviceIndex getDefaultOutputDevice(); - - PaStreamParameters *getDeviceInfo(PaDeviceIndex idx); - PaError setFramesPerBuffer(unsigned long size); - PaError setSampleRate(unsigned long size); - PaError setStreamFlags(PaStreamFlags flags); - PaError setCallback(PaStreamCallback *streamCallback); - PaError setStreamCallback(PaStream *stream, PaStreamCallback* callback ) { streamCallback = callback; return 0;} - PaError setStreamFinishedCallback(PaStream *stream, PaStreamFinishedCallback* streamFinishedCallback ); - - PaError setInputDevice(PaDeviceIndex dev); - PaError setInputChannelCount(int count); - int getInputChannelCount(); - PaError setInputSampleFormat(PaSampleFormat format); - PaError setInputSampleRate(PaSampleFormat format); - PaError setInputLatency(PaTime latency); - void setInputHostApiStreamInfo(void *info = NULL); - PaTime getInputDefaultLowLatency(); - const char *getDeviceName(PaDeviceIndex dev); - - PaError setOutputDevice(PaDeviceIndex dev); - PaError setOutputChannelCount(int count); - int getOutputChannelCount(); - PaError setOutputSampleFormat(PaSampleFormat format); - PaError setOutputLatency(PaTime latency); - void setOutputHostApiStreamInfo(void *info = NULL); - PaTime getOutputDefaultLowLatency(); - -// PaError init(); - PaError streamStart(); - PaError streamClose(); - void terminate(); - bool isOpen() const; - void stop(); - void abort(); - bool isStopped() const; - bool isActive() const; -}; diff --git a/fdmdv2/variants/fdmdv2dll/.cdf b/fdmdv2/variants/fdmdv2dll/.cdf deleted file mode 100644 index 4e6600d3..00000000 --- a/fdmdv2/variants/fdmdv2dll/.cdf +++ /dev/null @@ -1,7 +0,0 @@ -[CatalogHeader] -Name=.cat -ResultDir=C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll - -[CatalogFiles] -= -= diff --git a/fdmdv2/variants/fdmdv2dll/ReadMe.txt b/fdmdv2/variants/fdmdv2dll/ReadMe.txt deleted file mode 100644 index 4657c08c..00000000 --- a/fdmdv2/variants/fdmdv2dll/ReadMe.txt +++ /dev/null @@ -1,40 +0,0 @@ -======================================================================== - DYNAMIC LINK LIBRARY : win32-project Project Overview -======================================================================== - -AppWizard has created this win32-project DLL for you. - -This file contains a summary of what you will find in each of the files that -make up your win32-project application. - - -win32-project.vcxproj - This is the main project file for VC++ projects generated using an Application Wizard. - It contains information about the version of Visual C++ that generated the file, and - information about the platforms, configurations, and project features selected with the - Application Wizard. - -win32-project.vcxproj.filters - This is the filters file for VC++ projects generated using an Application Wizard. - It contains information about the association between the files in your project - and the filters. This association is used in the IDE to show grouping of files with - similar extensions under a specific node (for e.g. ".cpp" files are associated with the - "Source Files" filter). - -win32-project.cpp - This is the main DLL source file. - -///////////////////////////////////////////////////////////////////////////// -Other standard files: - -StdAfx.h, StdAfx.cpp - These files are used to build a precompiled header (PCH) file - named win32-project.pch and a precompiled types file named StdAfx.obj. - -///////////////////////////////////////////////////////////////////////////// -Other notes: - -AppWizard uses "TODO:" comments to indicate parts of the source code you -should add to or customize. - -///////////////////////////////////////////////////////////////////////////// diff --git a/fdmdv2/variants/fdmdv2dll/Release/fdmdv2-dll.dll b/fdmdv2/variants/fdmdv2dll/Release/fdmdv2-dll.dll deleted file mode 100644 index f4baa09f..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/Release/fdmdv2-dll.dll and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/Release/fdmdv2-dll.lib b/fdmdv2/variants/fdmdv2dll/Release/fdmdv2-dll.lib deleted file mode 100644 index 1bcac2da..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/Release/fdmdv2-dll.lib and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/dllmain.cpp b/fdmdv2/variants/fdmdv2dll/dllmain.cpp deleted file mode 100644 index eaa3831f..00000000 --- a/fdmdv2/variants/fdmdv2dll/dllmain.cpp +++ /dev/null @@ -1,20 +0,0 @@ -// dllmain.cpp : Defines the entry point for the DLL application. -#include "stdafx.h" - -BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) -{ - switch (ul_reason_for_call) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: - { - //Disable thread notifications - DisableThreadLibraryCalls(hModule); - }; - break; - } - return TRUE; -} - diff --git a/fdmdv2/variants/fdmdv2dll/fdmdv2-dll.aps b/fdmdv2/variants/fdmdv2dll/fdmdv2-dll.aps deleted file mode 100644 index e358da82..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/fdmdv2-dll.aps and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/fdmdv2-dll.cpp b/fdmdv2/variants/fdmdv2dll/fdmdv2-dll.cpp deleted file mode 100644 index 0d1f8b8e..00000000 --- a/fdmdv2/variants/fdmdv2dll/fdmdv2-dll.cpp +++ /dev/null @@ -1,1406 +0,0 @@ -/*---------------------------------------------------------------------------*\ - -FILE........: codec2-dll.cpp -AUTHOR......: David Witten -DATE CREATED: 21 May 2011 - -Wrapper for the Codec2 codec and fdmdv modem APIs. - -\*---------------------------------------------------------------------------*/ - -/* -All rights reserved. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License version 2.1, as -published by the Free Software Foundation. This program is -distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with this program; if not, see . -*/ -#define __USE_MATH_DEFINES - -#include "stdafx.h" -#include -#include -#include -#include -#include -#include - -#include "fdmdv_internal.h" -#include "fdmdv2-dll.h" -#include "rn.h" -#include "test_bits.h" -#include "pilot_coeff.h" -#include "fft.h" -#include "hanning.h" -#include "os.h" -/* -// This is an example of an exported variable -WIN32PROJECT_API int nwin32project=0; - -// This is an example of an exported function. -WIN32PROJECT_API int fnwin32project(void) -{ - return 42; -} - -// This is the constructor of a class that has been exported. -// see win32-project.h for the class definition -Cwin32project::Cwin32project() -{ - return; -} -*/ - -/*---------------------------------------------------------------------------*\ - -FILE........: fdmdv.c -AUTHOR......: David Rowe -DATE CREATED: April 14 2012 - -Functions that implement the FDMDV modem. - -\*---------------------------------------------------------------------------*/ - -/* -Copyright (C) 2012 David Rowe - -All rights reserved. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License version 2.1, as -published by the Free Software Foundation. This program is -distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with this program; if not, see . -*/ - -/*---------------------------------------------------------------------------*\ - -INCLUDES - -\*---------------------------------------------------------------------------*/ - -/*---------------------------------------------------------------------------*\ - -FUNCTIONS - -\*---------------------------------------------------------------------------*/ - - - -static inline double round(double val) -{ - return floor(val + 0.5); -} - - - -static COMP cneg(COMP a) -{ - COMP res; - - res.real = -a.real; - res.imag = -a.imag; - - return res; -} - -static COMP cconj(COMP a) -{ - COMP res; - - res.real = a.real; - res.imag = -a.imag; - - return res; -} - -static COMP cmult(COMP a, COMP b) -{ - COMP res; - - res.real = a.real*b.real - a.imag*b.imag; - res.imag = a.real*b.imag + a.imag*b.real; - - return res; -} - -static COMP fcmult(float a, COMP b) -{ - COMP res; - - res.real = a*b.real; - res.imag = a*b.imag; - - return res; -} - -static COMP cadd(COMP a, COMP b) -{ - COMP res; - - res.real = a.real + b.real; - res.imag = a.imag + b.imag; - - return res; -} - -static float cabsolute(COMP a) -{ - return sqrt((float)pow((float)a.real, (float)2.0) + (float)pow((float)a.imag, (float)2.0)); -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: fdmdv_create -AUTHOR......: David Rowe -DATE CREATED: 16/4/2012 - -Create and initialise an instance of the modem. Returns a pointer -to the modem states or NULL on failure. One set of states is -sufficient for a full duplex modem. - -\*---------------------------------------------------------------------------*/ - -WIN32PROJECT_API struct FDMDV *fdmdv_create(void) -{ - struct FDMDV *f; - int c, i, k; - float carrier_freq; - - assert(FDMDV_BITS_PER_FRAME == NC*NB); - assert(FDMDV_NOM_SAMPLES_PER_FRAME == M); - assert(FDMDV_MAX_SAMPLES_PER_FRAME == (M+M/P)); - - f = (struct FDMDV*)malloc(sizeof(struct FDMDV)); - if (f == NULL) - return NULL; - - f->current_test_bit = 0; - for(i=0; irx_test_bits_mem[i] = 0; - - f->tx_pilot_bit = 0; - - for(c=0; cprev_tx_symbols[c].real = 1.0; - f->prev_tx_symbols[c].imag = 0.0; - f->prev_rx_symbols[c].real = 1.0; - f->prev_rx_symbols[c].imag = 0.0; - - for(k=0; ktx_filter_memory[c][k].real = 0.0; - f->tx_filter_memory[c][k].imag = 0.0; - f->rx_filter_memory[c][k].real = 0.0; - f->rx_filter_memory[c][k].imag = 0.0; - } - - /* Spread initial FDM carrier phase out as far as possible. - This helped PAPR for a few dB. We don't need to adjust rx - phase as DQPSK takes care of that. */ - - f->phase_tx[c].real = cos(2.0*PI*c/(NC+1)); - f->phase_tx[c].imag = sin(2.0*PI*c/(NC+1)); - - f->phase_rx[c].real = 1.0; - f->phase_rx[c].imag = 0.0; - - for(k=0; krx_filter_mem_timing[c][k].real = 0.0; - f->rx_filter_mem_timing[c][k].imag = 0.0; - } - for(k=0; krx_baseband_mem_timing[c][k].real = 0.0; - f->rx_baseband_mem_timing[c][k].imag = 0.0; - } - } - - /* Set up frequency of each carrier */ - - for(c=0; cfreq[c].real = cos(2.0*PI*carrier_freq/FS); - f->freq[c].imag = sin(2.0*PI*carrier_freq/FS); - } - - for(c=NC/2; cfreq[c].real = cos(2.0*PI*carrier_freq/FS); - f->freq[c].imag = sin(2.0*PI*carrier_freq/FS); - } - - f->freq[NC].real = cos(2.0*PI*FCENTRE/FS); - f->freq[NC].imag = sin(2.0*PI*FCENTRE/FS); - - /* Generate DBPSK pilot Look Up Table (LUT) */ - - generate_pilot_lut(f->pilot_lut, &f->freq[NC]); - - /* freq Offset estimation states */ - - for(i=0; ipilot_baseband1[i].real = f->pilot_baseband2[i].real = 0.0; - f->pilot_baseband1[i].imag = f->pilot_baseband2[i].imag = 0.0; - } - f->pilot_lut_index = 0; - f->prev_pilot_lut_index = 3*M; - - for(i=0; ipilot_lpf1[i].real = f->pilot_lpf2[i].real = 0.0; - f->pilot_lpf1[i].imag = f->pilot_lpf2[i].imag = 0.0; - } - - f->foff = 0.0; - f->foff_rect.real = 1.0; - f->foff_rect.imag = 0.0; - f->foff_phase_rect.real = 1.0; - f->foff_phase_rect.imag = 0.0; - - f->fest_state = 0; - f->coarse_fine = COARSE; - - for(c=0; csig_est[c] = 0.0; - f->noise_est[c] = 0.0; - } - - return f; -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: fdmdv_destroy -AUTHOR......: David Rowe -DATE CREATED: 16/4/2012 - -Destroy an instance of the modem. - -\*---------------------------------------------------------------------------*/ - -WIN32PROJECT_API void fdmdv_destroy(struct FDMDV *fdmdv) -{ - assert(fdmdv != NULL); - free(fdmdv); -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: fdmdv_get_test_bits() -AUTHOR......: David Rowe -DATE CREATED: 16/4/2012 - -Generate a frame of bits from a repeating sequence of random data. OK so -it's not very random if it repeats but it makes syncing at the demod easier -for test purposes. - -\*---------------------------------------------------------------------------*/ - -WIN32PROJECT_API void fdmdv_get_test_bits(struct FDMDV *f, int tx_bits[]) -{ - int i; - - for(i=0; icurrent_test_bit]; - f->current_test_bit++; - if (f->current_test_bit > (NTEST_BITS-1)) - f->current_test_bit = 0; - } -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: bits_to_dqpsk_symbols() -AUTHOR......: David Rowe -DATE CREATED: 16/4/2012 - -Maps bits to parallel DQPSK symbols. Generate Nc+1 QPSK symbols from -vector of (1,Nc*Nb) input tx_bits. The Nc+1 symbol is the +1 -1 +1 -.... BPSK sync carrier. - -\*---------------------------------------------------------------------------*/ - -void bits_to_dqpsk_symbols(COMP tx_symbols[], COMP prev_tx_symbols[], int tx_bits[], int *pilot_bit) -{ - int c, msb, lsb; - COMP j = {0.0,1.0}; - - /* map tx_bits to to Nc DQPSK symbols */ - - for(c=0; cprev_tx_symbols, tx_bits, &fdmdv->tx_pilot_bit); - memcpy(fdmdv->prev_tx_symbols, tx_symbols, sizeof(COMP)*(NC+1)); - tx_filter(tx_baseband, tx_symbols, fdmdv->tx_filter_memory); - fdm_upconvert(tx_fdm, tx_baseband, fdmdv->phase_tx, fdmdv->freq); - - *sync_bit = fdmdv->tx_pilot_bit; -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: generate_pilot_fdm() -AUTHOR......: David Rowe -DATE CREATED: 19/4/2012 - -Generate M samples of DBPSK pilot signal for Freq offset estimation. - -\*---------------------------------------------------------------------------*/ - -void generate_pilot_fdm(COMP *pilot_fdm, int *bit, float *symbol, float *filter_mem, COMP *phase, COMP *freq) -{ - int i,j,k; - float tx_baseband[M]; - - /* +1 -1 +1 -1 DBPSK sync carrier, once filtered becomes (roughly) - two spectral lines at +/- RS/2 */ - - if (*bit) - *symbol = -*symbol; - else - *symbol = *symbol; - if (*bit) - *bit = 0; - else - *bit = 1; - - /* filter DPSK symbol to create M baseband samples */ - - filter_mem[NFILTER-1] = (float)(sqrt(2.0)/2) * *symbol; - for(i=0; ireal; - pilot_fdm[i].imag = sqrt(2.0)*2*tx_baseband[i] * phase->imag; - } -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: generate_pilot_lut() -AUTHOR......: David Rowe -DATE CREATED: 19/4/2012 - -Generate a 4M sample vector of DBPSK pilot signal. As the pilot signal -is periodic in 4M samples we can then use this vector as a look up table -for pilot signal generation in the demod. - -\*---------------------------------------------------------------------------*/ - -void generate_pilot_lut(COMP pilot_lut[], COMP *pilot_freq) -{ - int pilot_rx_bit = 0; - float pilot_symbol = sqrt(2.0); - COMP pilot_phase = {1.0, 0.0}; - float pilot_filter_mem[NFILTER]; - COMP pilot[M]; - int i,f; - - for(i=0; i= 4) - memcpy(&pilot_lut[M*(f-4)], pilot, M*sizeof(COMP)); - } - -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: lpf_peak_pick() -AUTHOR......: David Rowe -DATE CREATED: 20/4/2012 - -LPF and peak pick part of freq est, put in a function as we call it twice. - -\*---------------------------------------------------------------------------*/ - -void lpf_peak_pick(float *foff, float *max, COMP pilot_baseband[], COMP pilot_lpf[], COMP S[], int nin) -{ - int i,j,k; - int mpilot; - float mag, imax; - int ix; - float r; - - /* LPF cutoff 200Hz, so we can handle max +/- 200 Hz freq offset */ - - for(i=0; i imax) - { - imax = mag; - ix = i; - } - } - r = 2.0*200.0/MPILOTFFT; /* maps FFT bin to frequency in Hz */ - - if (ix >= MPILOTFFT/2) - *foff = (ix - MPILOTFFT)*r; - else - *foff = (ix)*r; - *max = imax; - -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: rx_est_freq_offset() -AUTHOR......: David Rowe -DATE CREATED: 19/4/2012 - -Estimate frequency offset of FDM signal using BPSK pilot. Note that -this algorithm is quite sensitive to pilot tone level wrt other -carriers, so test variations to the pilot amplitude carefully. - -\*---------------------------------------------------------------------------*/ - -float rx_est_freq_offset(struct FDMDV *f, float rx_fdm[], int nin) -{ - int i,j; - COMP pilot[M+M/P]; - COMP prev_pilot[M+M/P]; - float foff, foff1, foff2; - float max1, max2; - - assert(nin <= M+M/P); - - /* get pilot samples used for correlation/down conversion of rx signal */ - - for (i=0; ipilot_lut[f->pilot_lut_index]; - f->pilot_lut_index++; - if (f->pilot_lut_index >= 4*M) - f->pilot_lut_index = 0; - - prev_pilot[i] = f->pilot_lut[f->prev_pilot_lut_index]; - f->prev_pilot_lut_index++; - if (f->prev_pilot_lut_index >= 4*M) - f->prev_pilot_lut_index = 0; - } - - /* - Down convert latest M samples of pilot by multiplying by ideal - BPSK pilot signal we have generated locally. The peak of the - resulting signal is sensitive to the time shift between the - received and local version of the pilot, so we do it twice at - different time shifts and choose the maximum. - */ - - for(i=0; ipilot_baseband1[i] = f->pilot_baseband1[i+nin]; - f->pilot_baseband2[i] = f->pilot_baseband2[i+nin]; - } - - for(i=0,j=NPILOTBASEBAND-nin; ipilot_baseband1[j] = fcmult(rx_fdm[i], cconj(pilot[i])); - f->pilot_baseband2[j] = fcmult(rx_fdm[i], cconj(prev_pilot[i])); - } - - lpf_peak_pick(&foff1, &max1, f->pilot_baseband1, f->pilot_lpf1, f->S1, nin); - lpf_peak_pick(&foff2, &max2, f->pilot_baseband2, f->pilot_lpf2, f->S2, nin); - - if (max1 > max2) - foff = foff1; - else - foff = foff2; - - return foff; -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: freq_shift() -AUTHOR......: David Rowe -DATE CREATED: 26/4/2012 - -Frequency shift modem signal. - -\*---------------------------------------------------------------------------*/ - -void freq_shift(COMP rx_fdm_fcorr[], float rx_fdm[], float foff, COMP *foff_rect, COMP *foff_phase_rect, int nin) -{ - int i; - - foff_rect->real = cos(2.0*PI*foff/FS); - foff_rect->imag = sin(2.0*PI*foff/FS); - for(i=0; i M) - rx_timing -= M; - if (rx_timing < -M) - rx_timing += M; - - /* rx_filt_mem_timing contains M + Nfilter + M samples of the - baseband signal at rate M this enables us to resample the - filtered rx symbol with M sample precision once we have - rx_timing */ - - for(c=0; c= 0) && (d.imag >= 0)) { - msb = 0; lsb = 0; - } - if ((d.real < 0) && (d.imag >= 0)) { - msb = 0; lsb = 1; - } - if ((d.real < 0) && (d.imag < 0)) { - msb = 1; lsb = 0; - } - if ((d.real >= 0) && (d.imag < 0)) { - msb = 1; lsb = 1; - } - rx_bits[2*c] = msb; - rx_bits[2*c+1] = lsb; - } - - /* Extract DBPSK encoded Sync bit and fine freq offset estimate */ - - phase_difference[NC] = cmult(rx_symbols[NC], cconj(prev_rx_symbols[NC])); - if (phase_difference[NC].real < 0) { - *sync_bit = 1; - ferr = phase_difference[NC].imag; - } - else { - *sync_bit = 0; - ferr = -phase_difference[NC].imag; - } - - /* pilot carrier gets an extra pi/4 rotation to make it consistent - with other carriers, as we need it for snr_update and scatter - diagram */ - - phase_difference[NC] = cmult(phase_difference[NC], pi_on_4); - - return ferr; -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: snr_update() -AUTHOR......: David Rowe -DATE CREATED: 17 May 2012 - -Given phase differences update estimates of signal and noise levels. - -\*---------------------------------------------------------------------------*/ - -void snr_update(float sig_est[], float noise_est[], COMP phase_difference[]) -{ - float s[NC+1]; - COMP refl_symbols[NC+1]; - float n[NC+1]; - COMP pi_on_4; - int c; - - pi_on_4.real = cos(PI/4.0); - pi_on_4.imag = sin(PI/4.0); - - /* mag of each symbol is distance from origin, this gives us a - vector of mags, one for each carrier. */ - - for(c=0; crx_test_bits_mem[i] = f->rx_test_bits_mem[j]; - for(i=NTEST_BITS-FDMDV_BITS_PER_FRAME,j=0; irx_test_bits_mem[i] = rx_bits[j]; - - /* see how many bit errors we get when checked against test sequence */ - - *bit_errors = 0; - for(i=0; irx_test_bits_mem[i]; - //printf("%d %d %d %d\n", i, test_bits[i], f->rx_test_bits_mem[i], test_bits[i] ^ f->rx_test_bits_mem[i]); - } - - /* if less than a thresh we are aligned and in sync with test sequence */ - - ber = (float)*bit_errors/NTEST_BITS; - - *sync = 0; - if (ber < 0.2) - *sync = 1; - - *ntest_bits = NTEST_BITS; - -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: freq_state(() -AUTHOR......: David Rowe -DATE CREATED: 24/4/2012 - -Freq offset state machine. Moves between coarse and fine states -based on BPSK pilot sequence. Freq offset estimator occasionally -makes mistakes when used continuously. So we use it until we have -acquired the BPSK pilot, then switch to a more robust "fine" -tracking algorithm. If we lose sync we switch back to coarse mode -for fast-requisition of large frequency offsets. - -\*---------------------------------------------------------------------------*/ - -int freq_state(int sync_bit, int *state) -{ - int next_state, coarse_fine; - - /* acquire state, look for 6 symbol 010101 sequence from sync bit */ - - next_state = *state; - switch(*state) { - case 0: - if (sync_bit == 0) - next_state = 1; - break; - case 1: - if (sync_bit == 1) - next_state = 2; - else - next_state = 0; - break; - case 2: - if (sync_bit == 0) - next_state = 3; - else - next_state = 0; - break; - case 3: - if (sync_bit == 1) - next_state = 4; - else - next_state = 0; - break; - case 4: - if (sync_bit == 0) - next_state = 5; - else - next_state = 0; - break; - case 5: - if (sync_bit == 1) - next_state = 6; - else - next_state = 0; - break; - - /* states 6 and above are track mode, make sure we keep - getting 0101 sync bit sequence */ - - case 6: - if (sync_bit == 0) - next_state = 7; - else - next_state = 0; - - break; - case 7: - if (sync_bit == 1) - next_state = 6; - else - next_state = 0; - break; - } - - *state = next_state; - if (*state >= 6) - coarse_fine = FINE; - else - coarse_fine = COARSE; - - return coarse_fine; -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: fdmdv_demod() -AUTHOR......: David Rowe -DATE CREATED: 26/4/2012 - -FDMDV demodulator, take an array of FDMDV_SAMPLES_PER_FRAME -modulated symbols, returns an array of FDMDV_BITS_PER_FRAME bits, -plus the sync bit. - -The number of input samples nin will normally be M == -FDMDV_SAMPLES_PER_FRAME. However to adjust for differences in -transmit and receive sample clocks nin will occasionally be M-M/P, -or M+M/P. - -\*---------------------------------------------------------------------------*/ - -WIN32PROJECT_API void fdmdv_demod(struct FDMDV *fdmdv, int rx_bits[], int *sync_bit, float rx_fdm[], int *nin) -{ - float foff_coarse, foff_fine; - COMP rx_fdm_fcorr[M+M/P]; - COMP rx_baseband[NC+1][M+M/P]; - COMP rx_filt[NC+1][P+1]; - COMP rx_symbols[NC+1]; - float env[NT*P]; - - /* freq offset estimation and correction */ - - foff_coarse = rx_est_freq_offset(fdmdv, rx_fdm, *nin); - - if (fdmdv->coarse_fine == COARSE) - fdmdv->foff = foff_coarse; - freq_shift(rx_fdm_fcorr, rx_fdm, fdmdv->foff, &fdmdv->foff_rect, &fdmdv->foff_phase_rect, *nin); - - /* baseband processing */ - - fdm_downconvert(rx_baseband, rx_fdm_fcorr, fdmdv->phase_rx, fdmdv->freq, *nin); - rx_filter(rx_filt, rx_baseband, fdmdv->rx_filter_memory, *nin); - fdmdv->rx_timing = rx_est_timing(rx_symbols, rx_filt, rx_baseband, fdmdv->rx_filter_mem_timing, env, fdmdv->rx_baseband_mem_timing, *nin); - - /* adjust number of input samples to keep timing within bounds */ - - *nin = M; - - if (fdmdv->rx_timing > 2*M/P) - *nin += M/P; - - if (fdmdv->rx_timing < 0) - *nin -= M/P; - - foff_fine = qpsk_to_bits(rx_bits, sync_bit, fdmdv->phase_difference, fdmdv->prev_rx_symbols, rx_symbols); - memcpy(fdmdv->prev_rx_symbols, rx_symbols, sizeof(COMP)*(NC+1)); - snr_update(fdmdv->sig_est, fdmdv->noise_est, fdmdv->phase_difference); - - /* freq offset estimation state machine */ - - fdmdv->coarse_fine = freq_state(*sync_bit, &fdmdv->fest_state); - fdmdv->foff -= TRACK_COEFF*foff_fine; -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: calc_snr() -AUTHOR......: David Rowe -DATE CREATED: 17 May 2012 - -Calculate current SNR estimate (3000Hz noise BW) - -\*---------------------------------------------------------------------------*/ - -float calc_snr(float sig_est[], float noise_est[]) -{ - float S, SdB; - float mean, N50, N50dB, N3000dB; - float snr_dB; - int c; - - S = 0.0; - for(c=0; csnr_est = calc_snr(fdmdv->sig_est, fdmdv->noise_est); - fdmdv_stats->fest_coarse_fine = fdmdv->coarse_fine; - fdmdv_stats->foff = fdmdv->foff; - fdmdv_stats->rx_timing = fdmdv->rx_timing; - fdmdv_stats->clock_offset = 0.0; /* TODO - implement clock offset estimation */ - - assert((NC+1) == FDMDV_NSYM); - - for(c=0; crx_symbols[c] = fdmdv->phase_difference[c]; - } -} - -/*---------------------------------------------------------------------------*\ - -FUNCTION....: fdmdv_8_to_48() -AUTHOR......: David Rowe -DATE CREATED: 9 May 2012 - -Changes the sample rate of a signal from 8 to 48 kHz. Experience -with PC based modems has shown that PC sound cards have a more -accurate sample clock when set for 48 kHz than 8 kHz. - -n is the number of samples at the 8 kHz rate, there are FDMDV_OS*n samples -at the 48 kHz rate. A memory of FDMDV_OS_TAPS/FDMDV_OS samples is reqd for -in8k[] (see t48_8.c unit test as example). - -This is a classic polyphase upsampler. We take the 8 kHz samples -and insert (FDMDV_OS-1) zeroes between each sample, then -FDMDV_OS_TAPS FIR low pass filter the signal at 4kHz. As most of -the input samples are zeroes, we only need to multiply non-zero -input samples by filter coefficients. The zero insertion and -filtering are combined in the code below and I'm too lazy to explain -it further right now.... - -\*---------------------------------------------------------------------------*/ - -WIN32PROJECT_API void fdmdv_8_to_48(float out48k[], float in8k[], int n) -{ - int i,j,k,l; - - for(i=0; i. -*/ - -// The following ifdef block is the standard way of creating macros which make exporting -// from a DLL simpler. All files within this DLL are compiled with the WIN32PROJECT_EXPORTS -// symbol defined on the command line. This symbol should not be defined on any project -// that uses this DLL. This way any other project whose source files include this file see -// WIN32PROJECT_API functions as being imported from a DLL, whereas this DLL sees symbols -// defined with this macro as being exported. -#ifdef WIN32PROJECT_EXPORTS -#define WIN32PROJECT_API __declspec(dllexport) -#else -#define WIN32PROJECT_API __declspec(dllimport) -#endif - -/* -// This class is exported from the win32-project.dll -class WIN32PROJECT_API Cwin32project -{ -public: - Cwin32project(void); -}; - -extern WIN32PROJECT_API int nwin32project; - -WIN32PROJECT_API int fnwin32project(void); -*/ - -#ifndef __FDMDV__ -#define __FDMDV__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "comp.h" - -WIN32PROJECT_API void fft(float x[], int n, int isign); - - -#define FDMDV_BITS_PER_FRAME 28 /* 20ms frames, 1400 bit/s */ -#define FDMDV_NOM_SAMPLES_PER_FRAME 160 /* modulator output samples/frame and nominal demod samples/frame */ - /* at 8000 Hz sample rate */ -#define FDMDV_MAX_SAMPLES_PER_FRAME 200 /* max demod samples/frame, use this to allocate storage */ -#define FDMDV_SCALE 1000 /* suggested scaling for 16 bit shorts */ -#define FDMDV_NSYM 15 - -/* 8 to 48 kHz sample rate conversion */ - -#define FDMDV_OS 6 /* oversampling rate */ -#define FDMDV_OS_TAPS 48 /* number of OS filter taps */ - -/* FDMDV states and stats structures */ - -struct FDMDV; - -struct FDMDV_STATS { - float snr_est; /* estimated SNR of rx signal in dB (3 kHz noise BW) */ - COMP rx_symbols[FDMDV_NSYM]; /* latest received symbols, for scatter plot */ - int fest_coarse_fine; /* freq est state, 0-coarse 1-fine */ - float foff; /* estimated freq offset in Hz */ - float rx_timing; /* estimated optimum timing offset in samples */ - float clock_offset; /* Estimated tx/rx sample clock offset in ppm */ -}; - -WIN32PROJECT_API struct FDMDV *fdmdv_create(void); -WIN32PROJECT_API void fdmdv_destroy(struct FDMDV *fdmdv_state); - -WIN32PROJECT_API void fdmdv_mod(struct FDMDV *fdmdv_state, COMP tx_fdm[], int tx_bits[], int *sync_bit); -WIN32PROJECT_API void fdmdv_demod(struct FDMDV *fdmdv_state, int rx_bits[], int *sync_bit, float rx_fdm[], int *nin); - -WIN32PROJECT_API void fdmdv_get_test_bits(struct FDMDV *fdmdv_state, int tx_bits[]); -WIN32PROJECT_API void fdmdv_put_test_bits(struct FDMDV *f, int *sync, int *bit_errors, int *ntest_bits, int rx_bits[]); - -WIN32PROJECT_API void fdmdv_get_demod_stats(struct FDMDV *fdmdv_state, struct FDMDV_STATS *fdmdv_stats); -WIN32PROJECT_API void fdmdv_get_waterfall_line(struct FDMDV *fdmdv_state, float magnitudes[], int *magnitude_points); - -#endif - -#ifdef __cplusplus -} -#endif diff --git a/fdmdv2/variants/fdmdv2dll/fdmdv2-dll.rc b/fdmdv2/variants/fdmdv2dll/fdmdv2-dll.rc deleted file mode 100644 index 0d7c7a75..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/fdmdv2-dll.rc and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/fdmdv2-dll.sln b/fdmdv2/variants/fdmdv2dll/fdmdv2-dll.sln deleted file mode 100644 index 554e3c07..00000000 --- a/fdmdv2/variants/fdmdv2dll/fdmdv2-dll.sln +++ /dev/null @@ -1,42 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdmdv2-dll", "fdmdv2-project.vcxproj", "{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}" -EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "vbTest", "vbTest\vbTest.vbproj", "{36C01EFE-7F22-486B-82C4-07DF02101B1A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|Win32 = Debug|Win32 - Debug|x86 = Debug|x86 - Release|Mixed Platforms = Release|Mixed Platforms - Release|Win32 = Release|Win32 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|Win32.ActiveCfg = Debug|Win32 - {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|Win32.Build.0 = Debug|Win32 - {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|x86.ActiveCfg = Debug|Win32 - {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|Mixed Platforms.Build.0 = Release|Win32 - {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|Win32.ActiveCfg = Release|Win32 - {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|Win32.Build.0 = Release|Win32 - {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|x86.ActiveCfg = Release|Win32 - {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|Win32.ActiveCfg = Debug|x86 - {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|x86.ActiveCfg = Debug|x86 - {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|x86.Build.0 = Debug|x86 - {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|Mixed Platforms.Build.0 = Release|x86 - {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|Win32.ActiveCfg = Release|x86 - {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|x86.ActiveCfg = Release|x86 - {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/fdmdv2/variants/fdmdv2dll/fdmdv2-project.sdf b/fdmdv2/variants/fdmdv2dll/fdmdv2-project.sdf deleted file mode 100644 index 0057a1c9..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/fdmdv2-project.sdf and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/fdmdv2-project.vcxproj b/fdmdv2/variants/fdmdv2dll/fdmdv2-project.vcxproj deleted file mode 100644 index 76e18b34..00000000 --- a/fdmdv2/variants/fdmdv2dll/fdmdv2-project.vcxproj +++ /dev/null @@ -1,142 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541} - Win32Proj - win32project - fdmdv2-dll - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - - - - - - - true - - - false - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;WIN32PROJECT_EXPORTS;%(PreprocessorDefinitions) - 4244;%(DisableSpecificWarnings) - - - Windows - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN32PROJECT_EXPORTS;%(PreprocessorDefinitions) - ..\..\codec2-dev\src - 4305;4244;%(DisableSpecificWarnings) - false - Sync - - - Windows - true - true - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - - - - - - - - - \ No newline at end of file diff --git a/fdmdv2/variants/fdmdv2dll/resource.h b/fdmdv2/variants/fdmdv2dll/resource.h deleted file mode 100644 index 013e3a41..00000000 --- a/fdmdv2/variants/fdmdv2dll/resource.h +++ /dev/null @@ -1,14 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by fdmdv2-dll.rc - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/fdmdv2/variants/fdmdv2dll/stdafx.cpp b/fdmdv2/variants/fdmdv2dll/stdafx.cpp deleted file mode 100644 index c47a01c2..00000000 --- a/fdmdv2/variants/fdmdv2dll/stdafx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// win32-project.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/fdmdv2/variants/fdmdv2dll/stdafx.h b/fdmdv2/variants/fdmdv2dll/stdafx.h deleted file mode 100644 index 3ad2c6d1..00000000 --- a/fdmdv2/variants/fdmdv2dll/stdafx.h +++ /dev/null @@ -1,16 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - -#include "targetver.h" - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -// Windows Header Files: -#include - -static inline double round(double val); - -// TODO: reference additional headers your program requires here diff --git a/fdmdv2/variants/fdmdv2dll/targetver.h b/fdmdv2/variants/fdmdv2dll/targetver.h deleted file mode 100644 index 90e767bf..00000000 --- a/fdmdv2/variants/fdmdv2dll/targetver.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -// Including SDKDDKVer.h defines the highest available Windows platform. - -// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and -// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. - -#include diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/App.config b/fdmdv2/variants/fdmdv2dll/vbTest/App.config deleted file mode 100644 index b93bf408..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/Form1.Designer.vb b/fdmdv2/variants/fdmdv2dll/vbTest/Form1.Designer.vb deleted file mode 100644 index dc510d07..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/Form1.Designer.vb +++ /dev/null @@ -1,125 +0,0 @@ - _ -'Declare Sub fdmdv2-dll Lib "\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll\Release\fdmdv2-dll.dll" (ByVal Client As String, ByVal Dll As String) -Partial Class Form1 - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() -Me.TextBox1 = New System.Windows.Forms.TextBox() -Me.GroupBox1 = New System.Windows.Forms.GroupBox() -Me.Button1 = New System.Windows.Forms.Button() -Me.Button2 = New System.Windows.Forms.Button() -Me.Button3 = New System.Windows.Forms.Button() -Me.Button4 = New System.Windows.Forms.Button() -Me.Button5 = New System.Windows.Forms.Button() -Me.GroupBox1.SuspendLayout() -Me.SuspendLayout() -' -'TextBox1 -' -Me.TextBox1.Location = New System.Drawing.Point(183, 2) -Me.TextBox1.Multiline = True -Me.TextBox1.Name = "TextBox1" -Me.TextBox1.Size = New System.Drawing.Size(384, 395) -Me.TextBox1.TabIndex = 0 -' -'GroupBox1 -' -Me.GroupBox1.Controls.Add(Me.Button4) -Me.GroupBox1.Controls.Add(Me.Button3) -Me.GroupBox1.Controls.Add(Me.Button2) -Me.GroupBox1.Controls.Add(Me.Button1) -Me.GroupBox1.Location = New System.Drawing.Point(10, 10) -Me.GroupBox1.Name = "GroupBox1" -Me.GroupBox1.Size = New System.Drawing.Size(167, 337) -Me.GroupBox1.TabIndex = 1 -Me.GroupBox1.TabStop = False -Me.GroupBox1.Text = "Test FDMDV2" -' -'Button1 -' -Me.Button1.Location = New System.Drawing.Point(17, 31) -Me.Button1.Name = "Button1" -Me.Button1.Size = New System.Drawing.Size(135, 24) -Me.Button1.TabIndex = 0 -Me.Button1.Text = "Load" -Me.Button1.UseVisualStyleBackColor = True -' -'Button2 -' -Me.Button2.Location = New System.Drawing.Point(17, 61) -Me.Button2.Name = "Button2" -Me.Button2.Size = New System.Drawing.Size(135, 27) -Me.Button2.TabIndex = 1 -Me.Button2.Text = "Start" -Me.Button2.UseVisualStyleBackColor = True -' -'Button3 -' -Me.Button3.Location = New System.Drawing.Point(17, 94) -Me.Button3.Name = "Button3" -Me.Button3.Size = New System.Drawing.Size(135, 24) -Me.Button3.TabIndex = 2 -Me.Button3.Text = "Stop" -Me.Button3.UseVisualStyleBackColor = True -' -'Button4 -' -Me.Button4.Location = New System.Drawing.Point(17, 124) -Me.Button4.Name = "Button4" -Me.Button4.Size = New System.Drawing.Size(135, 24) -Me.Button4.TabIndex = 3 -Me.Button4.Text = "Unload" -Me.Button4.UseVisualStyleBackColor = True -' -'Button5 -' -Me.Button5.Location = New System.Drawing.Point(27, 356) -Me.Button5.Name = "Button5" -Me.Button5.Size = New System.Drawing.Size(135, 24) -Me.Button5.TabIndex = 2 -Me.Button5.Text = "Quit" -Me.Button5.UseVisualStyleBackColor = True -' -'Form1 -' -Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) -Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font -Me.ClientSize = New System.Drawing.Size(568, 392) -Me.Controls.Add(Me.Button5) -Me.Controls.Add(Me.GroupBox1) -Me.Controls.Add(Me.TextBox1) -Me.Name = "Form1" -Me.Text = "Test FDMDV2.dll" -Me.GroupBox1.ResumeLayout(False) -Me.ResumeLayout(False) -Me.PerformLayout() - -End Sub - Friend WithEvents TextBox1 As System.Windows.Forms.TextBox - Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox - Friend WithEvents Button4 As System.Windows.Forms.Button - Friend WithEvents Button3 As System.Windows.Forms.Button - Friend WithEvents Button2 As System.Windows.Forms.Button - Friend WithEvents Button1 As System.Windows.Forms.Button - Friend WithEvents Button5 As System.Windows.Forms.Button - -End Class diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/Form1.resx b/fdmdv2/variants/fdmdv2dll/vbTest/Form1.resx deleted file mode 100644 index 5ea0895e..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/Form1.vb b/fdmdv2/variants/fdmdv2dll/vbTest/Form1.vb deleted file mode 100644 index c07edc44..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/Form1.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class Form1 - -End Class diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Application.Designer.vb b/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Application.Designer.vb deleted file mode 100644 index da97349a..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Application.Designer.vb +++ /dev/null @@ -1,38 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.269 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - 'NOTE: This file is auto-generated; do not modify it directly. To make changes, - ' or if you encounter build errors in this file, go to the Project Designer - ' (go to Project Properties or double-click the My Project node in - ' Solution Explorer), and make changes on the Application tab. - ' - Partial Friend Class MyApplication - - _ - Public Sub New() - MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) - Me.IsSingleInstance = false - Me.EnableVisualStyles = true - Me.SaveMySettingsOnExit = true - Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses - End Sub - - _ - Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.vbTest.Form1 - End Sub - End Class -End Namespace diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Application.myapp b/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Application.myapp deleted file mode 100644 index 7b0c597d..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Application.myapp +++ /dev/null @@ -1,11 +0,0 @@ - - - true - Form1 - false - 0 - true - 0 - 0 - true - diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/AssemblyInfo.vb b/fdmdv2/variants/fdmdv2dll/vbTest/My Project/AssemblyInfo.vb deleted file mode 100644 index c8fcf7d9..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/AssemblyInfo.vb +++ /dev/null @@ -1,35 +0,0 @@ -Imports System -Imports System.Reflection -Imports System.Runtime.InteropServices - -' General Information about an assembly is controlled through the following -' set of attributes. Change these attribute values to modify the information -' associated with an assembly. - -' Review the values of the assembly attributes - - - - - - - - - - -'The following GUID is for the ID of the typelib if this project is exposed to COM - - -' Version information for an assembly consists of the following four values: -' -' Major Version -' Minor Version -' Build Number -' Revision -' -' You can specify all the values or you can default the Build and Revision Numbers -' by using the '*' as shown below: -' - - - diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Resources.Designer.vb b/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Resources.Designer.vb deleted file mode 100644 index 32308cbe..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Resources.Designer.vb +++ /dev/null @@ -1,62 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.269 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My.Resources - - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. - ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. - ''' - _ - Friend Module Resources - - Private resourceMan As Global.System.Resources.ResourceManager - - Private resourceCulture As Global.System.Globalization.CultureInfo - - ''' - ''' Returns the cached ResourceManager instance used by this class. - ''' - _ - Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager - Get - If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("vbTest.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. - ''' - _ - Friend Property Culture() As Global.System.Globalization.CultureInfo - Get - Return resourceCulture - End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) - resourceCulture = value - End Set - End Property - End Module -End Namespace diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Resources.resx b/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Resources.resx deleted file mode 100644 index ffecec85..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Settings.Designer.vb b/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Settings.Designer.vb deleted file mode 100644 index 82bd1eb9..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.269 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - _ - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - -#Region "My.Settings Auto-Save Functionality" -#If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean - - Private Shared addedHandlerLockObject As New Object - - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub -#End If -#End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - -#If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - _ - Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.vbTest.My.MySettings - Get - Return Global.vbTest.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Settings.settings b/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Settings.settings deleted file mode 100644 index 377f56d6..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/My Project/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/bin/Debug/.gitignore b/fdmdv2/variants/fdmdv2dll/vbTest/bin/Debug/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.exe b/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.exe deleted file mode 100644 index aa115821..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.exe and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.pdb b/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.pdb deleted file mode 100644 index 20d166d1..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.pdb and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.vshost.exe b/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.vshost.exe deleted file mode 100644 index 58da5217..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.vshost.exe and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.vshost.exe.manifest b/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.vshost.exe.manifest deleted file mode 100644 index f96b1d6b..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.vshost.exe.manifest +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.xml b/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.xml deleted file mode 100644 index 38eaa1c7..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/bin/Release/vbTest.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - -vbTest - - - - - - Returns the cached ResourceManager instance used by this class. - - - - Overrides the current thread's CurrentUICulture property for all - resource lookups using this strongly typed resource class. - - - - A strongly-typed resource class, for looking up localized strings, etc. - - - - \ No newline at end of file diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Debug/.gitignore b/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Debug/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache b/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 0699be2a..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/GenerateResource-ResGen.read.1.tlog b/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/GenerateResource-ResGen.read.1.tlog deleted file mode 100644 index 49b02767..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/GenerateResource-ResGen.read.1.tlog and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/GenerateResource-ResGen.write.1.tlog b/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/GenerateResource-ResGen.write.1.tlog deleted file mode 100644 index 9793cabe..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/GenerateResource-ResGen.write.1.tlog and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/TempPE/My Project.Resources.Designer.vb.dll b/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/TempPE/My Project.Resources.Designer.vb.dll deleted file mode 100644 index 7b155551..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/TempPE/My Project.Resources.Designer.vb.dll and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.Form1.resources b/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.Form1.resources deleted file mode 100644 index 06c24d06..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.Form1.resources and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.Resources.resources b/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.Resources.resources deleted file mode 100644 index 06c24d06..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.Resources.resources and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.exe b/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.exe deleted file mode 100644 index aa115821..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.exe and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.pdb b/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.pdb deleted file mode 100644 index 20d166d1..00000000 Binary files a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.pdb and /dev/null differ diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.vbproj.FileListAbsolute.txt b/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.vbproj.FileListAbsolute.txt deleted file mode 100644 index a79bdde5..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.vbproj.FileListAbsolute.txt +++ /dev/null @@ -1,11 +0,0 @@ -C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll\vbTest\bin\Release\vbTest.exe -C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll\vbTest\bin\Release\vbTest.pdb -C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll\vbTest\bin\Release\vbTest.xml -C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll\vbTest\obj\x86\Release\ResolveAssemblyReference.cache -C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll\vbTest\obj\x86\Release\vbTest.Form1.resources -C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll\vbTest\obj\x86\Release\vbTest.Resources.resources -C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll\vbTest\obj\x86\Release\GenerateResource-ResGen.read.1.tlog -C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll\vbTest\obj\x86\Release\GenerateResource-ResGen.write.1.tlog -C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll\vbTest\obj\x86\Release\vbTest.exe -C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll\vbTest\obj\x86\Release\vbTest.xml -C:\Users\wittend\Projects\Radio\fdmdv2\fdmdv2dll\vbTest\obj\x86\Release\vbTest.pdb diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.xml b/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.xml deleted file mode 100644 index 38eaa1c7..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/obj/x86/Release/vbTest.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - -vbTest - - - - - - Returns the cached ResourceManager instance used by this class. - - - - Overrides the current thread's CurrentUICulture property for all - resource lookups using this strongly typed resource class. - - - - A strongly-typed resource class, for looking up localized strings, etc. - - - - \ No newline at end of file diff --git a/fdmdv2/variants/fdmdv2dll/vbTest/vbTest.vbproj b/fdmdv2/variants/fdmdv2dll/vbTest/vbTest.vbproj deleted file mode 100644 index f8e31f05..00000000 --- a/fdmdv2/variants/fdmdv2dll/vbTest/vbTest.vbproj +++ /dev/null @@ -1,128 +0,0 @@ - - - - Debug - x86 - - - 2.0 - {36C01EFE-7F22-486B-82C4-07DF02101B1A} - WinExe - vbTest.My.MyApplication - vbTest - vbTest - 512 - WindowsForms - v3.0 - - - x86 - true - full - true - true - bin\Debug\ - vbTest.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - x86 - pdbonly - false - true - true - bin\Release\ - vbTest.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - acrobat70.ico - - - - - - - - - - - - - - - - - - - - - - Form - - - Form1.vb - Form - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - Form1.vb - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - - - \ No newline at end of file