From: wittend99 Date: Tue, 16 Oct 2012 02:01:27 +0000 (+0000) Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@761 01035d8c-6547-0410-b346-abe4f9... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=629d0fc0ac3f8d780955bf95adf81ff37e33ea54;p=freetel-svn-tracking.git git-svn-id: https://svn.code.sf.net/p/freetel/code@761 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk index d06bdb59..0539a6ed 100644 --- a/fdmdv2/build/fdmdv2.mk +++ b/fdmdv2/build/fdmdv2.mk @@ -2,18 +2,18 @@ ## Auto Generated makefile by CodeLite IDE ## any manual changes will be erased ## -## Debug +## Release ProjectName :=fdmdv2 -ConfigurationName :=Debug +ConfigurationName :=Release WorkspacePath := "C:\bin\Projects\Radio\fdmdv2\build" ProjectPath := "C:\bin\Projects\Radio\fdmdv2\build" -IntermediateDirectory :=./Debug +IntermediateDirectory :=./Release OutDir := $(IntermediateDirectory) CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=OFA-Staff -Date :=10/12/2012 +Date :=10/15/2012 CodeLitePath :="C:\bin\CodeLite" LinkerName :=g++ SharedObjectLinkerName :=g++ -shared -fPIC @@ -35,13 +35,13 @@ PreprocessOnlySwitch :=-E ObjectsFileList :="C:\bin\Projects\Radio\fdmdv2\build\fdmdv2.txt" PCHCompileFlags := MakeDirCommand :=makedir -LinkOptions := -mwindows $(shell wx-config --debug=yes --libs --unicode=yes) -IncludePath := $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src $(IncludeSwitch)../3rdparty/portaudio/include $(IncludeSwitch)../3rdparty/portaudio/bindings/cpp/include $(IncludeSwitch)../3rdparty/libsndfile/include $(IncludeSwitch)../3rdparty/libsamplerate-0.1.8/src +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 IncludePCH := RcIncludePath := Libs := $(LibrarySwitch)sndfile-1 $(LibrarySwitch)codec2 $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp -ArLibs := "libsndfile-1.dll" "libcodec2.a" "libportaudio.a" "libportaudiocpp.a" -LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW/msys/1.0/local/lib $(LibraryPathSwitch)../extern/lib +ArLibs := "libsndfile-1.dll" "codec2" "libportaudio.a" "libportaudiocpp.a" +LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/Projects/Radio/codec2-dev/src/.libs $(LibraryPathSwitch)/bin/MinGW-4.6.1/msys/1.0/local/lib ## ## Common variables @@ -50,8 +50,8 @@ LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW/m AR := ar rcus CXX := g++ CC := gcc -CXXFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"744\" $(Preprocessors) -CFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"744\" $(Preprocessors) +CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"760\" $(Preprocessors) +CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"760\" $(Preprocessors) ## @@ -78,7 +78,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects) $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions) $(IntermediateDirectory)/.d: - @$(MakeDirCommand) "./Debug" + @$(MakeDirCommand) "./Release" PreBuild: @@ -237,6 +237,6 @@ clean: $(RM) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(PreprocessSuffix) $(RM) $(OutputFile) $(RM) $(OutputFile).exe - $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-debug\fdmdv2" + $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-release\fdmdv2" diff --git a/fdmdv2/build/fdmdv2.project b/fdmdv2/build/fdmdv2.project index 1bc20294..13082e86 100644 --- a/fdmdv2/build/fdmdv2.project +++ b/fdmdv2/build/fdmdv2.project @@ -71,6 +71,8 @@ + + @@ -88,13 +90,10 @@ - - - @@ -133,19 +132,15 @@ - + - - - - - - + + - + @@ -182,6 +177,4 @@ - - diff --git a/fdmdv2/build/fdmdv2.txt b/fdmdv2/build/fdmdv2.txt index 43680006..4221d1f3 100644 --- a/fdmdv2/build/fdmdv2.txt +++ b/fdmdv2/build/fdmdv2.txt @@ -1 +1 @@ -./Debug/src_dlg_about.o ./Debug/src_dlg_audio.o ./Debug/src_dlg_comports.o ./Debug/src_dlg_options.o ./Debug/src_fdmdv2_main.o ./Debug/src_fdmdv2_plot.o ./Debug/src_topFrame.o ./Debug/src_fdmdv2_plot_scatter.o ./Debug/src_fdmdv2_plot_waterfall.o ./Debug/src_fdmdv2_plot_spectrum.o ./Debug/src_fdmdv2_pa_wrapper.o ./Debug/src_fdmdv2_plot_scalar.o ./Debug/src_fdmdv2_hdw_ports.o +./Release/src_dlg_about.o ./Release/src_dlg_audio.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_waterfall.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 diff --git a/fdmdv2/build/fdmdv2.workspace b/fdmdv2/build/fdmdv2.workspace index db92989a..6c12b0fd 100644 --- a/fdmdv2/build/fdmdv2.workspace +++ b/fdmdv2/build/fdmdv2.workspace @@ -1,15 +1,15 @@ + + + - + - - - diff --git a/fdmdv2/build/fdmdv2_wsp.mk b/fdmdv2/build/fdmdv2_wsp.mk index 4ea617a2..59fb53ea 100644 --- a/fdmdv2/build/fdmdv2_wsp.mk +++ b/fdmdv2/build/fdmdv2_wsp.mk @@ -1,8 +1,8 @@ .PHONY: clean All All: - @echo ----------Building project:[ fdmdv2 - Debug ]---------- + @echo ----------Building project:[ fdmdv2 - Release ]---------- @"$(MAKE)" -f "fdmdv2.mk" clean: - @echo ----------Cleaning project:[ fdmdv2 - Debug ]---------- + @echo ----------Cleaning project:[ fdmdv2 - Release ]---------- @"$(MAKE)" -f "fdmdv2.mk" clean diff --git a/fdmdv2/src/Makefile b/fdmdv2/src/Makefile index 954acb1f..f726ab51 100644 --- a/fdmdv2/src/Makefile +++ b/fdmdv2/src/Makefile @@ -42,11 +42,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/david/fdmdv2/missing --run aclocal-1.11 -AMTAR = ${SHELL} /home/david/fdmdv2/missing --run tar -AUTOCONF = ${SHELL} /home/david/fdmdv2/missing --run autoconf -AUTOHEADER = ${SHELL} /home/david/fdmdv2/missing --run autoheader -AUTOMAKE = ${SHELL} /home/david/fdmdv2/missing --run automake-1.11 +ACLOCAL = ${SHELL} /p/Radio/fdmdv2/missing --run aclocal-1.11 +AMTAR = ${SHELL} /p/Radio/fdmdv2/missing --run tar +AUTOCONF = ${SHELL} /p/Radio/fdmdv2/missing --run autoconf +AUTOHEADER = ${SHELL} /p/Radio/fdmdv2/missing --run autoheader +AUTOMAKE = ${SHELL} /p/Radio/fdmdv2/missing --run automake-1.11 AWK = gawk CC = gcc CCDEPMODE = depmode=none @@ -60,9 +60,9 @@ ECHO_C = ECHO_N = -n ECHO_T = EGREP = /bin/grep -E -EXEEXT = +EXEEXT = .exe GREP = /bin/grep -INSTALL = /usr/bin/install -c +INSTALL = /bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} @@ -105,7 +105,7 @@ LIBS = -lsndfile-1 \ -lwsock32 LTLIBOBJS = -MAKEINFO = ${SHELL} /home/david/fdmdv2/missing --run makeinfo +MAKEINFO = ${SHELL} /p/Radio/fdmdv2/missing --run makeinfo MKDIR_P = /bin/mkdir -p OBJEXT = o PACKAGE = fdmdv2 @@ -117,13 +117,13 @@ PACKAGE_URL = PACKAGE_VERSION = 0.2 PATH_SEPARATOR = : SET_MAKE = -SHELL = /bin/bash +SHELL = /bin/sh STRIP = VERSION = 0.2 -abs_builddir = /home/david/fdmdv2/src -abs_srcdir = /home/david/fdmdv2/src -abs_top_builddir = /home/david/fdmdv2 -abs_top_srcdir = /home/david/fdmdv2 +abs_builddir = /p/Radio/fdmdv2/src +abs_srcdir = /p/Radio/fdmdv2/src +abs_top_builddir = /p/Radio/fdmdv2 +abs_top_srcdir = /p/Radio/fdmdv2 ac_ct_CC = gcc am__include = include am__leading_dot = . @@ -142,7 +142,7 @@ host_alias = htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/david/fdmdv2/install-sh +install_sh = ${SHELL} /p/Radio/fdmdv2/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp index 0db8ab68..82004621 100644 --- a/fdmdv2/src/fdmdv2_main.cpp +++ b/fdmdv2/src/fdmdv2_main.cpp @@ -801,6 +801,22 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event) } } +//---------------------------------------------------------- +// OnTogBtnLoopRx() +//---------------------------------------------------------- +void MainFrame::OnTogBtnLoopRx( wxCommandEvent& event ) +{ + wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnLoopRx()"), wxOK); +} + +//---------------------------------------------------------- +// OnTogBtnLoopTx() +//---------------------------------------------------------- +void MainFrame::OnTogBtnLoopTx( wxCommandEvent& event ) +{ + wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnLoopRx()"), wxOK); +} + //---------------------------------------------------------- // Audio stream processing loop states (globals). //---------------------------------------------------------- @@ -878,7 +894,7 @@ void MainFrame::startRxStream() { wxMessageBox(wxT("Rx Error: No default output device."), wxT("Error"), wxOK); delete m_rxPa; - m_RxRunning = false; + m_RxRunning = false; return; } m_rxErr = m_rxPa->setOutputDevice(m_rxDevOut); @@ -918,7 +934,6 @@ void MainFrame::startRxStream() delete m_rxPa; fifo_destroy(m_rxUserdata->infifo); fifo_destroy(m_rxUserdata->outfifo); - m_RxRunning = false; return; } m_rxErr = m_rxPa->streamStart(); @@ -928,7 +943,6 @@ void MainFrame::startRxStream() delete m_rxPa; fifo_destroy(m_rxUserdata->infifo); fifo_destroy(m_rxUserdata->outfifo); - m_RxRunning = false; return; } } @@ -1123,8 +1137,7 @@ int MainFrame::rxCallback( assert(inputBuffer != NULL); assert(outputBuffer != NULL); - - /* + /* framesPerBuffer is portaudio-speak for number of samples we actually get from the record side and need to provide to the play side. On Linux (at least) it was found that @@ -1169,10 +1182,9 @@ int MainFrame::rxCallback( } g_nInputBuf += FDMDV_NOM_SAMPLES_PER_FRAME; per_frame_rx_processing(g_pRxOutBuf, &g_nOutputBuf, g_CodecBits, g_RxInBuf, &g_nInputBuf, &g_nRxIn, &g_State, g_pCodec2); - //cbData->pWFPanel->m_newdata = true; //cbData->pSPPanel->m_newdata = true; - + // if demod out of sync copy input audio from A/D to aid in tuning if (g_nOutputBuf >= N8) { @@ -1198,7 +1210,7 @@ int MainFrame::rxCallback( { g_pRxOutBuf[i] = g_pRxOutBuf[i + N8]; } - + /* test: echo input to output, make this loopback option */ for(i=0; i