From cc23a99acfb3fd94a0effcbdc15b6e1fdca29226 Mon Sep 17 00:00:00 2001 From: hobbes1069 Date: Tue, 3 Jun 2014 16:51:43 +0000 Subject: [PATCH] Update references of codec2-dev to codec2. git-svn-id: https://svn.code.sf.net/p/freetel/code@1629 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2/README_fdmdv.txt | 2 +- codec2/asterisk/README | 16 ++++++++-------- codec2/octave/codec2_demo.m | 4 ++-- codec2/octave/tget_spec.m | 2 +- codec2/stm32/README.txt | 8 ++++---- fdmdv2/README.Win32 | 4 ++-- fdmdv2/README.osx | 4 ++-- fdmdv2/build/codelite/fdmdv2.mk | 16 ++++++++-------- fdmdv2/build/codelite/fdmdv2.project | 14 +++++++------- fdmdv2/cmake/BuildCodec2.cmake | 2 +- fdmdv2/fdmdv2.project | 8 ++++---- fdmdv2/src/Makefile.linux | 6 +++--- fdmdv2/src/Makefile.linux.dmw | 2 +- fdmdv2/src/Makefile.win32 | 6 +++--- fdmdv2/src/Makefile.win32.dmw | 2 +- 15 files changed, 48 insertions(+), 48 deletions(-) diff --git a/codec2/README_fdmdv.txt b/codec2/README_fdmdv.txt index 81c8c4df..fd920ba9 100644 --- a/codec2/README_fdmdv.txt +++ b/codec2/README_fdmdv.txt @@ -17,7 +17,7 @@ operation of the Octave and C versions are identical. Quickstart ---------- -$ cd codec2-dev +$ cd codec2 $ ./configure && make $ cd src diff --git a/codec2/asterisk/README b/codec2/asterisk/README index a2d3b512..9bc814b4 100644 --- a/codec2/asterisk/README +++ b/codec2/asterisk/README @@ -17,18 +17,18 @@ Asterisk must be patched so that the core understand Codec 2 frames. 1/ First install Codec 2: - david@cool:~$ svn co https://freetel.svn.sourceforge.net/svnroot/freetel/codec2-dev codec2-dev - david@cool:~/codec2-dev$ cd codec2-dev - david@cool:~/codec2-dev$ ./configure && make && sudo make install - david@bear:~/codec2-dev$ sudo ldconfig -v - david@cool:~/codec2-dev$ cd ~ + david@cool:~$ svn co https://freetel.svn.sourceforge.net/svnroot/freetel/codec2 codec2 + david@cool:~/codec2$ cd codec2 + david@cool:~/codec2$ ./configure && make && sudo make install + david@bear:~/codec2$ sudo ldconfig -v + david@cool:~/codec2$ cd ~ 2/ Then build Asterisk with Codec 2 support: david@cool:~$ tar xvzf asterisk-1.8.9.0.tar.gz - david@cool:~/asterisk-1.8.9.0$ patch -p4 < ~/codec2-dev/asterisk/asterisk-codec2.patch - david@cool:~/asterisk-1.8.9.0$ cp ~/codec2-dev/asterisk/codec_codec2.c . - david@cool:~/asterisk-1.8.9.0$ cp ~/codec2-dev/asterisk/ex_codec2.h ./codecs + david@cool:~/asterisk-1.8.9.0$ patch -p4 < ~/codec2/asterisk/asterisk-codec2.patch + david@cool:~/asterisk-1.8.9.0$ cp ~/codec2/asterisk/codec_codec2.c . + david@cool:~/asterisk-1.8.9.0$ cp ~/codec2/asterisk/ex_codec2.h ./codecs david@cool:~/asterisk-1.8.9.0$ ./configure && make ASTLDFLAGS=-lcodec2 david@cool:~/asterisk-1.8.9.0$ sudo make install david@cool:~/asterisk-1.8.9.0$ sudo make samples diff --git a/codec2/octave/codec2_demo.m b/codec2/octave/codec2_demo.m index 0f3950bf..6cd26970 100644 --- a/codec2/octave/codec2_demo.m +++ b/codec2/octave/codec2_demo.m @@ -8,7 +8,7 @@ % for conference and user group presentations on a projector. An % alternative to static overhead slides. % -% Derived from codec2-dev/octave/plamp.m +% Derived from codec2/octave/plamp.m % % usage: % octave:1> plamp("../src/hts2a",40) @@ -22,7 +22,7 @@ % % The text files used as input are generated using c2sim: % -% /codec2-dev/src$ c2sim ../raw/hts2a.raw --dump hts2a +% /codec2/src$ c2sim ../raw/hts2a.raw --dump hts2a % % The Codec 2 README explains how to build c2sim with dump files % enabled. diff --git a/codec2/octave/tget_spec.m b/codec2/octave/tget_spec.m index e46c1ea0..593f2af2 100644 --- a/codec2/octave/tget_spec.m +++ b/codec2/octave/tget_spec.m @@ -3,7 +3,7 @@ % Used in conjunction with src/fdmdv_demod to test the % fdmdv_get_rx_spectrum() function. % -% codec2-dev/src$ ./fdmdv_demod fdmdv_mod.raw tmp.c2 dump.txt +% codec2/src$ ./fdmdv_demod fdmdv_mod.raw tmp.c2 dump.txt % octave:3> tget_spec("../src/dump.txt") % % Copyright David Rowe 2012 diff --git a/codec2/stm32/README.txt b/codec2/stm32/README.txt index 0a8885ea..9b79ee88 100644 --- a/codec2/stm32/README.txt +++ b/codec2/stm32/README.txt @@ -50,17 +50,17 @@ Getting Started . Place a copy of hts1a.raw in the stlink directory and start st-util: - ~/stlink$ cp ~/codec2-dev/raw/hts1a.raw stm_in.raw - ~/stlink$ sudo ./st-util -f /home/david/codec2-dev/stm32/stm32f4_codec2.elf + ~/stlink$ cp ~/codec2/raw/hts1a.raw stm_in.raw + ~/stlink$ sudo ./st-util -f /home/david/codec2/stm32/stm32f4_codec2.elf . In _another_ console start gdb: - $ ~/codec2-dev/stm32$ ~/gcc-arm-none-eabi-4_7-2013q1/bin/arm-none-eabi-gdb stm32f4_codec2.elf + $ ~/codec2/stm32$ ~/gcc-arm-none-eabi-4_7-2013q1/bin/arm-none-eabi-gdb stm32f4_codec2.elf (gdb) tar ext :4242 (gdb) load - `/home/david/codec2-dev/stm32/fft_test.elf' has changed; re-reading symbols. + `/home/david/codec2/stm32/fft_test.elf' has changed; re-reading symbols. Loading section .isr_vector, size 0x188 lma 0x8000000 Loading section .text, size 0x1a4b4 lma 0x8000188 Loading section .data, size 0x28f0 lma 0x801a63c diff --git a/fdmdv2/README.Win32 b/fdmdv2/README.Win32 index 7a40e6da..3fc3f28e 100644 --- a/fdmdv2/README.Win32 +++ b/fdmdv2/README.Win32 @@ -63,8 +63,8 @@ Many variations are possible. I couldn't find an install command line that worked, so manually copied the libs and include files. 9. Codec 2 - $ wget https://freetel.svn.sourceforge.net/svnroot/freetel/codec2-dev - $ cd codec2-dev + $ wget https://freetel.svn.sourceforge.net/svnroot/freetel/codec2 + $ cd codec2 $ ./configure && make 10. svn co fdmdv2 diff --git a/fdmdv2/README.osx b/fdmdv2/README.osx index e8787c77..1e3eeca9 100644 --- a/fdmdv2/README.osx +++ b/fdmdv2/README.osx @@ -136,7 +136,7 @@ Index: src/Makefile.osx + +# Codec 2 ----------------------------------------------- + -+CODEC2=codec2-dev ++CODEC2=codec2 +CODEC2_INC=-I$(CODEC2)/src +CODEC2_LIB=$(CODEC2)/src/.libs/libcodec2.a + @@ -196,7 +196,7 @@ Index: src/Makefile.osx + cd $(CODEC2) && CPPFLAGS="-arch i386" LDFLAGS="-arch i386" ./configure && make && touch .built + +$(CODEC2): -+ svn co https://freetel.svn.sourceforge.net/svnroot/freetel/codec2-dev ++ svn co https://freetel.svn.sourceforge.net/svnroot/freetel/codec2 \ No newline at end of file Index: src/Makefile.win32 =================================================================== diff --git a/fdmdv2/build/codelite/fdmdv2.mk b/fdmdv2/build/codelite/fdmdv2.mk index c5255976..1864ae1d 100644 --- a/fdmdv2/build/codelite/fdmdv2.mk +++ b/fdmdv2/build/codelite/fdmdv2.mk @@ -38,12 +38,12 @@ MakeDirCommand :=makedir RcCmpOptions := $(shell wx-config --rcflags) RcCompilerName :=windres LinkOptions := -mwindows $(shell wx-config --debug=yes --libs --unicode=yes) -IncludePath := $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.7.1/msys/1.0/local/include $(IncludeSwitch)../../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/include +IncludePath := $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.7.1/msys/1.0/local/include $(IncludeSwitch)../../../codec2/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/include IncludePCH := RcIncludePath := Libs := $(LibrarySwitch)sndfile-1 $(LibrarySwitch)codec2 $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp $(LibrarySwitch)samplerate.dll $(LibrarySwitch)ctb-0.16 $(LibrarySwitch)sox ArLibs := "libsndfile-1.dll" "codec2" "libportaudio.a" "libportaudiocpp.a" "libsamplerate.dll.a" "libctb-0.16.a" "libsox" -LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/Radio/codec2-dev/src/.libs $(LibraryPathSwitch)d:/bin/MinGW-4.7.1/msys/1.0/local/lib +LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/Radio/codec2/src/.libs $(LibraryPathSwitch)d:/bin/MinGW-4.7.1/msys/1.0/local/lib ## ## Common variables @@ -204,13 +204,13 @@ $(IntermediateDirectory)/src_dlg_about$(DependSuffix): ../../src/dlg_about.cpp $(IntermediateDirectory)/src_dlg_about$(PreprocessSuffix): ../../src/dlg_about.cpp @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_dlg_about$(PreprocessSuffix) "../../src/dlg_about.cpp" -$(IntermediateDirectory)/src_golay23$(ObjectSuffix): ../../../codec2-dev/src/golay23.c $(IntermediateDirectory)/src_golay23$(DependSuffix) - $(CC) $(SourceSwitch) "D:/Projects/Radio/codec2-dev/src/golay23.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_golay23$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/src_golay23$(DependSuffix): ../../../codec2-dev/src/golay23.c - @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_golay23$(ObjectSuffix) -MF$(IntermediateDirectory)/src_golay23$(DependSuffix) -MM "../../../codec2-dev/src/golay23.c" +$(IntermediateDirectory)/src_golay23$(ObjectSuffix): ../../../codec2/src/golay23.c $(IntermediateDirectory)/src_golay23$(DependSuffix) + $(CC) $(SourceSwitch) "D:/Projects/Radio/codec2/src/golay23.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_golay23$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/src_golay23$(DependSuffix): ../../../codec2/src/golay23.c + @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_golay23$(ObjectSuffix) -MF$(IntermediateDirectory)/src_golay23$(DependSuffix) -MM "../../../codec2/src/golay23.c" -$(IntermediateDirectory)/src_golay23$(PreprocessSuffix): ../../../codec2-dev/src/golay23.c - @$(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_golay23$(PreprocessSuffix) "../../../codec2-dev/src/golay23.c" +$(IntermediateDirectory)/src_golay23$(PreprocessSuffix): ../../../codec2/src/golay23.c + @$(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_golay23$(PreprocessSuffix) "../../../codec2/src/golay23.c" -include $(IntermediateDirectory)/*$(DependSuffix) diff --git a/fdmdv2/build/codelite/fdmdv2.project b/fdmdv2/build/codelite/fdmdv2.project index f542f8fb..acef6eff 100644 --- a/fdmdv2/build/codelite/fdmdv2.project +++ b/fdmdv2/build/codelite/fdmdv2.project @@ -22,7 +22,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -67,14 +67,14 @@ - + - + @@ -119,7 +119,7 @@ - + @@ -128,7 +128,7 @@ - + diff --git a/fdmdv2/cmake/BuildCodec2.cmake b/fdmdv2/cmake/BuildCodec2.cmake index d7ddcf93..f56a186b 100644 --- a/fdmdv2/cmake/BuildCodec2.cmake +++ b/fdmdv2/cmake/BuildCodec2.cmake @@ -1,6 +1,6 @@ include(ExternalProject) ExternalProject_Add(codec2 - SVN_REPOSITORY https://svn.code.sf.net/p/freetel/code/codec2-dev + SVN_REPOSITORY https://svn.code.sf.net/p/freetel/code/codec2 CMAKE_ARGS -DBUILD_SHARED_LIBS=FALSE INSTALL_COMMAND "" ) diff --git a/fdmdv2/fdmdv2.project b/fdmdv2/fdmdv2.project index bd5b0f32..1e699ebc 100644 --- a/fdmdv2/fdmdv2.project +++ b/fdmdv2/fdmdv2.project @@ -52,8 +52,8 @@ - - + + @@ -73,7 +73,7 @@ - + @@ -118,7 +118,7 @@ - + diff --git a/fdmdv2/src/Makefile.linux b/fdmdv2/src/Makefile.linux index b0de67a4..f49e9e2a 100644 --- a/fdmdv2/src/Makefile.linux +++ b/fdmdv2/src/Makefile.linux @@ -52,7 +52,7 @@ endif # Codec 2 ----------------------------------------------- -CODEC2=codec2-dev +CODEC2=codec2 CODEC2_INC=-I$(CODEC2)/src CODEC2_LIB=$(CODEC2)/src/.libs/libcodec2.a @@ -112,7 +112,7 @@ dlg_filter.o \ dlg_options.o \ varicode.o \ sox_biquad.o \ -codec2-dev/src/golay23.c \ +codec2/src/golay23.c \ hamlib.o all: $(LIBS_TO_BUILD) $(CODEC2)/.built freedv @@ -167,7 +167,7 @@ $(CODEC2)/.built: $(CODEC2) cd $(CODEC2) && ./configure && make && touch .built $(CODEC2): - svn co https://freetel.svn.sourceforge.net/svnroot/freetel/codec2-dev + svn co https://freetel.svn.sourceforge.net/svnroot/freetel/codec2 # sox ------------------------------------------------------------- diff --git a/fdmdv2/src/Makefile.linux.dmw b/fdmdv2/src/Makefile.linux.dmw index d12ae25b..bb835cda 100644 --- a/fdmdv2/src/Makefile.linux.dmw +++ b/fdmdv2/src/Makefile.linux.dmw @@ -8,7 +8,7 @@ # EDIT THESE FOR YOUR SYSTEM ---------------------------- WX_GTK_PATH=/home/wittend/Projects/wxWidgets-2.9.4/build_gtk -CODEC2_PATH=/home/wittend/Projects/codec2-dev +CODEC2_PATH=/home/wittend/Projects/codec2 # SOX_LIB_PATH=$(HOME)/sox-14.4.0/src/.libs - not required because I installed soxlib from the repo. # END EDITS --------------------------------------------- diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32 index 58e00d9d..7ae88d7f 100644 --- a/fdmdv2/src/Makefile.win32 +++ b/fdmdv2/src/Makefile.win32 @@ -5,7 +5,7 @@ # # $ make -f Makefile.Win32 -CODEC2_PATH=$(HOME)/codec2-dev +CODEC2_PATH=$(HOME)/codec2 INCLUDE_PATH=/usr/local/include WX_CONFIG=wx-config @@ -33,9 +33,9 @@ dlg_filter.o \ varicode.o \ sox_biquad.o \ hamlib.o \ -../../codec2-dev/src/golay23.o +../../codec2/src/golay23.o -HDRS = version.h dlg_audiooptions.h dlg_ptt.h dlg_filter.h fdmdv2_main.h fdmdv2_defines.h fdmdv2_plot.h fdmdv2_plot_scalar.h fdmdv2_plot_waterfall.h fdmdv2_plot_scatter.h fdmdv2_plot_spectrum.h fdmdv2_pa_wrapper.h topFrame.h dlg_audiooptions.h topFrame.h varicode.h ../../codec2-dev/src/golay23.h hamlib.h +HDRS = version.h dlg_audiooptions.h dlg_ptt.h dlg_filter.h fdmdv2_main.h fdmdv2_defines.h fdmdv2_plot.h fdmdv2_plot_scalar.h fdmdv2_plot_waterfall.h fdmdv2_plot_scatter.h fdmdv2_plot_spectrum.h fdmdv2_pa_wrapper.h topFrame.h dlg_audiooptions.h topFrame.h varicode.h ../../codec2/src/golay23.h hamlib.h all: freedv diff --git a/fdmdv2/src/Makefile.win32.dmw b/fdmdv2/src/Makefile.win32.dmw index 8b968caf..739124fd 100644 --- a/fdmdv2/src/Makefile.win32.dmw +++ b/fdmdv2/src/Makefile.win32.dmw @@ -6,7 +6,7 @@ # EDIT THESE FOR YOUR SYSTEM ---------------------------- -CODEC2_PATH=D:/Projects/Radio/codec2-dev +CODEC2_PATH=D:/Projects/Radio/codec2 INCLUDE_PATH=d:/bin/MinGW-4.6.1/msys/1.0/local/lib # not required because I installed soxlib in my: -- 2.25.1