From: wittend99 Date: Mon, 18 Jun 2012 13:44:06 +0000 (+0000) Subject: Some cleanup X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=e5c79e7b2d75f3654c5c2dbf2b556706f5c2d28c;p=freetel-svn-tracking.git Some cleanup git-svn-id: https://svn.code.sf.net/p/freetel/code@557 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/FDMDV2.fbp b/fdmdv2/FDMDV2.fbp index 04681507..e7080eb0 100644 --- a/fdmdv2/FDMDV2.fbp +++ b/fdmdv2/FDMDV2.fbp @@ -120,7 +120,7 @@ topFrame_OnSize topFrame_OnUpdateUI - + 1 1 1 @@ -319,7 +319,7 @@ OnPasteUpdateUI - + &Tools tools protected @@ -330,7 +330,7 @@ wxID_ANY wxITEM_NORMAL - &Audio + &Audio Config m_menuItemAudio none @@ -345,8 +345,8 @@ wxID_ANY wxITEM_NORMAL - Com Port Config - m_menuItemComCfg + Rig Control Config + m_menuItemRigCtrlCfg none @@ -360,7 +360,7 @@ Set preferences ID_OPTIONS wxITEM_NORMAL - &Options + Other Program &Options m_menuItemOptions none @@ -368,6 +368,59 @@ 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 diff --git a/fdmdv2/dlg_audio.h b/fdmdv2/dlg_audio.h index 23aa002f..f20510c0 100644 --- a/fdmdv2/dlg_audio.h +++ b/fdmdv2/dlg_audio.h @@ -14,10 +14,11 @@ #include #include "topFrame.h" -#include "extern/include/portaudio.h" -#include "extern/include/portaudiocpp/PortAudioCpp.hxx" + +#include "portaudio.h" +#include "portaudiocpp/PortAudioCpp.hxx" #ifdef WIN32 -#include "extern/include/portaudiocpp/AsioDeviceAdapter.hxx" +#include "portaudiocpp/AsioDeviceAdapter.hxx" #endif class AudioDlg : public DlgAudio diff --git a/fdmdv2/fdmdv2.mk b/fdmdv2/fdmdv2.mk index be632261..9808dda8 100644 --- a/fdmdv2/fdmdv2.mk +++ b/fdmdv2/fdmdv2.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=wittend -Date :=6/17/2012 +Date :=6/18/2012 CodeLitePath :="C:\Program Files\CodeLite" LinkerName :=g++ ArchiveTool :=ar rcus @@ -41,11 +41,11 @@ 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 +IncludePath := $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW/msys/1.0/local/include $(IncludeSwitch)../codec2-dev/src IncludePCH := RcIncludePath := Libs := $(LibrarySwitch)sndfile-1 $(LibrarySwitch)codec2 $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp -LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)./libsndfile/bin $(LibraryPathSwitch)./extern/lib +LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW/msys/1.0/local/lib ## diff --git a/fdmdv2/fdmdv2.project b/fdmdv2/fdmdv2.project index 97f3a779..f22252ce 100644 --- a/fdmdv2/fdmdv2.project +++ b/fdmdv2/fdmdv2.project @@ -25,8 +25,6 @@ - - @@ -54,6 +52,8 @@ + + @@ -116,12 +116,12 @@ - + + - - + diff --git a/fdmdv2/fdmdv2_main.cpp b/fdmdv2/fdmdv2_main.cpp index d1b10c9c..d2c3df21 100644 --- a/fdmdv2/fdmdv2_main.cpp +++ b/fdmdv2/fdmdv2_main.cpp @@ -225,13 +225,13 @@ void MainFrame::OnTogBtnALCClick(wxCommandEvent& event) // rxCallback() //------------------------------------------------------------------------- static int rxCallback( - const void *inBuffer, - void *outBuffer, - unsigned long framesPerBuffer, - const PaStreamCallbackTimeInfo *outTime, - PaStreamCallbackFlags statusFlags, - void *userData - ) + const void *inBuffer, + void *outBuffer, + unsigned long framesPerBuffer, + const PaStreamCallbackTimeInfo *outTime, + PaStreamCallbackFlags statusFlags, + void *userData + ) { float *out = (float *) outBuffer; float *in = (float *) inBuffer; @@ -257,13 +257,14 @@ static int rxCallback( //------------------------------------------------------------------------- // txCallback() //------------------------------------------------------------------------- -static int txCallback( const void *inBuffer, - void *outBuffer, - unsigned long framesPerBuffer, - const PaStreamCallbackTimeInfo *outTime, - PaStreamCallbackFlags statusFlags, - void *userData - ) +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; @@ -305,74 +306,6 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event) } } -/* -//------------------------------------------------------------------------- -// OnTogBtnOnOff() -//------------------------------------------------------------------------- -void MainFrame::OnTogBtnOnOff(wxCommandEvent& event) -{ - if(!m_radioRunning) - { - m_radioRunning = true; - pa = new PortAudioWrap(); -// err = pa->init(); - - inputDevice = pa->getDefaultInputDevice(); // default input device - if(inputDevice == paNoDevice) - { - wxMessageBox(wxT("Error: No default input device."), wxT("Error"), wxOK); - return; - } - 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) - { - wxMessageBox(wxT("Error: No default output device."), wxT("Error"), wxOK); - return; - } - err = pa->setOutputDevice(outputDevice); - 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(txCallback); - err = pa->streamOpen(); - - if(err != paNoError) - { - wxMessageBox(wxT("Open/Setup error."), wxT("Error"), wxOK); - return; - } - err = pa->streamStart(); - if(err != paNoError) - { - wxMessageBox(wxT("Stream Start Error."), wxT("Error"), wxOK); - return; - } - m_togBtnOnOff->SetLabel(wxT("Stop")); - } - else - { - m_radioRunning = false; - pa->stop(); -// pa->abort(); -// delete pa; - //pa->terminate(); - m_togBtnOnOff->SetLabel(wxT("Start")); - } -} -*/ - //------------------------------------------------------------------------- // startRxStream() //------------------------------------------------------------------------- @@ -425,7 +358,6 @@ void MainFrame::startRxStream() wxMessageBox(wxT("Rx Stream Start Error."), wxT("Error"), wxOK); return; } -// OnTogBtnOnOff->SetLabel(wxT("Stop")); } } @@ -439,7 +371,6 @@ void MainFrame::stopRxStream() m_RxRunning = false; m_rxPa->stop(); m_rxPa->streamClose(); -// OnTogBtnOnOff->SetLabel(wxT("Start")); } } @@ -452,7 +383,6 @@ void MainFrame::abortRxStream() { m_RxRunning = false; m_rxPa->abort(); -// OnTogBtnOnOff->SetLabel(wxT("Start")); } } @@ -544,38 +474,6 @@ void MainFrame::abortTxStream() //------------------------------------------------------------------------- void MainFrame::OnOpen( wxCommandEvent& event ) { - if(m_sound != NULL) - { - if (wxMessageBox(wxT("Current content has not been saved! Proceed?"),wxT("Please confirm"), wxICON_QUESTION | wxYES_NO, this) == wxNO ) - { - return; - } - } - wxFileDialog openFileDialog(this, - wxT("Open Sound file"), - wxEmptyString, - wxEmptyString, - wxT("WAV files (*.wav)|*.wav|") - wxT("RAW files (*.raw)|*.raw|") - wxT("SPEEX files (*.spx)|*.spx|") - wxT("FLAC files (*.flc)|*.flc|") - wxT("All files (*.*)|*.*|"), - wxFD_OPEN | wxFD_FILE_MUST_EXIST); - if (openFileDialog.ShowModal() == wxID_CANCEL) - { - return; // the user changed idea... - } - // proceed loading the file chosen by the user; - m_sound->Play(openFileDialog.GetPath()); -/* - // this can be done with e.g. wxWidgets input streams: - wxFileInputStream input_stream(openFileDialog.Getpa->h()); - if (!input_stream.IsOk()) - { - wxLogError("Cannot open file '%s'.", openFileDialog.Getpa->h()); - return; - } -*/ } //------------------------------------------------------------------------- @@ -693,6 +591,50 @@ void MainFrame::OnToolsOptionsUI( wxUpdateUIEvent& event ) { } +//------------------------------------------------------------------------- +// OnCaptureRxStream() +//------------------------------------------------------------------------- +void MainFrame::OnCaptureRxStream( wxCommandEvent& event ) +{ +} + +//------------------------------------------------------------------------- +// OnCaptureTxStream() +//------------------------------------------------------------------------- +void MainFrame::OnCaptureTxStream( wxCommandEvent& event ) +{ +} + +//------------------------------------------------------------------------- +// OnPlayAudioFile() +//------------------------------------------------------------------------- +void MainFrame::OnPlayAudioFile( wxCommandEvent& event ) +{ + if(m_sound != NULL) + { + if (wxMessageBox(wxT("Current content has not been saved! Proceed?"),wxT("Please confirm"), wxICON_QUESTION | wxYES_NO, this) == wxNO ) + { + return; + } + } + wxFileDialog openFileDialog(this, + wxT("Open Sound file"), + wxEmptyString, + wxEmptyString, + wxT("WAV files (*.wav)|*.wav|") + wxT("RAW files (*.raw)|*.raw|") + wxT("SPEEX files (*.spx)|*.spx|") + wxT("FLAC files (*.flc)|*.flc|") + wxT("All files (*.*)|*.*|"), + wxFD_OPEN | wxFD_FILE_MUST_EXIST); + if (openFileDialog.ShowModal() == wxID_CANCEL) + { + return; // the user changed idea... + } + // proceed loading the file chosen by the user; + m_sound->Play(openFileDialog.GetPath()); +} + //------------------------------------------------------------------------- // OnToolsAudio() //------------------------------------------------------------------------- @@ -751,7 +693,6 @@ void MainFrame::OnHelpAbout( wxCommandEvent& event ) dlg->ShowModal(); } - //------------------------------------------------------------------------- // LoadUserImage() //------------------------------------------------------------------------- @@ -930,6 +871,6 @@ void MainFrame::OnSave(wxCommandEvent& WXUNUSED(event)) { // This one guesses image format from filename extension // (it may fail if the extension is not recognized): - image.SaveFile(savefilename); + //image.SaveFile(savefilename); } } diff --git a/fdmdv2/fdmdv2_main.h b/fdmdv2/fdmdv2_main.h index 74df88a4..34d3c72c 100644 --- a/fdmdv2/fdmdv2_main.h +++ b/fdmdv2/fdmdv2_main.h @@ -23,22 +23,20 @@ #include "wx/versioninfo.h" #include #include -#include "libsndfile/include/sndfile.h" -#include "extern/include/portaudio.h" + +#include "sndfile.h" +#include "portaudio.h" #include "paclass.h" -//#include "extern/include/portaudiocpp/PortAudioCpp.hxx" + +#include "codec2.h" +#include "fdmdv.h" #include "topFrame.h" -#include "C:\Users\wittend\Projects\Radio\codec2-dev\src\codec2.h" -#include "C:\Users\wittend\Projects\Radio\codec2-dev\src\fdmdv.h" #include "dlg_about.h" #include "dlg_audio.h" #include "dlg_options.h" #include "dlg_comports.h" #include "fdmdv2_plot.h" -//#include "fdmdv2_thread_audio.h" - -#define WAV_FILE wxT("doggrowl.wav") enum { @@ -81,7 +79,6 @@ class MainFrame : public TopFrame DrawPanel* m_panelWaterfall; DrawPanel* m_panelExtra1; DrawPanel* m_panelExtra2; -// bool m_radioRunning; bool m_SquelchActive; bool m_RxRunning; bool m_TxRunning; @@ -95,12 +92,8 @@ class MainFrame : public TopFrame PaDeviceIndex m_txDevOut; PaError m_rxErr; PaError m_txErr; + wxSound *m_sound; -// PortAudioWrap stream; -// portaudio::AutoSystem autoSys; -// portaudio::System *sys; // = portaudio::System::instance(); -// StreamParameters - void DoStartThread(); void DoPauseThread(); @@ -141,6 +134,9 @@ class MainFrame : public TopFrame void OnToolsComCfgUI( wxUpdateUIEvent& event ); void OnToolsOptions( wxCommandEvent& event ); void OnToolsOptionsUI( wxUpdateUIEvent& event ); + void OnCaptureRxStream( wxCommandEvent& event ); + void OnCaptureTxStream( wxCommandEvent& event ); + void OnPlayAudioFile( wxCommandEvent& event ); void OnHelpCheckUpdates( wxCommandEvent& event ); void OnHelpCheckUpdatesUI( wxUpdateUIEvent& event ); void OnHelpAbout( wxCommandEvent& event ); @@ -167,7 +163,6 @@ class MainFrame : public TopFrame private: bool CreateSound(wxSound& snd) const; - wxSound* m_sound; wxString m_soundFile; #ifdef __WXMSW__ wxString m_soundRes; diff --git a/fdmdv2/fdmdv2_wsp.mk b/fdmdv2/fdmdv2_wsp.mk index 359a9f63..466a60ae 100644 --- a/fdmdv2/fdmdv2_wsp.mk +++ b/fdmdv2/fdmdv2_wsp.mk @@ -1,8 +1,8 @@ .PHONY: clean All All: - @echo ----------Building project:[ fdmdv2 - Release ]---------- - @"mingw32-make.exe" -j 2 -f "fdmdv2.mk" + @echo ----------Building project:[ test_sndfile - Release ]---------- + @cd "libsndfile\Projects\w32-mingw" && "mingw32-make.exe" -j 2 -f "test_sndfile.mk" clean: - @echo ----------Cleaning project:[ fdmdv2 - Release ]---------- - @"mingw32-make.exe" -j 2 -f "fdmdv2.mk" clean + @echo ----------Cleaning project:[ test_sndfile - Release ]---------- + @cd "libsndfile\Projects\w32-mingw" && "mingw32-make.exe" -j 2 -f "test_sndfile.mk" clean diff --git a/fdmdv2/fdmdv2basic/fdmdv2basic.mk b/fdmdv2/fdmdv2basic/fdmdv2basic.mk index 14994a7d..6359fa03 100644 --- a/fdmdv2/fdmdv2basic/fdmdv2basic.mk +++ b/fdmdv2/fdmdv2basic/fdmdv2basic.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=wittend -Date :=6/16/2012 +Date :=6/18/2012 CodeLitePath :="C:\Program Files\CodeLite" LinkerName :=g++ ArchiveTool :=ar rcus diff --git a/fdmdv2/hamlib-3.0/test_hamlib/test_hamlib.mk b/fdmdv2/hamlib-3.0/test_hamlib/test_hamlib.mk index 5ecb8b8d..b510b864 100644 --- a/fdmdv2/hamlib-3.0/test_hamlib/test_hamlib.mk +++ b/fdmdv2/hamlib-3.0/test_hamlib/test_hamlib.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=wittend -Date :=6/15/2012 +Date :=6/18/2012 CodeLitePath :="C:\Program Files\CodeLite" LinkerName :=g++ ArchiveTool :=ar rcus diff --git a/fdmdv2/libsndfile/Projects/w32-mingw/test_sndfile.mk b/fdmdv2/libsndfile/Projects/w32-mingw/test_sndfile.mk index 1797b4e9..34e7f64a 100644 --- a/fdmdv2/libsndfile/Projects/w32-mingw/test_sndfile.mk +++ b/fdmdv2/libsndfile/Projects/w32-mingw/test_sndfile.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=wittend -Date :=6/15/2012 +Date :=6/18/2012 CodeLitePath :="C:\Program Files\CodeLite" LinkerName :=g++ ArchiveTool :=ar rcus diff --git a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk index 5094e4e1..114619aa 100644 --- a/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk +++ b/fdmdv2/pa_cppbinding_test/pa_cppbinding_test.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=wittend -Date :=6/15/2012 +Date :=6/18/2012 CodeLitePath :="C:\Program Files\CodeLite" LinkerName :=g++ ArchiveTool :=ar rcus diff --git a/fdmdv2/pa_test/pa_test.mk b/fdmdv2/pa_test/pa_test.mk index a1d47396..710712d4 100644 --- a/fdmdv2/pa_test/pa_test.mk +++ b/fdmdv2/pa_test/pa_test.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=wittend -Date :=6/15/2012 +Date :=6/18/2012 CodeLitePath :="C:\Program Files\CodeLite" LinkerName :=g++ ArchiveTool :=ar rcus diff --git a/fdmdv2/paclass.cpp b/fdmdv2/paclass.cpp index ba731ebf..78c08e0d 100644 --- a/fdmdv2/paclass.cpp +++ b/fdmdv2/paclass.cpp @@ -139,7 +139,7 @@ PaError PortAudioWrap::setOutputChannelCount(int count) return paNoError; } -int PortAudioWrap::getOutputChannelCount() +const int PortAudioWrap::getOutputChannelCount() { return outputBuffer.channelCount; } diff --git a/fdmdv2/paclass.h b/fdmdv2/paclass.h index c7a9b946..4177d6fc 100644 --- a/fdmdv2/paclass.h +++ b/fdmdv2/paclass.h @@ -60,7 +60,7 @@ class PortAudioWrap PaError setOutputDevice(PaDeviceIndex dev); PaError setOutputChannelCount(int count); - int getOutputChannelCount(); + const int getOutputChannelCount(); PaError setOutputSampleFormat(PaSampleFormat format); PaError setOutputLatency(PaTime latency); void setOutputHostApiStreamInfo(void *info = NULL); diff --git a/fdmdv2/topFrame.cpp b/fdmdv2/topFrame.cpp index 1f9f2b1c..d1f05cab 100644 --- a/fdmdv2/topFrame.cpp +++ b/fdmdv2/topFrame.cpp @@ -57,17 +57,43 @@ TopFrame::TopFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons tools = new wxMenu(); wxMenuItem* m_menuItemAudio; - m_menuItemAudio = new wxMenuItem( tools, wxID_ANY, wxString( _("&Audio") ) , wxEmptyString, wxITEM_NORMAL ); + m_menuItemAudio = new wxMenuItem( tools, wxID_ANY, wxString( _("&Audio Config") ) , wxEmptyString, wxITEM_NORMAL ); tools->Append( m_menuItemAudio ); - wxMenuItem* m_menuItemComCfg; - m_menuItemComCfg = new wxMenuItem( tools, wxID_ANY, wxString( _("Com Port Config") ) , wxEmptyString, wxITEM_NORMAL ); - tools->Append( m_menuItemComCfg ); + wxMenuItem* m_menuItemRigCtrlCfg; + m_menuItemRigCtrlCfg = new wxMenuItem( tools, wxID_ANY, wxString( _("Rig Control Config") ) , wxEmptyString, wxITEM_NORMAL ); + tools->Append( m_menuItemRigCtrlCfg ); wxMenuItem* m_menuItemOptions; - m_menuItemOptions = new wxMenuItem( tools, ID_OPTIONS, wxString( _("&Options") ) , _("Set preferences"), wxITEM_NORMAL ); + m_menuItemOptions = new wxMenuItem( tools, ID_OPTIONS, wxString( _("Other Program &Options") ) , _("Set preferences"), wxITEM_NORMAL ); tools->Append( m_menuItemOptions ); + tools->AppendSeparator(); + + wxMenuItem* m_menuItemCaptRxStream; + m_menuItemCaptRxStream = new wxMenuItem( tools, wxID_ANY, wxString( _("Capture Rx Stream") ) + wxT('\t') + wxT("Capture receive stream to file."), wxEmptyString, wxITEM_NORMAL ); + #ifdef __WXMSW__ + m_menuItemCaptRxStream->SetBitmaps( wxNullBitmap ); + #elif defined( __WXGTK__ ) + m_menuItemCaptRxStream->SetBitmap( wxNullBitmap ); + #endif + tools->Append( m_menuItemCaptRxStream ); + + wxMenuItem* m_menuItemCaptTxStream; + m_menuItemCaptTxStream = new wxMenuItem( tools, wxID_ANY, wxString( _("Capture Tx Stream") ) + wxT('\t') + wxT("Capture transmit stream to file."), wxEmptyString, wxITEM_NORMAL ); + #ifdef __WXMSW__ + m_menuItemCaptTxStream->SetBitmaps( wxNullBitmap ); + #elif defined( __WXGTK__ ) + m_menuItemCaptTxStream->SetBitmap( wxNullBitmap ); + #endif + tools->Append( m_menuItemCaptTxStream ); + + tools->AppendSeparator(); + + wxMenuItem* m_menuItemPlayAudioFile; + m_menuItemPlayAudioFile = new wxMenuItem( tools, wxID_ANY, wxString( _("Play File") ) , wxEmptyString, wxITEM_NORMAL ); + tools->Append( m_menuItemPlayAudioFile ); + m_menubarMain->Append( tools, _("&Tools") ); help = new wxMenu(); @@ -286,10 +312,13 @@ TopFrame::TopFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons this->Connect( m_menuItemPaste->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( TopFrame::OnPasteUpdateUI ) ); this->Connect( m_menuItemAudio->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnToolsAudio ) ); this->Connect( m_menuItemAudio->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( TopFrame::OnToolsAudioUI ) ); - this->Connect( m_menuItemComCfg->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnToolsComCfg ) ); - this->Connect( m_menuItemComCfg->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( TopFrame::OnToolsComCfgUI ) ); + this->Connect( m_menuItemRigCtrlCfg->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnToolsComCfg ) ); + this->Connect( m_menuItemRigCtrlCfg->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( TopFrame::OnToolsComCfgUI ) ); this->Connect( m_menuItemOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnToolsOptions ) ); this->Connect( m_menuItemOptions->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( TopFrame::OnToolsOptionsUI ) ); + this->Connect( m_menuItemCaptRxStream->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnCaptureRxStream ) ); + this->Connect( m_menuItemCaptTxStream->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnCaptureTxStream ) ); + this->Connect( m_menuItemPlayAudioFile->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnPlayAudioFile ) ); this->Connect( m_menuItemHelpUpdates->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnHelpCheckUpdates ) ); this->Connect( m_menuItemHelpUpdates->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( TopFrame::OnHelpCheckUpdatesUI ) ); this->Connect( m_menuItemAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnHelpAbout ) ); @@ -341,6 +370,9 @@ TopFrame::~TopFrame() this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( TopFrame::OnToolsComCfgUI ) ); this->Disconnect( ID_OPTIONS, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnToolsOptions ) ); this->Disconnect( ID_OPTIONS, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( TopFrame::OnToolsOptionsUI ) ); + this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnCaptureRxStream ) ); + this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnCaptureTxStream ) ); + this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnPlayAudioFile ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnHelpCheckUpdates ) ); this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( TopFrame::OnHelpCheckUpdatesUI ) ); this->Disconnect( ID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TopFrame::OnHelpAbout ) ); diff --git a/fdmdv2/topFrame.h b/fdmdv2/topFrame.h index 1c96167f..8a1b3f23 100644 --- a/fdmdv2/topFrame.h +++ b/fdmdv2/topFrame.h @@ -105,6 +105,9 @@ class TopFrame : public wxFrame virtual void OnToolsComCfgUI( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnToolsOptions( wxCommandEvent& event ) { event.Skip(); } virtual void OnToolsOptionsUI( wxUpdateUIEvent& event ) { event.Skip(); } + virtual void OnCaptureRxStream( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCaptureTxStream( wxCommandEvent& event ) { event.Skip(); } + virtual void OnPlayAudioFile( wxCommandEvent& event ) { event.Skip(); } virtual void OnHelpCheckUpdates( wxCommandEvent& event ) { event.Skip(); } virtual void OnHelpCheckUpdatesUI( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnHelpAbout( wxCommandEvent& event ) { event.Skip(); } diff --git a/fdmdv2/topFrame.py b/fdmdv2/topFrame.py index 854c6421..0c656c5c 100644 --- a/fdmdv2/topFrame.py +++ b/fdmdv2/topFrame.py @@ -71,15 +71,30 @@ class TopFrame ( wx.Frame ): self.m_menubarMain.Append( self.edit, _(u"&Edit") ) self.tools = wx.Menu() - self.m_menuItemAudio = wx.MenuItem( self.tools, wx.ID_ANY, _(u"&Audio"), wx.EmptyString, wx.ITEM_NORMAL ) + self.m_menuItemAudio = wx.MenuItem( self.tools, wx.ID_ANY, _(u"&Audio Config"), wx.EmptyString, wx.ITEM_NORMAL ) self.tools.AppendItem( self.m_menuItemAudio ) - self.m_menuItemComCfg = wx.MenuItem( self.tools, wx.ID_ANY, _(u"Com Port Config"), wx.EmptyString, wx.ITEM_NORMAL ) - self.tools.AppendItem( self.m_menuItemComCfg ) + self.m_menuItemRigCtrlCfg = wx.MenuItem( self.tools, wx.ID_ANY, _(u"Rig Control Config"), wx.EmptyString, wx.ITEM_NORMAL ) + self.tools.AppendItem( self.m_menuItemRigCtrlCfg ) - self.m_menuItemOptions = wx.MenuItem( self.tools, ID_OPTIONS, _(u"&Options"), _(u"Set preferences"), wx.ITEM_NORMAL ) + self.m_menuItemOptions = wx.MenuItem( self.tools, ID_OPTIONS, _(u"Other Program &Options"), _(u"Set preferences"), wx.ITEM_NORMAL ) self.tools.AppendItem( self.m_menuItemOptions ) + self.tools.AppendSeparator() + + self.m_menuItemCaptRxStream = wx.MenuItem( self.tools, wx.ID_ANY, _(u"Capture Rx Stream")+ u"\t" + u"Capture receive stream to file.", wx.EmptyString, wx.ITEM_NORMAL ) + self.m_menuItemCaptRxStream.SetBitmap( wx.NullBitmap ) + self.tools.AppendItem( self.m_menuItemCaptRxStream ) + + self.m_menuItemCaptTxStream = wx.MenuItem( self.tools, wx.ID_ANY, _(u"Capture Tx Stream")+ u"\t" + u"Capture transmit stream to file.", wx.EmptyString, wx.ITEM_NORMAL ) + self.m_menuItemCaptTxStream.SetBitmap( wx.NullBitmap ) + self.tools.AppendItem( self.m_menuItemCaptTxStream ) + + self.tools.AppendSeparator() + + self.m_menuItemPlayAudioFile = wx.MenuItem( self.tools, wx.ID_ANY, _(u"Play File"), wx.EmptyString, wx.ITEM_NORMAL ) + self.tools.AppendItem( self.m_menuItemPlayAudioFile ) + self.m_menubarMain.Append( self.tools, _(u"&Tools") ) self.help = wx.Menu() @@ -277,10 +292,13 @@ class TopFrame ( wx.Frame ): self.Bind( wx.EVT_UPDATE_UI, self.OnPasteUpdateUI, id = self.m_menuItemPaste.GetId() ) self.Bind( wx.EVT_MENU, self.OnToolsAudio, id = self.m_menuItemAudio.GetId() ) self.Bind( wx.EVT_UPDATE_UI, self.OnToolsAudioUI, id = self.m_menuItemAudio.GetId() ) - self.Bind( wx.EVT_MENU, self.OnToolsComCfg, id = self.m_menuItemComCfg.GetId() ) - self.Bind( wx.EVT_UPDATE_UI, self.OnToolsComCfgUI, id = self.m_menuItemComCfg.GetId() ) + self.Bind( wx.EVT_MENU, self.OnToolsComCfg, id = self.m_menuItemRigCtrlCfg.GetId() ) + self.Bind( wx.EVT_UPDATE_UI, self.OnToolsComCfgUI, id = self.m_menuItemRigCtrlCfg.GetId() ) self.Bind( wx.EVT_MENU, self.OnToolsOptions, id = self.m_menuItemOptions.GetId() ) self.Bind( wx.EVT_UPDATE_UI, self.OnToolsOptionsUI, id = self.m_menuItemOptions.GetId() ) + self.Bind( wx.EVT_MENU, self.OnCaptureRxStream, id = self.m_menuItemCaptRxStream.GetId() ) + self.Bind( wx.EVT_MENU, self.OnCaptureTxStream, id = self.m_menuItemCaptTxStream.GetId() ) + self.Bind( wx.EVT_MENU, self.OnPlayAudioFile, id = self.m_menuItemPlayAudioFile.GetId() ) self.Bind( wx.EVT_MENU, self.OnHelpCheckUpdates, id = self.m_menuItemHelpUpdates.GetId() ) self.Bind( wx.EVT_UPDATE_UI, self.OnHelpCheckUpdatesUI, id = self.m_menuItemHelpUpdates.GetId() ) self.Bind( wx.EVT_MENU, self.OnHelpAbout, id = self.m_menuItemAbout.GetId() ) @@ -371,6 +389,15 @@ class TopFrame ( wx.Frame ): def OnToolsOptionsUI( self, event ): event.Skip() + def OnCaptureRxStream( self, event ): + event.Skip() + + def OnCaptureTxStream( self, event ): + event.Skip() + + def OnPlayAudioFile( self, event ): + event.Skip() + def OnHelpCheckUpdates( self, event ): event.Skip() diff --git a/fdmdv2/topFrame.xrc b/fdmdv2/topFrame.xrc index f0bb74c0..4bc32eaa 100644 --- a/fdmdv2/topFrame.xrc +++ b/fdmdv2/topFrame.xrc @@ -50,17 +50,33 @@ - + - - + + - + Set preferences + + + + + undefined.png + + + + + undefined.png + + + + + +