CurrentFilePath :=\r
CurrentFileFullPath :=\r
User :=wittend\r
-Date :=11/19/2012\r
+Date :=11/23/2012\r
CodeLitePath :="D:\bin\CodeLite"\r
LinkerName :=g++\r
SharedObjectLinkerName :=g++ -shared -fPIC\r
LibraryPathSwitch :=-L\r
PreprocessorSwitch :=-D\r
SourceSwitch :=-c \r
-OutputFile :=$(IntermediateDirectory)/$(ProjectName)\r
-Preprocessors :=$(PreprocessorSwitch)__WX__ \r
+OutputFile :=$(IntermediateDirectory)/freeDV\r
+Preprocessors :=$(PreprocessorSwitch)__WX__ $(PreprocessorSwitch)DMW=1 \r
ObjectSwitch :=-o \r
ArchiveOutputSwitch := \r
PreprocessOnlySwitch :=-E \r
AR := ar rcus\r
CXX := g++\r
CC := gcc\r
-CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)\r
-CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)\r
+CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"1046\" $(Preprocessors)\r
+CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"1046\" $(Preprocessors)\r
\r
\r
##\r
PATH:=$(WXWIN)\lib\gcc_dll;$(PATH)\r
WXCFG:=gcc_dll\mswu\r
UNIT_TEST_PP_SRC_DIR:=D:\bin\UnitTest++-1.3\r
-Objects=$(IntermediateDirectory)/src_dlg_about$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_options$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_main$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot$(ObjectSuffix) $(IntermediateDirectory)/src_topFrame$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_pa_wrapper$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scalar$(ObjectSuffix) \\r
- $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_audiooptions$(ObjectSuffix) \r
+Objects=$(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_options$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_main$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot$(ObjectSuffix) $(IntermediateDirectory)/src_topFrame$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_pa_wrapper$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scalar$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(ObjectSuffix) \\r
+ $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_audiooptions$(ObjectSuffix) \r
\r
##\r
## Main Build Targets \r
@$(MakeDirCommand) "./Release"\r
\r
PreBuild:\r
+ @echo Executing Pre Build commands ...\r
+ D:\bin\TortiseSVN\bin\svnversion -c D:\Projects\Radio\fdmdv2\r
+ @echo Done\r
\r
\r
##\r
## Objects\r
##\r
-$(IntermediateDirectory)/src_dlg_about$(ObjectSuffix): ../src/dlg_about.cpp $(IntermediateDirectory)/src_dlg_about$(DependSuffix)\r
- $(CXX) $(IncludePCH) $(SourceSwitch) "D:/Projects/Radio/fdmdv2/src/dlg_about.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_dlg_about$(ObjectSuffix) $(IncludePath)\r
-$(IntermediateDirectory)/src_dlg_about$(DependSuffix): ../src/dlg_about.cpp\r
- @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_dlg_about$(ObjectSuffix) -MF$(IntermediateDirectory)/src_dlg_about$(DependSuffix) -MM "D:/Projects/Radio/fdmdv2/src/dlg_about.cpp"\r
-\r
-$(IntermediateDirectory)/src_dlg_about$(PreprocessSuffix): ../src/dlg_about.cpp\r
- @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_dlg_about$(PreprocessSuffix) "D:/Projects/Radio/fdmdv2/src/dlg_about.cpp"\r
-\r
$(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix): ../src/dlg_comports.cpp $(IntermediateDirectory)/src_dlg_comports$(DependSuffix)\r
$(CXX) $(IncludePCH) $(SourceSwitch) "D:/Projects/Radio/fdmdv2/src/dlg_comports.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix) $(IncludePath)\r
$(IntermediateDirectory)/src_dlg_comports$(DependSuffix): ../src/dlg_comports.cpp\r
## Clean\r
##\r
clean:\r
- $(RM) $(IntermediateDirectory)/src_dlg_about$(ObjectSuffix)\r
- $(RM) $(IntermediateDirectory)/src_dlg_about$(DependSuffix)\r
- $(RM) $(IntermediateDirectory)/src_dlg_about$(PreprocessSuffix)\r
$(RM) $(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix)\r
$(RM) $(IntermediateDirectory)/src_dlg_comports$(DependSuffix)\r
$(RM) $(IntermediateDirectory)/src_dlg_comports$(PreprocessSuffix)\r
<Description/>
<Dependencies/>
<VirtualDirectory Name="src">
- <File Name="../src/dlg_about.cpp"/>
<File Name="../src/dlg_comports.cpp"/>
<File Name="../src/dlg_options.cpp"/>
<File Name="../src/fdmdv2_main.cpp"/>
<File Name="../src/dlg_audiooptions.cpp"/>
</VirtualDirectory>
<VirtualDirectory Name="include">
- <File Name="../src/dlg_about.h"/>
<File Name="../src/dlg_comports.h"/>
<File Name="../src/dlg_options.h"/>
<File Name="../src/fdmdv2_main.h"/>
<IncludePath Value="../../../Audio/libsndfile/include"/>
<IncludePath Value="../../../Audio/libsamplerate-0.1.8/src"/>
<Preprocessor Value="__WX__"/>
+ <Preprocessor Value="DMW=1"/>
</Compiler>
<Linker Options="-mwindows;-s;$(shell wx-config --debug=no --libs --unicode=yes)" Required="yes">
<LibraryPath Value="d:/Projects/Radio/codec2-dev/src/.libs"/>
<Library Value="libsamplerate.dll.a"/>
</Linker>
<ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/>
- <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no"/>
+ <General OutputFile="$(IntermediateDirectory)/freeDV" IntermediateDirectory="./Release" Command="./freeDV" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
<PostConnectCommands/>
<StartupCommands/>
</Debugger>
- <PreBuild/>
+ <PreBuild>
+ <Command Enabled="yes">D:\bin\TortiseSVN\bin\svnversion -c D:\Projects\Radio\fdmdv2</Command>
+ </PreBuild>
<PostBuild/>
<CustomBuild Enabled="no">
<RebuildCommand/>
-./Release/src_dlg_about.o ./Release/src_dlg_comports.o ./Release/src_dlg_options.o ./Release/src_fdmdv2_main.o ./Release/src_fdmdv2_plot.o ./Release/src_topFrame.o ./Release/src_fdmdv2_plot_scatter.o ./Release/src_fdmdv2_plot_spectrum.o ./Release/src_fdmdv2_pa_wrapper.o ./Release/src_fdmdv2_plot_scalar.o ./Release/src_fdmdv2_hdw_ports.o ./Release/src_fdmdv2_plot_waterfall_linux.o ./Release/src_dlg_audiooptions.o \r
+./Release/src_dlg_comports.o ./Release/src_dlg_options.o ./Release/src_fdmdv2_main.o ./Release/src_fdmdv2_plot.o ./Release/src_topFrame.o ./Release/src_fdmdv2_plot_scatter.o ./Release/src_fdmdv2_plot_spectrum.o ./Release/src_fdmdv2_pa_wrapper.o ./Release/src_fdmdv2_plot_scalar.o ./Release/src_fdmdv2_hdw_ports.o ./Release/src_fdmdv2_plot_waterfall_linux.o ./Release/src_dlg_audiooptions.o \r
All:
@echo "----------Building project:[ fdmdv2 - Release ]----------"
- @"$(MAKE)" -f "fdmdv2.mk"
+ @"$(MAKE)" -f "fdmdv2.mk" PreBuild && "$(MAKE)" -f "fdmdv2.mk"
clean:
@echo "----------Cleaning project:[ fdmdv2 - Release ]----------"
@"$(MAKE)" -f "fdmdv2.mk" clean
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# src/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
+# Dave Witten's Makefile
+#
pkgdatadir = $(datadir)/fdmdv2
pkgincludedir = $(includedir)/fdmdv2
pkglibdir = $(libdir)/fdmdv2
WX_CONFIG=$(WX_GTK_PATH)/wx-config
WX_CPPFLAGS = $(shell $(WX_CONFIG) --cxxflags)
WX_LIBS = $(shell $(WX_CONFIG) --libs core, base, aui)
+SVN_REVISION=$(shell svnversion)
CODEC2_INC=-I$(CODEC2_PATH)/src
CODEC2_LIB=$(CODEC2_PATH)/src/.libs/libcodec2.a
-CPP_FLAGS = $(WX_CPPFLAGS) $(CODEC2_INC) -I../extern/include -g -Wall
+#CPP_FLAGS = $(WX_CPPFLAGS) $(CODEC2_INC) -I../extern/include -g -Wall
+CPP_FLAGS = $(WX_CPPFLAGS) $(CODEC2_INC) -I. -g -Wall -O3 -DSVN_REV=\"$(SVN_REVISION)\"
LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm -lportaudiocpp -lpthread -lsndfile -lsamplerate
OBJS = topFrame.o \
+++ /dev/null
-//==========================================================================
-// Name: dlg_about.h
-//
-// Purpose: Creates simple wxWidgets dialog GUI for the
-// help/about page.
-//
-// Date: May 05 2012
-// Authors: David Rowe, David Witten
-//
-// License:
-//
-// 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 <http://www.gnu.org/licenses/>.
-//
-//==========================================================================
-#include "dlg_about.h"
-
-AboutDlg::AboutDlg( wxWindow* parent ) : DlgAbout( parent )
-{
-}
-
-void AboutDlg::OnInitDialog( wxInitDialogEvent& event )
-{
-// TODO: Implement OnInitDialog
-}
-
-//-------------------------------------------------------------------------
-// ExchangeData()
-//-------------------------------------------------------------------------
-void AboutDlg::ExchangeData(int inout)
-{
-// wxConfigBase *pConfig = wxConfigBase::Get();
- if(inout == EXCHANGE_DATA_IN)
- {
-// m_textRigCtrlPort->SetValue(wxGetApp().m_strRigCtrlPort);
-// m_textRigCtrlBaud->SetValue(wxGetApp().m_strRigCtrlBaud);
-// m_textRigCtrlDatabits->SetValue(wxGetApp().m_strRigCtrlDatabits);
-// m_textRigCtrlStopbits->SetValue(wxGetApp().m_strRigCtrlStopbits);
-// m_textRigCtrlParity->SetValue(wxGetApp().m_strRigCtrlParity);
- }
- if(inout == EXCHANGE_DATA_OUT)
- {
-// wxGetApp().m_strRigCtrlPort = m_textRigCtrlPort->GetValue();
-// wxGetApp().m_strRigCtrlBaud = m_textRigCtrlBaud->GetValue();
-// wxGetApp().m_strRigCtrlDatabits = m_textRigCtrlDatabits->GetValue();
-// wxGetApp().m_strRigCtrlStopbits = m_textRigCtrlStopbits->GetValue();
-// wxGetApp().m_strRigCtrlParity = m_textRigCtrlParity->GetValue();
-
-// 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);
-
-// pConfig->Flush();
- }
-// delete wxConfigBase::Set((wxConfigBase *) NULL);
-}
-
-//-------------------------------------------------------------------------
-// OnOK()
-//-------------------------------------------------------------------------
-void AboutDlg::OnOK( wxCommandEvent& event )
-{
- this->EndModal(wxID_OK);
-}
-
+++ /dev/null
-//==========================================================================
-// Name: dlg_about.h
-//
-// Purpose: Subclasses dialog GUI for Help/About.
-// (DlgAbout from topFrame.h)
-//
-// Date: May 05 2012
-// Authors: David Rowe, David Witten
-//
-// License:
-//
-// 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 <http://www.gnu.org/licenses/>.
-//
-//==========================================================================
-#ifndef __ABOUT_DIALOG__
-#define __ABOUT_DIALOG__
-
-#include "fdmdv2_main.h"
-
-class AboutDlg : public DlgAbout
-{
- protected:
- // Handlers for DlgAbout events.
- void OnInitDialog( wxInitDialogEvent& event );
-
- public:
- /** Constructor */
- AboutDlg( wxWindow* parent );
- void ExchangeData(int inout);
- void OnOK( wxCommandEvent& event );
-};
-
-#endif // __ABOUT_DIALOG__
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//=========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//=========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU General 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
#include "fdmdv2_hdw_ports.h"
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
+// class HdwPort()
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
HdwPort::HdwPort()
{
m_device_type = -1;
//#include <wx/arrimpl.cpp> // This is a magic incantation which must be done!
//WX_DEFINE_OBJARRAY(ArrayOfPorts);
+//-------------------------------------------------------------------------
+// OnClose()
+//-------------------------------------------------------------------------
HdwPort::~HdwPort()
{
}
+//-------------------------------------------------------------------------
+// OnClose()
+//-------------------------------------------------------------------------
void HdwPort::setType(int portType)
{
m_device_type = portType;
}
+//-------------------------------------------------------------------------
+// OnClose()
+//-------------------------------------------------------------------------
int HdwPort::getList()
{
int rv = 0;
return rv;
}
+//-------------------------------------------------------------------------
+// getSerialPorts()
+//-------------------------------------------------------------------------
int HdwPort::getSerialPorts()
{
int rv = 0;
return rv;
}
+//-------------------------------------------------------------------------
+// getUSBPorts()
+//-------------------------------------------------------------------------
int HdwPort::getUSBPorts()
{
int rv = 0;
return rv;
}
+//-------------------------------------------------------------------------
+// OnClose()
+//-------------------------------------------------------------------------
int HdwPort::getVirtualPorts()
{
int rv = 0;
return rv;
}
+//-------------------------------------------------------------------------
+// getParallelPorts()
+//-------------------------------------------------------------------------
int HdwPort::getParallelPorts()
{
int rv = 0;
return rv;
}
+//-------------------------------------------------------------------------
+// getIEEE1394Ports()
+//-------------------------------------------------------------------------
int HdwPort::getIEEE1394Ports()
{
int rv = 0;
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU General 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
+// You should have received a copy of the GNU General License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
#include "fifo.h"
#include "topFrame.h"
-#include "dlg_about.h"
#include "dlg_options.h"
#include "dlg_comports.h"
#include "fdmdv2_plot.h"
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
// License:
//
// 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,
+// it under the terms of the GNU 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
+// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
//==========================================================================
}
-DlgAbout::DlgAbout(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* bSizer20;
- bSizer20 = new wxBoxSizer(wxVERTICAL);
-
- wxBoxSizer* bSizer21;
- bSizer21 = new wxBoxSizer(wxVERTICAL);
-
- wxBoxSizer* bSizer23;
- bSizer23 = new wxBoxSizer(wxVERTICAL);
-
- wxBoxSizer* bSizer25;
- bSizer25 = new wxBoxSizer(wxVERTICAL);
-
- m_bitmapAbout = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0);
- bSizer25->Add(m_bitmapAbout, 1, wxALL|wxEXPAND, 5);
-
-
- bSizer23->Add(bSizer25, 1, wxEXPAND, 5);
-
- wxBoxSizer* bSizer26;
- bSizer26 = new wxBoxSizer(wxVERTICAL);
-
- m_staticText1 = new wxStaticText(this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, 0);
- m_staticText1->Wrap(-1);
- bSizer26->Add(m_staticText1, 1, wxALL, 5);
-
-
- bSizer23->Add(bSizer26, 0, 0, 5);
-
-
- bSizer21->Add(bSizer23, 1, wxEXPAND, 5);
-
- wxBoxSizer* bSizer24;
- bSizer24 = new wxBoxSizer(wxVERTICAL);
-
- m_textCtrl2 = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);
- bSizer24->Add(m_textCtrl2, 1, wxALL|wxEXPAND, 5);
-
-
- bSizer21->Add(bSizer24, 1, wxEXPAND, 5);
-
-
- bSizer20->Add(bSizer21, 1, wxEXPAND, 5);
-
- wxBoxSizer* bSizer22;
- bSizer22 = new wxBoxSizer(wxVERTICAL);
-
- m_button9 = new wxButton(this, wxID_ANY, _("MyButton"), wxDefaultPosition, wxDefaultSize, 0);
- bSizer22->Add(m_button9, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL, 5);
-
-
- bSizer20->Add(bSizer22, 0, wxALIGN_RIGHT, 5);
-
-
- this->SetSizer(bSizer20);
- this->Layout();
-
- this->Centre(wxBOTH);
- this->Centre(wxBOTH);
-
- // Connect Events
- this->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(DlgAbout::OnClose));
- this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(DlgAbout::OnInitDialog));
-}
-
-DlgAbout::~DlgAbout()
-{
- // Disconnect Events
- this->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(DlgAbout::OnClose));
- this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(DlgAbout::OnInitDialog));
-
-}
-
DlgOptions::DlgOptions(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);
#ifndef __TOPFRAME_H__
#define __TOPFRAME_H__
+#ifdef DMW
+ #define SVN_REV SVN_REVISION
+#endif
+
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
};
-///////////////////////////////////////////////////////////////////////////////
-/// Class DlgAbout
-///////////////////////////////////////////////////////////////////////////////
-class DlgAbout : public wxDialog
-{
- private:
-
- protected:
- wxStaticBitmap* m_bitmapAbout;
- wxStaticText* m_staticText1;
- wxTextCtrl* m_textCtrl2;
- wxButton* m_button9;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
- virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
-
-
- public:
-
- DlgAbout( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About FreeDV"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 352,343 ), long style = wxDEFAULT_DIALOG_STYLE );
- ~DlgAbout();
-
-};
-
-/*
-///////////////////////////////////////////////////////////////////////////////
-/// Class DlgAudio
-///////////////////////////////////////////////////////////////////////////////
-class DlgAudio : public wxDialog
-{
- private:
-
- protected:
- wxNotebook* m_nbAudioOptions;
- wxPanel* m_panelDevices;
- wxRadioButton* m_radioBtnPortAudio;
- wxStaticText* m_staticText151;
- wxTextCtrl* m_textNumChOut;
- wxStaticText* m_staticText141;
- wxTextCtrl* m_textNumChIn;
- wxStaticText* m_staticText14;
- wxComboBox* m_comboAudioCodec;
- wxStaticText* m_staticText15;
- wxComboBox* m_comboCodecTx;
- wxStaticText* m_staticText16;
- wxComboBox* m_comboRadioRx;
- wxStaticText* m_staticText17;
- wxComboBox* m_comboCodecSpkr;
- wxRadioButton* m_radioBtnFileOnly;
- wxPanel* m_panelSettings;
- wxListBox* m_lbRxInput;
- wxTextCtrl* m_textRxInput;
- wxListBox* m_lbTxOutput;
- wxTextCtrl* m_textTxOutput;
- wxListBox* m_lbVoiceInput;
- wxTextCtrl* m_textVoiceInput;
- wxListBox* m_lbVoiceOutput;
- wxTextCtrl* m_textVoiceOutput;
- wxStdDialogButtonSizer* m_sdbSizer3;
- wxButton* m_sdbSizer3OK;
- wxButton* m_sdbSizer3Apply;
- wxButton* m_sdbSizer3Cancel;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
- virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
- virtual void OnRxInputSelect( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnTxOutputSelect( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnVoiceInputSelect( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnVoiceOutputSelect( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-
-
- public:
-
- DlgAudio( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Audio Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 555,419 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DlgAudio();
-
-};
-*/
-
///////////////////////////////////////////////////////////////////////////////
/// Class DlgOptions
///////////////////////////////////////////////////////////////////////////////
};
-/*
-///////////////////////////////////////////////////////////////////////////////
-/// Class DlgComPorts
-///////////////////////////////////////////////////////////////////////////////
-class DlgComPorts : public wxDialog
-{
- private:
-
- protected:
- wxStaticText* m_staticText8;
- wxListCtrl* m_listCtrlPortSelect;
- wxStaticText* m_staticText9;
- wxTextCtrl* m_textRigCtrlPort;
- wxStaticText* m_staticText91;
- wxTextCtrl* m_textRigCtrlBaud;
- wxStaticText* m_staticText911;
- wxTextCtrl* m_textRigCtrlDatabits;
- wxStaticText* m_staticText912;
- wxTextCtrl* m_textRigCtrlStopbits;
- wxStaticText* m_staticText913;
- wxTextCtrl* m_textRigCtrlParity;
- wxStdDialogButtonSizer* m_sdbSizer5;
- wxButton* m_sdbSizer5OK;
- wxButton* m_sdbSizer5Apply;
- wxButton* m_sdbSizer5Cancel;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
- virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
- virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
- virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
-
-
- public:
-
- DlgComPorts( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Com Port"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 399,354 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~DlgComPorts();
-
-};
-*/
#endif //__TOPFRAME_H__
projects / freetel-svn-tracking.git / commitdiff