diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 952f41e384b6ee77df99f8a03f8042824cb64afb..21cfc0bcf8a84d9be8457f8bbe181c769050720b 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -4,7 +4,7 @@ { "name": "Windows64-Release", "includePath": [ - "${workspaceFolder}/src", + "${workspaceFolder}/src/", "${workspaceFolder}/src/include", "${workspaceFolder}/src/include/rls" ], @@ -12,7 +12,7 @@ "WIN32", "__DEBUG__=0" ], - "compilerPath": "gcc.exe", + //"compilerPath": "gcc.exe", "cStandard": "c11", "cppStandard": "c++11", "intelliSenseMode": "gcc-x64" @@ -20,7 +20,7 @@ { "name": "Windows32-Release", "includePath": [ - "${workspaceFolder}/src", + "${workspaceFolder}/src/", "${workspaceFolder}/src/include", "${workspaceFolder}/src/include/rls" ], @@ -28,7 +28,7 @@ "WIN32", "__DEBUG__=0" ], - "compilerPath": "gcc.exe", + //"compilerPath": "gcc.exe", "cStandard": "c11", "cppStandard": "c++11", "intelliSenseMode": "gcc-x64" @@ -36,7 +36,7 @@ { "name": "Windows32-Debug", "includePath": [ - "${workspaceFolder}/src", + "${workspaceFolder}/src/", "${workspaceFolder}/src/include", "${workspaceFolder}/src/include/dbg" ], @@ -45,7 +45,7 @@ "__DEBUG__=1", "INCLUDE_DSPE_EXAMPLES" ], - "compilerPath": "gcc.exe", + //"compilerPath": "gcc.exe", "cStandard": "c11", "cppStandard": "c++11", "intelliSenseMode": "gcc-x64" @@ -53,7 +53,7 @@ { "name": "Windows64-Debug", "includePath": [ - "${workspaceFolder}/src", + "${workspaceFolder}/src/", "${workspaceFolder}/src/include", "${workspaceFolder}/src/include/dbg" ], @@ -62,7 +62,7 @@ "__DEBUG__=1", "INCLUDE_DSPE_EXAMPLES" ], - "compilerPath": "gcc.exe", + //"compilerPath": "gcc.exe", "cStandard": "c11", "cppStandard": "c++11", "intelliSenseMode": "gcc-x64" @@ -108,7 +108,8 @@ "defines": [ "LINUX", "__DEBUG__=1", - "INCLUDE_DSPE_EXAMPLES" + "INCLUDE_DSPE_EXAMPLES", + "AUDIO_DEBUG_MESSAGES_ON" ], "compilerPath": "/usr/bin/gcc", "cStandard": "c11", diff --git a/.vscode/settings.json b/.vscode/settings.json index 2b08d7f5660ec1f557bcdbe7237f90be84df997c..420a4e7c887428510cdcd56b06a700272562db9d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -49,6 +49,10 @@ "streambuf": "cpp", "thread": "cpp", "typeinfo": "cpp", - "iterator": "cpp" - } + "iterator": "cpp", + "bit": "cpp", + "numeric": "cpp", + "random": "cpp" + }, + "C_Cpp.errorSquiggles": "Disabled" } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 842fe3481ff9212ce35119d0cd97bca2dbaf3c11..53a9d914094c4ce2c7a2e2e2543ed2cc37df54b6 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -16,6 +16,12 @@ "presentation": { "echo": true }, + "windows": { + "options": { + "cwd": "${workspaceFolder}", + "env": {"PATH":"c:/msys64/usr/bin;c:/msys64/mingw64/bin/;${env:PATH}"} + }, + }, "problemMatcher": "$gcc" }, { @@ -26,6 +32,12 @@ "presentation": { "echo": true }, + "windows": { + "options": { + "cwd": "${workspaceFolder}", + "env": {"PATH":"c:/msys64/usr/bin;c:/msys64/mingw64/bin/;${env:PATH}"} + }, + }, "problemMatcher": "$gcc" }, { @@ -36,23 +48,35 @@ "presentation": { "echo": true }, + "windows": { + "options": { + "cwd": "${workspaceFolder}", + "env": {"PATH":"c:/msys64/usr/bin;c:/msys64/mingw64/bin/;${env:PATH}"} + }, + }, "problemMatcher": "$gcc" }, { - "label": "build examples Windows", + "label": "Build examples Windows", "type": "shell", - "command": "make -f examples/makefile Mbit=64 SRC_DIR=examples DSPELIB_DIR_ROOT=../_DSPE_lib_minGW_/MinGW-W64_8.1.0", + //"command": "make -f examples/makefile Mbit=64 SRC_DIR=examples DSPELIB_DIR_ROOT=../_DSPE_lib_minGW_/MinGW-W64_8.1.0", + "command": "make -f examples/makefile Mbit=64 SRC_DIR=examples", "group": "build", "presentation": { "echo": true }, //"options": {"cwd" : "./examples"}, + "options": { + "cwd": "${workspaceFolder}", + "env": {"PATH":"c:/msys64/usr/bin;c:/msys64/mingw64/bin/;${env:PATH}"} + }, "problemMatcher": "$gcc" }, { - "label": "build examples Linux", + "label": "Build examples Linux", "type": "shell", - "command": "make -f examples/makefile-m64.linux Mbit=64 SRC_DIR=examples DSPELIB_DIR_ROOT=../_DSPE_lib_linux_/x86_64-linux-gnu-gcc_9", + //"command": "make -f examples/makefile-m64.linux Mbit=64 SRC_DIR=examples DSPELIB_DIR_ROOT=../_DSPE_lib_linux_/x86_64-linux-gnu-gcc_9", + "command": "make -f examples/makefile-m64.linux Mbit=64 SRC_DIR=examples", "group": "build", "presentation": { "echo": true @@ -61,18 +85,21 @@ "problemMatcher": "$gcc" }, { - "label": "clean examples Windows", + "label": "Clean examples Windows", "type": "shell", "command": "make clean -f examples/makefile SRC_DIR=examples ", "group": "build", "presentation": { "echo": true }, - //"options": {"cwd" : "./examples"}, + "options": { + "cwd": "${workspaceFolder}", + "env": {"PATH":"c:/msys64/usr/bin;c:/msys64/mingw64/bin/;${env:PATH}"} + }, "problemMatcher": "$gcc" }, { - "label": "clean examples Linux", + "label": "Clean examples Linux", "type": "shell", "command": "make clean -f examples/makefile-m64.linux SRC_DIR=examples ", "group": "build", diff --git a/CHANGELOG b/CHANGELOG index 1955561aa9092a153a5e5a33728717a4431f4e66..8bc44af32409e331805ce5284f05d37228d6a82c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ TODO:: SOUND_support_t::get_wave_in_raw_buffer - zastÄ piÄ metodÄ zawierajÄ cÄ konwersjÄ typu, ew. rozbudowaÄ konwersjÄ w DSP::u::AudioInput + - test socket support on Linux (test examples as there are have been noticed some problems with bind) ? DSP::Clock_ptr => migrate to std::shared_ptr !!! Add TELEsound and PiAPS_sound projects to GitLab and start addaptation to new library version @@ -7,6 +8,9 @@ TODO:: LAST DONE: CHANGES: +- ver. 0.20.010 - <b>2021.12.19</b> Changed: + - Wiki for VSCode updated + - tasks.json and makefiles updates and fixes - ver. 0.20.010 - <b>2021.09.15</b> Changed: - Fixed: DSP::WMM_object_t::stop_playback fix - Fixed: hello.cpp - using different wav file path if test_echo() is used diff --git a/comp.bat b/comp.bat deleted file mode 100644 index ac810017c54ae0a89c64f9fa0e7ee3a674621ca4..0000000000000000000000000000000000000000 --- a/comp.bat +++ /dev/null @@ -1,3 +0,0 @@ -path=e:\cygwin\bin -rem set WXWIN=D:/Eclipse/_OTHERs_/wxWindows/Cygwin/wxWindows-2.4.2 - diff --git a/compilelib_mingw_CodeBlocks_32bit_TDM_5.1.0.bat b/compilelib_mingw_CodeBlocks_32bit_TDM_5.1.0.bat deleted file mode 100644 index 9e7470a98a4036e01090c911a1a885805c359660..0000000000000000000000000000000000000000 --- a/compilelib_mingw_CodeBlocks_32bit_TDM_5.1.0.bat +++ /dev/null @@ -1,116 +0,0 @@ -rem comflag=-m32 - kompilacja w wersji 32-bitowej (tdm-gcc 4.9.2) -set comflag=-m32 -set com_ver=TDM_5.1.0 - - -IF exist compilelib_mingw_CodeBlocks_32bit_TDM_5.1.0.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "git_folder/DSPElib/DSPE_lib" -cd git_folder/DSPElib/DSPE_lib - -IF exist compilelib_mingw_CodeBlocks_32bit_TDM_5.1.0.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -path=d:\CodeBlocks\MinGW\bin;d:\CodeBlocks\MinGW\mingw32\bin\;d:\msys\1.0\bin\;%path% - - -:MakeLib - -cd ..\..\..\workspace -mkdir _DSPE_lib_minGW_ -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver% -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\include -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\matlab -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\toolbox -cd ..\git_folder\DSPElib\DSPE_lib - - -mkdir "Debug CodeBlocks%comflag%_%com_ver%" -mkdir "Debug CodeBlocks%comflag%_%com_ver%\src" -mkdir "Debug CodeBlocks%comflag%_%com_ver%\src\cpp" -mkdir "Debug CodeBlocks%comflag%_%com_ver%\src\nvwa" -cd "Debug CodeBlocks%comflag%_%com_ver%" -rm -rf src/cpp/DSPclocks.o src/Main.o src/Main.d src/cpp/DSPclocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_misc.d src/cpp/DSPmodules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSPmodules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSPmodules_misc.o src/cpp/DSPmodules_misc.d src/cpp/DSPmodules.d src/cpp/DSPmodules.o src/cpp/DSP_DOT.o src/cpp/DSPsockets.o src/cpp/DSPsockets.d - -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -fpermissive -o src\cpp\DSP_AudioMixer.o ..\src\cpp\DSP_AudioMixer.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_Fourier.o ..\src\cpp\DSP_Fourier.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPsockets.o ..\src\cpp\DSPsockets.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_misc.o ..\src\cpp\DSP_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPclocks.o ..\src\cpp\DSPclocks.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules.o ..\src\cpp\DSPmodules.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules2.o ..\src\cpp\DSPmodules2.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_DOT.o ..\src\cpp\DSP_DOT.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\Main.o ..\src\Main.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules_misc.o ..\src\cpp\DSPmodules_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_IO.o ..\src\cpp\DSP_IO.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\nvwa\debug_new.o ..\src\nvwa\debug_new.cpp -g++ %comflag% -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\nvwa\debug_new.o src\cpp\DSPsockets.o src\cpp\DSPmodules_misc.o src\cpp\DSPmodules2.o src\cpp\DSPmodules.o src\cpp\DSPclocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\Main.o -lwinmm -lws2_32 - -cd .. -mkdir "Release CodeBlocks%comflag%_%com_ver%" -mkdir "Release CodeBlocks%comflag%_%com_ver%\src" -mkdir "Release CodeBlocks%comflag%_%com_ver%\src\cpp" -mkdir "Release CodeBlocks%comflag%_%com_ver%\src\nvwa" -cd Release CodeBlocks%comflag%_%com_ver%" -rm -rf src/cpp/DSPclocks.o src/Main.o src/Main.d src/cpp/DSPclocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSPmodules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSPmodules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSPmodules_misc.o src/cpp/DSPmodules_misc.d src/cpp/DSPmodules.d src/cpp/DSPmodules.o src/cpp/DSP_DOT.o src/cpp/DSPsockets.o src/cpp/DSPsockets.d - -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -fpermissive -o src\cpp\DSP_AudioMixer.o ..\src\cpp\DSP_AudioMixer.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_Fourier.o ..\src\cpp\DSP_Fourier.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPsockets.o ..\src\cpp\DSPsockets.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_Misc.o ..\src\cpp\DSP_Misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPclocks.o ..\src\cpp\DSPclocks.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules.o ..\src\cpp\DSPmodules.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules2.o ..\src\cpp\DSPmodules2.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_DOT.o ..\src\cpp\DSP_DOT.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\Main.o ..\src\Main.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules_misc.o ..\src\cpp\DSPmodules_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_IO.o ..\src\cpp\DSP_IO.cpp -g++ %comflag% -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\cpp\DSPsockets.o src\cpp\DSPmodules_misc.o src\cpp\DSPmodules2.o src\cpp\DSPmodules.o src\cpp\DSPclocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\Main.o -lwinmm -lws2_32 - -cd .. - -copy /B examples\*.* ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\*.* -copy /B examples\matlab\*.* ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\matlab\*.* -copy /B matlab\toolbox\*.m ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\toolbox\*.m -copy /B src\include\*.h ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\include\*.* -copy /B src\include\rls\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.* -copy /B src\include\dbg\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.* - -cd "Debug CodeBlocks%comflag%_%com_ver%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSPsockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.* -del libDSPE.a Y -copy /B libDSPEsockets.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.* -del libDSPEsockets.a Y - -cd ..\..\.. - -cd "Release CodeBlocks%comflag%_%com_ver%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSPsockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.* -del libDSPE.a Y -copy /B libDSPEsockets.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.* -del libDSPEsockets.a Y - -cd ..\..\.. - -:End \ No newline at end of file diff --git a/compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0(b).bat b/compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0(b).bat deleted file mode 100644 index d336493f9be822fc7db8ca9ba39e7784c048a2d6..0000000000000000000000000000000000000000 --- a/compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0(b).bat +++ /dev/null @@ -1,143 +0,0 @@ -rem Wersja wykorzystujÄ ca katalog %TEMP% do zapisu tymczasowych plikĂłw wyjĹciowych -rem ------------------------------------------------------------------------------ -rem comflag=-m32 - kompilacja w wersji 32-bitowej (tdm-gcc 4.9.2) -set comflag=-m64 -set com_ver=MinGW-W64_8.1.0 - -set filename=compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0(b).bat - -IF exist %filename% GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "git_folder/DSPElib/DSPE_lib" -cd git_folder/DSPElib/DSPE_lib - -IF exist %filename% GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -rem path=d:\CodeBlocks\MinGW\bin;d:\CodeBlocks\MinGW\mingw32\bin\;d:\msys\1.0\bin\;%path% -path=d:\CodeBlocks_20_03\MinGW\bin;d:\CodeBlocks_20_03\MinGW\x86_64-w64-mingw32\bin\;d:\msys\1.0\bin\;%path% - - -:MakeLib - -cd ..\..\..\workspace -mkdir _DSPE_lib_minGW_ -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver% -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\include -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\matlab -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\toolbox -cd ..\git_folder\DSPElib\DSPE_lib - - -set in_dir=%cd% -set tmp_out_dir_dbg=%TEMP%\DEBUG CodeBlocks%comflag%_%com_ver% -set tmp_out_dir_rls=%TEMP%\Release CodeBlocks%comflag%_%com_ver% - -set tmp_out_dir=%tmp_out_dir_dbg% - -mkdir "%tmp_out_dir%" -mkdir "%tmp_out_dir%\src" -mkdir "%tmp_out_dir%\src\cpp" -mkdir "%tmp_out_dir%\src\nvwa" - -cd /d "%tmp_out_dir%" -rm -rf src/cpp/DSP_clocks.o src/Main.o src/Main.d src/cpp/DSP_clocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_misc.d src/cpp/DSP_modules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSP_modules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSP_modules_misc.o src/cpp/DSP_modules_misc.d src/cpp/DSP_modules.d src/cpp/DSP_modules.o src/cpp/DSP_DOT.o src/cpp/DSP_sockets.o src/cpp/DSP_sockets.d -rm -rf src/cpp/DSP_logstream.o src/cpp/DSP_logstream.d - -cd /d "%in_dir%" -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -fpermissive -o "%tmp_out_dir%\src\cpp\DSP_AudioMixer.o" .\src\cpp\DSP_AudioMixer.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_Fourier.o" .\src\cpp\DSP_Fourier.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_sockets.o" .\src\cpp\DSP_sockets.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_misc.o" .\src\cpp\DSP_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_clocks.o" .\src\cpp\DSP_clocks.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules.o" .\src\cpp\DSP_modules.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules2.o" .\src\cpp\DSP_modules2.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_DOT.o" .\src\cpp\DSP_DOT.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\Main.o" .\src\Main.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules_misc.o" .\src\cpp\DSP_modules_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_IO.o" .\src\cpp\DSP_IO.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_logstream.o" .\src\cpp\DSP_logstream.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\nvwa\debug_new.o" .\src\nvwa\debug_new.cpp -cd /d "%tmp_out_dir%" -g++ %comflag% -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\nvwa\debug_new.o src\cpp\DSP_sockets.o src\cpp\DSP_modules_misc.o src\cpp\DSP_modules2.o src\cpp\DSP_modules.o src\cpp\DSP_clocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\cpp\DSP_logstream.o src\Main.o -lwinmm -lws2_32 - - -set tmp_out_dir=%tmp_out_dir_rls% -mkdir "%tmp_out_dir%" -mkdir "%tmp_out_dir%\src" -mkdir "%tmp_out_dir%\src\cpp" -mkdir "%tmp_out_dir%\src\nvwa" - -cd /d "%tmp_out_dir%" -rm -rf src/cpp/DSP_clocks.o src/Main.o src/Main.d src/cpp/DSP_clocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_modules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSP_modules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSP_modules_misc.o src/cpp/DSP_modules_misc.d src/cpp/DSP_modules.d src/cpp/DSP_modules.o src/cpp/DSP_DOT.o src/cpp/DSP_sockets.o src/cpp/DSP_sockets.d -rm -rf src/cpp/DSP_logstream.o src/cpp/DSP_logstream.d - -cd /d "%in_dir%" -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -fpermissive -o "%tmp_out_dir%\src\cpp\DSP_AudioMixer.o" .\src\cpp\DSP_AudioMixer.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_Fourier.o" .\src\cpp\DSP_Fourier.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_sockets.o" .\src\cpp\DSP_sockets.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_Misc.o" .\src\cpp\DSP_Misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_clocks.o" .\src\cpp\DSP_clocks.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules.o" .\src\cpp\DSP_modules.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules2.o" .\src\cpp\DSP_modules2.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_DOT.o" .\src\cpp\DSP_DOT.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\Main.o" .\src\Main.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules_misc.o" .\src\cpp\DSP_modules_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_IO.o" .\src\cpp\DSP_IO.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_logstream.o" .\src\cpp\DSP_logstream.cpp -cd /d "%tmp_out_dir%" -g++ %comflag% -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\cpp\DSP_sockets.o src\cpp\DSP_modules_misc.o src\cpp\DSP_modules2.o src\cpp\DSP_modules.o src\cpp\DSP_clocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\cpp\DSP_logstream.o src\Main.o -lwinmm -lws2_32 - -cd /d "%in_dir%" - -copy /B examples\*.* ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\*.* -copy /B examples\matlab\*.* ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\matlab\*.* -copy /B matlab\toolbox\*.m ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\toolbox\*.m -copy /B src\include\*.h ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\include\*.* -copy /B src\include\rls\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.* -copy /B src\include\dbg\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.* - -rem cd "Debug CodeBlocks%comflag%_%com_ver%\src\cpp" -cd /d "%tmp_out_dir_dbg%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSP_clocks.o DSP_modules.o DSP_modules2.o DSP_Fourier.o DSP_AudioMixer.o DSP_modules_misc.o DSP_DOT.o DSP_logstream.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSP_sockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a "%in_dir%\..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.*" -del libDSPE.a Y -copy /B libDSPEsockets.a "%in_dir%\..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.*" -del libDSPEsockets.a Y - -rem cd ..\..\.. - -rem cd "Release CodeBlocks%comflag%_%com_ver%\src\cpp" -cd /d "%tmp_out_dir_rls%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSP_clocks.o DSP_modules.o DSP_modules2.o DSP_Fourier.o DSP_AudioMixer.o DSP_modules_misc.o DSP_DOT.o DSP_logstream.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSP_sockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a "%in_dir%\..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.*" -del libDSPE.a Y -copy /B libDSPEsockets.a "%in_dir%\..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.*" -del libDSPEsockets.a Y - -rem cd ..\..\.. -cd /d "%in_dir%" - -rm -rf "%tmp_out_dir_dbg%" -rm -rf "%tmp_out_dir_rls%" - -:End \ No newline at end of file diff --git a/compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0(c).bat b/compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0(c).bat deleted file mode 100644 index 540f2d2e1acd950919e559c5122986f66c55af5d..0000000000000000000000000000000000000000 --- a/compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0(c).bat +++ /dev/null @@ -1,196 +0,0 @@ -rem Wersja wykorzystujÄ ca katalog %TEMP% do zapisu tymczasowych plikĂłw wyjĹciowych -rem ------------------------------------------------------------------------------ -rem comflag=-m32 - kompilacja w wersji 32-bitowej (tdm-gcc 4.9.2) -set comflag=-m64 -set com_ver=MinGW-W64_8.1.0 - -set flags=-fmax-errors=5 %comflag% - -set start_dir=%cd% -rem set in_dir=%cd% -rem set in_dir=d:\Eclipse_Mars\git_folder\DSPElib\DSPE_lib -set in_dir=r:\DSPE_lib - -rem set workspace_dir=d:\Eclipse_Mars\workspace -set workspace_dir=R:\workspace -mkdir "%workspace_dir%" - - -set filename=%in_dir%\compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0(c).bat - -IF exist "%filename%" GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "git_folder/DSPElib/DSPE_lib" -cd git_folder/DSPElib/DSPE_lib - -IF exist "%filename%" GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -rem path=d:\CodeBlocks\MinGW\bin;d:\CodeBlocks\MinGW\mingw32\bin\;d:\msys\1.0\bin\;%path% -path=d:\CodeBlocks_20_03\MinGW\bin;d:\CodeBlocks_20_03\MinGW\x86_64-w64-mingw32\bin\;d:\msys\1.0\bin\;%path% - - -:MakeLib - -rem cd ..\..\..\workspace -cd /d "%workspace_dir%" -set library_dir=%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver% -mkdir _DSPE_lib_minGW_ -mkdir "%library_dir%" -mkdir "%library_dir%\rls" -mkdir "%library_dir%\dbg" -mkdir "%library_dir%\include" -mkdir "%library_dir%\examples" -mkdir "%library_dir%\examples\matlab" -mkdir "%library_dir%\toolbox" -rem cd ..\git_folder\DSPElib\DSPE_lib -cd /d "%in_dir%" - - -set tmp_out_dir_dbg=%TEMP%\DEBUG CodeBlocks%comflag%_%com_ver% -set tmp_out_dir_rls=%TEMP%\Release CodeBlocks%comflag%_%com_ver% - -set tmp_out_dir=%tmp_out_dir_dbg% - -mkdir "%tmp_out_dir%" -mkdir "%tmp_out_dir%\src" -mkdir "%tmp_out_dir%\src\cpp" -mkdir "%tmp_out_dir%\examples" -mkdir "%tmp_out_dir%\src\nvwa" - -cd /d "%tmp_out_dir%" -rm -rf src/cpp/DSP_clocks.o src/Main.o src/Main.d src/cpp/DSP_clocks.d "%library_dir%/DSPE_lib_dbg.exe" src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_misc.d src/cpp/DSP_modules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSP_modules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSP_modules_misc.o src/cpp/DSP_modules_misc.d src/cpp/DSP_modules.d src/cpp/DSP_modules.o src/cpp/DSP_DOT.o src/cpp/DSP_sockets.o src/cpp/DSP_sockets.d -rm -rf src/cpp/DSP_logstream.o src/cpp/DSP_logstream.d - -cd /d "%in_dir%" -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -fpermissive -o "%tmp_out_dir%\src\cpp\DSP_AudioMixer.o" .\src\cpp\DSP_AudioMixer.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_Fourier.o" .\src\cpp\DSP_Fourier.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_sockets.o" .\src\cpp\DSP_sockets.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_misc.o" .\src\cpp\DSP_misc.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_clocks.o" .\src\cpp\DSP_clocks.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules.o" .\src\cpp\DSP_modules.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules2.o" .\src\cpp\DSP_modules2.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_DOT.o" .\src\cpp\DSP_DOT.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\Main.o" .\src\Main.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules_misc.o" .\src\cpp\DSP_modules_misc.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_IO.o" .\src\cpp\DSP_IO.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_logstream.o" .\src\cpp\DSP_logstream.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\nvwa\debug_new.o" .\src\nvwa\debug_new.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish - -g++ %flags% -D_DSPE_TEST_ -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\examples\hello.o" .\examples\hello.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish - -cd /d "%tmp_out_dir%" -g++ %flags% -static -static-libgcc -static-libstdc++ -o "%library_dir%/DSPE_lib_dbg.exe" src\nvwa\debug_new.o src\cpp\DSP_sockets.o src\cpp\DSP_modules_misc.o src\cpp\DSP_modules2.o src\cpp\DSP_modules.o src\cpp\DSP_clocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\cpp\DSP_logstream.o examples\hello.o src\Main.o -lwinmm -lws2_32 -IF %ERRORLEVEL% NEQ 0 Goto Finish - - -set tmp_out_dir=%tmp_out_dir_rls% -mkdir "%tmp_out_dir%" -mkdir "%tmp_out_dir%\src" -mkdir "%tmp_out_dir%\src\cpp" -mkdir "%tmp_out_dir%\examples" -mkdir "%tmp_out_dir%\src\nvwa" - -cd /d "%tmp_out_dir%" -rm -rf src/cpp/DSP_clocks.o src/Main.o src/Main.d src/cpp/DSP_clocks.d "%library_dir%/DSPE_lib_rls.exe" src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_modules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSP_modules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSP_modules_misc.o src/cpp/DSP_modules_misc.d src/cpp/DSP_modules.d src/cpp/DSP_modules.o src/cpp/DSP_DOT.o src/cpp/DSP_sockets.o src/cpp/DSP_sockets.d -rm -rf src/cpp/DSP_logstream.o src/cpp/DSP_logstream.d - -cd /d "%in_dir%" -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -fpermissive -o "%tmp_out_dir%\src\cpp\DSP_AudioMixer.o" .\src\cpp\DSP_AudioMixer.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_Fourier.o" .\src\cpp\DSP_Fourier.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_sockets.o" .\src\cpp\DSP_sockets.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_Misc.o" .\src\cpp\DSP_Misc.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_clocks.o" .\src\cpp\DSP_clocks.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules.o" .\src\cpp\DSP_modules.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules2.o" .\src\cpp\DSP_modules2.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_DOT.o" .\src\cpp\DSP_DOT.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\Main.o" .\src\Main.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules_misc.o" .\src\cpp\DSP_modules_misc.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_IO.o" .\src\cpp\DSP_IO.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_logstream.o" .\src\cpp\DSP_logstream.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish - -g++ %flags% -D_DSPE_TEST_ -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\examples\hello.o" .\examples\hello.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish - -cd /d "%tmp_out_dir%" -g++ %flags% -static -static-libgcc -static-libstdc++ -o "%library_dir%/DSPE_lib_rls.exe" src\cpp\DSP_sockets.o src\cpp\DSP_modules_misc.o src\cpp\DSP_modules2.o src\cpp\DSP_modules.o src\cpp\DSP_clocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\cpp\DSP_logstream.o examples\hello.o src\Main.o -lwinmm -lws2_32 -IF %ERRORLEVEL% NEQ 0 Goto Finish - -cd /d "%in_dir%" - -copy /B examples\*.* "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\*.*" -copy /B examples\matlab\*.* "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\matlab\*.*" -copy /B matlab\toolbox\*.m "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\toolbox\*.m" -copy /B src\include\*.h "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\include\*.*" -copy /B src\include\rls\DSP_setup.h "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.*" -copy /B src\include\dbg\DSP_setup.h "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.*" - -rem cd "Debug CodeBlocks%comflag%_%com_ver%\src\cpp" -cd /d "%tmp_out_dir_dbg%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSP_clocks.o DSP_modules.o DSP_modules2.o DSP_Fourier.o DSP_AudioMixer.o DSP_modules_misc.o DSP_DOT.o DSP_logstream.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSP_sockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.*" -del libDSPE.a Y -copy /B libDSPEsockets.a "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.*" -del libDSPEsockets.a Y - -rem cd ..\..\.. - -rem cd "Release CodeBlocks%comflag%_%com_ver%\src\cpp" -cd /d "%tmp_out_dir_rls%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSP_clocks.o DSP_modules.o DSP_modules2.o DSP_Fourier.o DSP_AudioMixer.o DSP_modules_misc.o DSP_DOT.o DSP_logstream.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSP_sockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.*" -del libDSPE.a Y -copy /B libDSPEsockets.a "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.*" -del libDSPEsockets.a Y - -cd /d "%start_dir%" -rm -rf "%tmp_out_dir_dbg%" -rm -rf "%tmp_out_dir_rls%" - -:Finish -rem cd ..\..\.. -cd /d "%start_dir%" - -:End \ No newline at end of file diff --git a/compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0(d).bat b/compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0(d).bat deleted file mode 100644 index b40ddd4eebd7e9849db1f97ec9b7815544e66f8a..0000000000000000000000000000000000000000 --- a/compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0(d).bat +++ /dev/null @@ -1,198 +0,0 @@ -rem Wersja wykorzystujÄ ca katalog %TEMP% do zapisu tymczasowych plikĂłw wyjĹciowych -rem ------------------------------------------------------------------------------ -rem comflag=-m32 - kompilacja w wersji 32-bitowej (tdm-gcc 4.9.2) -set comflag=-m64 -set com_ver=MinGW-W64_8.1.0 - -set flags=-fmax-errors=5 %comflag% - -set start_dir=%cd% -rem set in_dir=%cd% -rem set in_dir=d:\Eclipse_Mars\git_folder\DSPElib\DSPE_lib -rem set in_dir=r:\DSPE_lib -set in_dir=d:\CodeBlocks_20_03\DSPElib - -rem set workspace_dir=d:\Eclipse_Mars\workspace -rem set workspace_dir=R:\workspace -set workspace_dir=d:\CodeBlocks_20_03\DSPElib\workspace -mkdir "%workspace_dir%" - - -set filename=%in_dir%\compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0(d).bat - -IF exist "%filename%" GOTO AllOk -echo Source directory is not correct -rem pause -echo Trying "git_folder/DSPElib/DSPE_lib" -cd git_folder/DSPElib/DSPE_lib - -IF exist "%filename%" GOTO AllOk -echo Source directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -rem path=d:\CodeBlocks\MinGW\bin;d:\CodeBlocks\MinGW\mingw32\bin\;d:\msys\1.0\bin\;%path% -path=d:\CodeBlocks_20_03\MinGW\bin;d:\CodeBlocks_20_03\MinGW\x86_64-w64-mingw32\bin\;d:\msys\1.0\bin\;%path% - - -:MakeLib - -rem cd ..\..\..\workspace -cd /d "%workspace_dir%" -set library_dir=%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver% -mkdir _DSPE_lib_minGW_ -mkdir "%library_dir%" -mkdir "%library_dir%\rls" -mkdir "%library_dir%\dbg" -mkdir "%library_dir%\include" -mkdir "%library_dir%\examples" -mkdir "%library_dir%\examples\matlab" -mkdir "%library_dir%\toolbox" -rem cd ..\git_folder\DSPElib\DSPE_lib -cd /d "%in_dir%" - - -set tmp_out_dir_dbg=%TEMP%\DEBUG CodeBlocks%comflag%_%com_ver% -set tmp_out_dir_rls=%TEMP%\Release CodeBlocks%comflag%_%com_ver% - -set tmp_out_dir=%tmp_out_dir_dbg% - -mkdir "%tmp_out_dir%" -mkdir "%tmp_out_dir%\src" -mkdir "%tmp_out_dir%\src\cpp" -mkdir "%tmp_out_dir%\examples" -mkdir "%tmp_out_dir%\src\nvwa" - -cd /d "%tmp_out_dir%" -rm -rf src/cpp/DSP_clocks.o src/Main.o src/Main.d src/cpp/DSP_clocks.d "%library_dir%/DSPE_lib_dbg.exe" src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_misc.d src/cpp/DSP_modules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSP_modules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSP_modules_misc.o src/cpp/DSP_modules_misc.d src/cpp/DSP_modules.d src/cpp/DSP_modules.o src/cpp/DSP_DOT.o src/cpp/DSP_sockets.o src/cpp/DSP_sockets.d -rm -rf src/cpp/DSP_logstream.o src/cpp/DSP_logstream.d - -cd /d "%in_dir%" -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -fpermissive -o "%tmp_out_dir%\src\cpp\DSP_AudioMixer.o" .\src\cpp\DSP_AudioMixer.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_Fourier.o" .\src\cpp\DSP_Fourier.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_sockets.o" .\src\cpp\DSP_sockets.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_misc.o" .\src\cpp\DSP_misc.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_clocks.o" .\src\cpp\DSP_clocks.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules.o" .\src\cpp\DSP_modules.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules2.o" .\src\cpp\DSP_modules2.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_DOT.o" .\src\cpp\DSP_DOT.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\Main.o" .\src\Main.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules_misc.o" .\src\cpp\DSP_modules_misc.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_IO.o" .\src\cpp\DSP_IO.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_logstream.o" .\src\cpp\DSP_logstream.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\src\nvwa\debug_new.o" .\src\nvwa\debug_new.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish - -g++ %flags% -D_DSPE_TEST_ -DWIN32 -DDEVCPP -I./src/include -I./src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o "%tmp_out_dir%\examples\hello.o" .\examples\hello.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish - -cd /d "%tmp_out_dir%" -g++ %flags% -static -static-libgcc -static-libstdc++ -o "%library_dir%/DSPE_lib_dbg.exe" src\nvwa\debug_new.o src\cpp\DSP_sockets.o src\cpp\DSP_modules_misc.o src\cpp\DSP_modules2.o src\cpp\DSP_modules.o src\cpp\DSP_clocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\cpp\DSP_logstream.o examples\hello.o src\Main.o -lwinmm -lws2_32 -IF %ERRORLEVEL% NEQ 0 Goto Finish - - -set tmp_out_dir=%tmp_out_dir_rls% -mkdir "%tmp_out_dir%" -mkdir "%tmp_out_dir%\src" -mkdir "%tmp_out_dir%\src\cpp" -mkdir "%tmp_out_dir%\examples" -mkdir "%tmp_out_dir%\src\nvwa" - -cd /d "%tmp_out_dir%" -rm -rf src/cpp/DSP_clocks.o src/Main.o src/Main.d src/cpp/DSP_clocks.d "%library_dir%/DSPE_lib_rls.exe" src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_modules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSP_modules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSP_modules_misc.o src/cpp/DSP_modules_misc.d src/cpp/DSP_modules.d src/cpp/DSP_modules.o src/cpp/DSP_DOT.o src/cpp/DSP_sockets.o src/cpp/DSP_sockets.d -rm -rf src/cpp/DSP_logstream.o src/cpp/DSP_logstream.d - -cd /d "%in_dir%" -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -fpermissive -o "%tmp_out_dir%\src\cpp\DSP_AudioMixer.o" .\src\cpp\DSP_AudioMixer.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_Fourier.o" .\src\cpp\DSP_Fourier.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_sockets.o" .\src\cpp\DSP_sockets.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_Misc.o" .\src\cpp\DSP_Misc.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_clocks.o" .\src\cpp\DSP_clocks.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules.o" .\src\cpp\DSP_modules.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules2.o" .\src\cpp\DSP_modules2.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_DOT.o" .\src\cpp\DSP_DOT.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\Main.o" .\src\Main.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_modules_misc.o" .\src\cpp\DSP_modules_misc.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_IO.o" .\src\cpp\DSP_IO.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish -g++ %flags% -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\src\cpp\DSP_logstream.o" .\src\cpp\DSP_logstream.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish - -g++ %flags% -D_DSPE_TEST_ -DWIN32 -DDEVCPP -I./src/include -I./src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o "%tmp_out_dir%\examples\hello.o" .\examples\hello.cpp -IF %ERRORLEVEL% NEQ 0 Goto Finish - -cd /d "%tmp_out_dir%" -g++ %flags% -static -static-libgcc -static-libstdc++ -o "%library_dir%/DSPE_lib_rls.exe" src\cpp\DSP_sockets.o src\cpp\DSP_modules_misc.o src\cpp\DSP_modules2.o src\cpp\DSP_modules.o src\cpp\DSP_clocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\cpp\DSP_logstream.o examples\hello.o src\Main.o -lwinmm -lws2_32 -IF %ERRORLEVEL% NEQ 0 Goto Finish - -cd /d "%in_dir%" - -copy /B examples\*.* "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\*.*" -copy /B examples\matlab\*.* "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\matlab\*.*" -copy /B matlab\toolbox\*.m "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\toolbox\*.m" -copy /B src\include\*.h "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\include\*.*" -copy /B src\include\rls\DSP_setup.h "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.*" -copy /B src\include\dbg\DSP_setup.h "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.*" - -rem cd "Debug CodeBlocks%comflag%_%com_ver%\src\cpp" -cd /d "%tmp_out_dir_dbg%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSP_clocks.o DSP_modules.o DSP_modules2.o DSP_Fourier.o DSP_AudioMixer.o DSP_modules_misc.o DSP_DOT.o DSP_logstream.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSP_sockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.*" -del libDSPE.a Y -copy /B libDSPEsockets.a "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.*" -del libDSPEsockets.a Y - -rem cd ..\..\.. - -rem cd "Release CodeBlocks%comflag%_%com_ver%\src\cpp" -cd /d "%tmp_out_dir_rls%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSP_clocks.o DSP_modules.o DSP_modules2.o DSP_Fourier.o DSP_AudioMixer.o DSP_modules_misc.o DSP_DOT.o DSP_logstream.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSP_sockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.*" -del libDSPE.a Y -copy /B libDSPEsockets.a "%workspace_dir%\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.*" -del libDSPEsockets.a Y - -cd /d "%start_dir%" -rm -rf "%tmp_out_dir_dbg%" -rm -rf "%tmp_out_dir_rls%" - -:Finish -rem cd ..\..\.. -cd /d "%start_dir%" - -:End \ No newline at end of file diff --git a/compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0.bat b/compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0.bat deleted file mode 100644 index 7d5ed4b0f3ef8d22d9f1f310e11be3474b149970..0000000000000000000000000000000000000000 --- a/compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0.bat +++ /dev/null @@ -1,121 +0,0 @@ -rem comflag=-m32 - kompilacja w wersji 32-bitowej (tdm-gcc 4.9.2) -set comflag=-m64 -set com_ver=MinGW-W64_8.1.0 - - -IF exist compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "git_folder/DSPElib/DSPE_lib" -cd git_folder/DSPElib/DSPE_lib - -IF exist compilelib_mingw_CodeBlocks_64bit_MinGW-W64_8.1.0.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -rem path=d:\CodeBlocks\MinGW\bin;d:\CodeBlocks\MinGW\mingw32\bin\;d:\msys\1.0\bin\;%path% -path=d:\CodeBlocks_20_03\MinGW\bin;d:\CodeBlocks_20_03\MinGW\x86_64-w64-mingw32\bin\;%path% - - -:MakeLib - -cd ..\..\..\workspace -mkdir _DSPE_lib_minGW_ -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver% -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\include -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\matlab -mkdir _DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\toolbox -cd ..\git_folder\DSPElib\DSPE_lib - - -mkdir "Debug CodeBlocks%comflag%_%com_ver%" -mkdir "Debug CodeBlocks%comflag%_%com_ver%\src" -mkdir "Debug CodeBlocks%comflag%_%com_ver%\src\cpp" -mkdir "Debug CodeBlocks%comflag%_%com_ver%\src\nvwa" -cd "Debug CodeBlocks%comflag%_%com_ver%" -rm -rf src/cpp/DSP_clocks.o src/Main.o src/Main.d src/cpp/DSP_clocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_misc.d src/cpp/DSP_modules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSP_modules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSP_modules_misc.o src/cpp/DSP_modules_misc.d src/cpp/DSP_modules.d src/cpp/DSP_modules.o src/cpp/DSP_DOT.o src/cpp/DSP_sockets.o src/cpp/DSP_sockets.d -rm -rf src/cpp/DSP_logstream.o src/cpp/DSP_logstream.d - -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -fpermissive -o src\cpp\DSP_AudioMixer.o ..\src\cpp\DSP_AudioMixer.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_Fourier.o ..\src\cpp\DSP_Fourier.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_sockets.o ..\src\cpp\DSP_sockets.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_misc.o ..\src\cpp\DSP_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_clocks.o ..\src\cpp\DSP_clocks.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_modules.o ..\src\cpp\DSP_modules.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_modules2.o ..\src\cpp\DSP_modules2.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_DOT.o ..\src\cpp\DSP_DOT.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\Main.o ..\src\Main.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_modules_misc.o ..\src\cpp\DSP_modules_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_IO.o ..\src\cpp\DSP_IO.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_logstream.o ..\src\cpp\DSP_logstream.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\nvwa\debug_new.o ..\src\nvwa\debug_new.cpp -g++ %comflag% -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\nvwa\debug_new.o src\cpp\DSP_sockets.o src\cpp\DSP_modules_misc.o src\cpp\DSP_modules2.o src\cpp\DSP_modules.o src\cpp\DSP_clocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\cpp\DSP_logstream.o src\Main.o -lwinmm -lws2_32 - -cd .. -mkdir "Release CodeBlocks%comflag%_%com_ver%" -mkdir "Release CodeBlocks%comflag%_%com_ver%\src" -mkdir "Release CodeBlocks%comflag%_%com_ver%\src\cpp" -mkdir "Release CodeBlocks%comflag%_%com_ver%\src\nvwa" -cd Release CodeBlocks%comflag%_%com_ver%" -rm -rf src/cpp/DSP_clocks.o src/Main.o src/Main.d src/cpp/DSP_clocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_modules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSP_modules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSP_modules_misc.o src/cpp/DSP_modules_misc.d src/cpp/DSP_modules.d src/cpp/DSP_modules.o src/cpp/DSP_DOT.o src/cpp/DSP_sockets.o src/cpp/DSP_sockets.d -rm -rf src/cpp/DSP_logstream.o src/cpp/DSP_logstream.d - -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -fpermissive -o src\cpp\DSP_AudioMixer.o ..\src\cpp\DSP_AudioMixer.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_Fourier.o ..\src\cpp\DSP_Fourier.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_sockets.o ..\src\cpp\DSP_sockets.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_Misc.o ..\src\cpp\DSP_Misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_clocks.o ..\src\cpp\DSP_clocks.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_modules.o ..\src\cpp\DSP_modules.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_modules2.o ..\src\cpp\DSP_modules2.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_DOT.o ..\src\cpp\DSP_DOT.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\Main.o ..\src\Main.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_modules_misc.o ..\src\cpp\DSP_modules_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_IO.o ..\src\cpp\DSP_IO.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_logstream.o ..\src\cpp\DSP_logstream.cpp -g++ %comflag% -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\cpp\DSP_sockets.o src\cpp\DSP_modules_misc.o src\cpp\DSP_modules2.o src\cpp\DSP_modules.o src\cpp\DSP_clocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\cpp\DSP_logstream.o src\Main.o -lwinmm -lws2_32 - -cd .. - -copy /B examples\*.* ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\*.* -copy /B examples\matlab\*.* ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\examples\matlab\*.* -copy /B matlab\toolbox\*.m ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\toolbox\*.m -copy /B src\include\*.h ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\include\*.* -copy /B src\include\rls\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.* -copy /B src\include\dbg\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.* - -cd "Debug CodeBlocks%comflag%_%com_ver%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSP_clocks.o DSP_modules.o DSP_modules2.o DSP_Fourier.o DSP_AudioMixer.o DSP_modules_misc.o DSP_DOT.o DSP_logstream.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSP_sockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.* -del libDSPE.a Y -copy /B libDSPEsockets.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\dbg\*.* -del libDSPEsockets.a Y - -cd ..\..\.. - -cd "Release CodeBlocks%comflag%_%com_ver%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSP_clocks.o DSP_modules.o DSP_modules2.o DSP_Fourier.o DSP_AudioMixer.o DSP_modules_misc.o DSP_DOT.o DSP_logstream.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSP_sockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.* -del libDSPE.a Y -copy /B libDSPEsockets.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\CodeBlocks%comflag%_%com_ver%\rls\*.* -del libDSPEsockets.a Y - -cd ..\..\.. - -:End \ No newline at end of file diff --git a/compilelib_mingw_DEV_32bit_4.9.2.bat b/compilelib_mingw_DEV_32bit_4.9.2.bat deleted file mode 100644 index fc112dc6b45a9201f33434f0854f3921d2046402..0000000000000000000000000000000000000000 --- a/compilelib_mingw_DEV_32bit_4.9.2.bat +++ /dev/null @@ -1,115 +0,0 @@ -rem comflag=-m32 - kompilacja w wersji 32-bitowej (tdm-gcc 4.9.2) -set comflag=-m32 - - -IF exist compilelib_mingw_DEV_32bit_4.9.2.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "git_folder/DSPElib/DSPE_lib" -cd git_folder/DSPElib/DSPE_lib - -IF exist compilelib_mingw_DEV_32bit_4.9.2.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -path=e:\Dev-Cpp\MinGW64\bin;e:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% - - -:MakeLib - -cd ..\..\..\workspace -mkdir _DSPE_lib_minGW_ -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag% -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag%\rls -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag%\dbg -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag%\include -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag%\examples -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag%\examples\matlab -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag%\toolbox -cd ..\git_folder\DSPElib\DSPE_lib - - -mkdir "Debug Dev-cpp%comflag%" -mkdir "Debug Dev-cpp%comflag%\src" -mkdir "Debug Dev-cpp%comflag%\src\cpp" -mkdir "Debug Dev-cpp%comflag%\src\nvwa" -cd "Debug Dev-cpp%comflag%" -rm -rf src/cpp/DSPclocks.o src/Main.o src/Main.d src/cpp/DSPclocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_misc.d src/cpp/DSPmodules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSPmodules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSPmodules_misc.o src/cpp/DSPmodules_misc.d src/cpp/DSPmodules.d src/cpp/DSPmodules.o src/cpp/DSP_DOT.o src/cpp/DSPsockets.o src/cpp/DSPsockets.d - -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -fpermissive -o src\cpp\DSP_AudioMixer.o ..\src\cpp\DSP_AudioMixer.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_Fourier.o ..\src\cpp\DSP_Fourier.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPsockets.o ..\src\cpp\DSPsockets.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_misc.o ..\src\cpp\DSP_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPclocks.o ..\src\cpp\DSPclocks.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules.o ..\src\cpp\DSPmodules.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules2.o ..\src\cpp\DSPmodules2.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_DOT.o ..\src\cpp\DSP_DOT.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\Main.o ..\src\Main.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules_misc.o ..\src\cpp\DSPmodules_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_IO.o ..\src\cpp\DSP_IO.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\nvwa\debug_new.o ..\src\nvwa\debug_new.cpp -g++ %comflag% -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\nvwa\debug_new.o src\cpp\DSPsockets.o src\cpp\DSPmodules_misc.o src\cpp\DSPmodules2.o src\cpp\DSPmodules.o src\cpp\DSPclocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\Main.o -lwinmm -lws2_32 - -cd .. -mkdir "Release Dev-cpp%comflag%" -mkdir "Release Dev-cpp%comflag%\src" -mkdir "Release Dev-cpp%comflag%\src\cpp" -mkdir "Release Dev-cpp%comflag%\src\nvwa" -cd Release Dev-cpp%comflag%" -rm -rf src/cpp/DSPclocks.o src/Main.o src/Main.d src/cpp/DSPclocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSPmodules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSPmodules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSPmodules_misc.o src/cpp/DSPmodules_misc.d src/cpp/DSPmodules.d src/cpp/DSPmodules.o src/cpp/DSP_DOT.o src/cpp/DSPsockets.o src/cpp/DSPsockets.d - -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -fpermissive -o src\cpp\DSP_AudioMixer.o ..\src\cpp\DSP_AudioMixer.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_Fourier.o ..\src\cpp\DSP_Fourier.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPsockets.o ..\src\cpp\DSPsockets.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_Misc.o ..\src\cpp\DSP_Misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPclocks.o ..\src\cpp\DSPclocks.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules.o ..\src\cpp\DSPmodules.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules2.o ..\src\cpp\DSPmodules2.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_DOT.o ..\src\cpp\DSP_DOT.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\Main.o ..\src\Main.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules_misc.o ..\src\cpp\DSPmodules_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_IO.o ..\src\cpp\DSP_IO.cpp -g++ %comflag% -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\cpp\DSPsockets.o src\cpp\DSPmodules_misc.o src\cpp\DSPmodules2.o src\cpp\DSPmodules.o src\cpp\DSPclocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\Main.o -lwinmm -lws2_32 - -cd .. - -copy /B examples\*.* ..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\examples\*.* -copy /B examples\matlab\*.* ..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\examples\matlab\*.* -copy /B matlab\toolbox\*.m ..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\toolbox\*.m -copy /B src\include\*.h ..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\include\*.* -copy /B src\include\rls\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\rls\*.* -copy /B src\include\dbg\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\dbg\*.* - -cd "Debug Dev-cpp%comflag%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSPsockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\dbg\*.* -del libDSPE.a Y -copy /B libDSPEsockets.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\dbg\*.* -del libDSPEsockets.a Y - -cd ..\..\.. - -cd "Release Dev-cpp%comflag%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSPsockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\rls\*.* -del libDSPE.a Y -copy /B libDSPEsockets.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\rls\*.* -del libDSPEsockets.a Y - -cd ..\..\.. - -:End \ No newline at end of file diff --git a/compilelib_mingw_DEV_64bit_4.9.2.bat b/compilelib_mingw_DEV_64bit_4.9.2.bat deleted file mode 100644 index 8960c43a85c32efed2d26a17dd416b7a1c4cb793..0000000000000000000000000000000000000000 --- a/compilelib_mingw_DEV_64bit_4.9.2.bat +++ /dev/null @@ -1,115 +0,0 @@ -rem comflag=-m64 - kompilacja w wersji 64-bitowej (tdm-gcc 4.9.2) -set comflag=-m64 - - -IF exist compilelib_mingw_DEV_64bit_4.9.2.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "git_folder/DSPElib/DSPE_lib" -cd git_folder/DSPElib/DSPE_lib - -IF exist compilelib_mingw_DEV_64bit_4.9.2.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -path=e:\Dev-Cpp\MinGW64\bin;e:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% - - -:MakeLib - -cd ..\..\..\workspace -mkdir _DSPE_lib_minGW_ -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag% -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag%\rls -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag%\dbg -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag%\include -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag%\examples -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag%\examples\matlab -mkdir _DSPE_lib_minGW_\Dev-cpp%comflag%\toolbox -cd ..\git_folder\DSPElib\DSPE_lib - - -mkdir "Debug Dev-cpp%comflag%" -mkdir "Debug Dev-cpp%comflag%\src" -mkdir "Debug Dev-cpp%comflag%\src\cpp" -mkdir "Debug Dev-cpp%comflag%\src\nvwa" -cd "Debug Dev-cpp%comflag%" -rm -rf src/cpp/DSPclocks.o src/Main.o src/Main.d src/cpp/DSPclocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_misc.d src/cpp/DSPmodules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSPmodules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSPmodules_misc.o src/cpp/DSPmodules_misc.d src/cpp/DSPmodules.d src/cpp/DSPmodules.o src/cpp/DSP_DOT.o src/cpp/DSPsockets.o src/cpp/DSPsockets.d - -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -fpermissive -o src\cpp\DSP_AudioMixer.o ..\src\cpp\DSP_AudioMixer.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_Fourier.o ..\src\cpp\DSP_Fourier.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPsockets.o ..\src\cpp\DSPsockets.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_misc.o ..\src\cpp\DSP_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPclocks.o ..\src\cpp\DSPclocks.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules.o ..\src\cpp\DSPmodules.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules2.o ..\src\cpp\DSPmodules2.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_DOT.o ..\src\cpp\DSP_DOT.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\Main.o ..\src\Main.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules_misc.o ..\src\cpp\DSPmodules_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_IO.o ..\src\cpp\DSP_IO.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\nvwa\debug_new.o ..\src\nvwa\debug_new.cpp -g++ %comflag% -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\nvwa\debug_new.o src\cpp\DSPsockets.o src\cpp\DSPmodules_misc.o src\cpp\DSPmodules2.o src\cpp\DSPmodules.o src\cpp\DSPclocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\Main.o -lwinmm -lws2_32 - -cd .. -mkdir "Release Dev-cpp%comflag%" -mkdir "Release Dev-cpp%comflag%\src" -mkdir "Release Dev-cpp%comflag%\src\cpp" -mkdir "Release Dev-cpp%comflag%\src\nvwa" -cd Release Dev-cpp%comflag%" -rm -rf src/cpp/DSPclocks.o src/Main.o src/Main.d src/cpp/DSPclocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_misc.d src/cpp/DSPmodules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSPmodules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSPmodules_misc.o src/cpp/DSPmodules_misc.d src/cpp/DSPmodules.d src/cpp/DSPmodules.o src/cpp/DSP_DOT.o src/cpp/DSPsockets.o src/cpp/DSPsockets.d - -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -fpermissive -o src\cpp\DSP_AudioMixer.o ..\src\cpp\DSP_AudioMixer.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_Fourier.o ..\src\cpp\DSP_Fourier.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPsockets.o ..\src\cpp\DSPsockets.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_Misc.o ..\src\cpp\DSP_Misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPclocks.o ..\src\cpp\DSPclocks.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules.o ..\src\cpp\DSPmodules.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules2.o ..\src\cpp\DSPmodules2.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_DOT.o ..\src\cpp\DSP_DOT.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\Main.o ..\src\Main.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules_misc.o ..\src\cpp\DSPmodules_misc.cpp -g++ %comflag% -DWIN32 -DDEVCPP -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_IO.o ..\src\cpp\DSP_IO.cpp -g++ %comflag% -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\cpp\DSPsockets.o src\cpp\DSPmodules_misc.o src\cpp\DSPmodules2.o src\cpp\DSPmodules.o src\cpp\DSPclocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\Main.o -lwinmm -lws2_32 - -cd .. - -copy /B examples\*.* ..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\examples\*.* -copy /B examples\matlab\*.* ..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\examples\matlab\*.* -copy /B matlab\toolbox\*.m ..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\toolbox\*.m -copy /B src\include\*.h ..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\include\*.* -copy /B src\include\rls\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\rls\*.* -copy /B src\include\dbg\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\dbg\*.* - -cd "Debug Dev-cpp%comflag%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSPsockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\dbg\*.* -del libDSPE.a Y -copy /B libDSPEsockets.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\dbg\*.* -del libDSPEsockets.a Y - -cd ..\..\.. - -cd "Release Dev-cpp%comflag%\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSPsockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\rls\*.* -del libDSPE.a Y -copy /B libDSPEsockets.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\Dev-cpp%comflag%\rls\*.* -del libDSPEsockets.a Y - -cd ..\..\.. - -:End \ No newline at end of file diff --git a/compilelib_mingw_tdm.bat b/compilelib_mingw_tdm.bat deleted file mode 100644 index b4e2c8c25cd7611673530bdb5a1c92551a9feb3d..0000000000000000000000000000000000000000 --- a/compilelib_mingw_tdm.bat +++ /dev/null @@ -1,114 +0,0 @@ -rem dir * -rem pause -echo Compiling DSPElib library - -IF exist compilelib_mingw_tdm.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "git_folder/DSPElib/DSPE_lib" -cd git_folder/DSPElib/DSPE_lib - -IF exist compilelib_mingw_tdm.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -path=e:\TDM-GCC-64\bin\;e:\MinGW_gcc_4\msys\1.0\bin\;%path% - -:MakeLib -echo MakeLib - -cd ..\..\..\workspace -mkdir _DSPE_lib_minGW_ -mkdir _DSPE_lib_minGW_\mingw_tdm -mkdir _DSPE_lib_minGW_\mingw_tdm\rls -mkdir _DSPE_lib_minGW_\mingw_tdm\dbg -mkdir _DSPE_lib_minGW_\mingw_tdm\include -mkdir _DSPE_lib_minGW_\mingw_tdm\examples -mkdir _DSPE_lib_minGW_\mingw_tdm\examples\matlab -mkdir _DSPE_lib_minGW_\mingw_tdm\toolbox -cd ..\git_folder\DSPElib\DSPE_lib - -mkdir "Debug mingw_tdm" -mkdir "Debug mingw_tdm\src" -mkdir "Debug mingw_tdm\src\cpp" -mkdir "Debug mingw_tdm\src\nvwa" -cd "Debug mingw_tdm" -rm -rf src/cpp/DSPclocks.o src/Main.o src/Main.d src/cpp/DSPclocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_misc.d src/cpp/DSPmodules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSPmodules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSPmodules_misc.o src/cpp/DSPmodules_misc.d src/cpp/DSPmodules.d src/cpp/DSPmodules.o src/cpp/DSP_DOT.o src/cpp/DSPsockets.o src/cpp/DSPsockets.d - -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -fpermissive -o src\cpp\DSP_AudioMixer.o ..\src\cpp\DSP_AudioMixer.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_Fourier.o ..\src\cpp\DSP_Fourier.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPsockets.o ..\src\cpp\DSPsockets.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_misc.o ..\src\cpp\DSP_misc.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPclocks.o ..\src\cpp\DSPclocks.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules.o ..\src\cpp\DSPmodules.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules2.o ..\src\cpp\DSPmodules2.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_DOT.o ..\src\cpp\DSP_DOT.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\Main.o ..\src\Main.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules_misc.o ..\src\cpp\DSPmodules_misc.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_IO.o ..\src\cpp\DSP_IO.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\nvwa\debug_new.o ..\src\nvwa\debug_new.cpp -g++ -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\nvwa\debug_new.o src\cpp\DSPsockets.o src\cpp\DSPmodules_misc.o src\cpp\DSPmodules2.o src\cpp\DSPmodules.o src\cpp\DSPclocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\Main.o -lwinmm -lws2_32 - -cd .. -mkdir "Release mingw_tdm" -mkdir "Release mingw_tdm\src" -mkdir "Release mingw_tdm\src\cpp" -mkdir "Release mingw_tdm\src\nvwa" -cd "Release mingw_tdm" -rm -rf src/cpp/DSPclocks.o src/Main.o src/Main.d src/cpp/DSPclocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_misc.d src/cpp/DSPmodules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSPmodules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSPmodules_misc.o src/cpp/DSPmodules_misc.d src/cpp/DSPmodules.d src/cpp/DSPmodules.o src/cpp/DSP_DOT.o src/cpp/DSPsockets.o src/cpp/DSPsockets.d - -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -fpermissive -o src\cpp\DSP_AudioMixer.o ..\src\cpp\DSP_AudioMixer.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_Fourier.o ..\src\cpp\DSP_Fourier.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPsockets.o ..\src\cpp\DSPsockets.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_Misc.o ..\src\cpp\DSP_Misc.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPclocks.o ..\src\cpp\DSPclocks.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules.o ..\src\cpp\DSPmodules.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules2.o ..\src\cpp\DSPmodules2.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_DOT.o ..\src\cpp\DSP_DOT.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\Main.o ..\src\Main.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules_misc.o ..\src\cpp\DSPmodules_misc.cpp -g++ -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_IO.o ..\src\cpp\DSP_IO.cpp -g++ -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\cpp\DSPsockets.o src\cpp\DSPmodules_misc.o src\cpp\DSPmodules2.o src\cpp\DSPmodules.o src\cpp\DSPclocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\Main.o -lwinmm -lws2_32 - -cd .. - -copy /B examples\*.* ..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm\examples\*.* -copy /B examples\matlab\*.* ..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm\examples\matlab\*.* -copy /B matlab\toolbox\*.m ..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm\toolbox\*.m -copy /B src\include\*.h ..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm\include\*.* -copy /B src\include\rls\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm\rls\*.* -copy /B src\include\dbg\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm\dbg\*.* - -cd "Debug mingw_tdm\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSPsockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm\dbg\*.* -del libDSPE.a Y -copy /B libDSPEsockets.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm\dbg\*.* -del libDSPEsockets.a Y - -cd ..\..\.. - -cd "Release mingw_tdm\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSPsockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm\rls\*.* -del libDSPE.a Y -copy /B libDSPEsockets.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm\rls\*.* -del libDSPEsockets.a Y - -cd ..\..\.. - -:End \ No newline at end of file diff --git a/compilelib_mingw_tdm_32.bat b/compilelib_mingw_tdm_32.bat deleted file mode 100644 index 29971a9672f2cd7f2d74363c74a353f35e11ba0c..0000000000000000000000000000000000000000 --- a/compilelib_mingw_tdm_32.bat +++ /dev/null @@ -1,117 +0,0 @@ -rem dir * -rem pause -echo Compiling DSPElib library - -rem comflag=-m32 - kompilacja w wersji 32-bitowej (tdm-gcc 4.9.2) -set comflag=-m32 - -IF exist compilelib_mingw_tdm_32.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "git_folder/DSPElib/DSPE_lib" -cd git_folder/DSPElib/DSPE_lib - -IF exist compilelib_mingw_tdm_32.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -path=e:\TDM-GCC-32\bin\;e:\MinGW_gcc_4\msys\1.0\bin\;%path% - -:MakeLib -echo MakeLib - -cd ..\..\..\workspace -mkdir _DSPE_lib_minGW_ -mkdir _DSPE_lib_minGW_\mingw_tdm_32 -mkdir _DSPE_lib_minGW_\mingw_tdm_32\rls -mkdir _DSPE_lib_minGW_\mingw_tdm_32\dbg -mkdir _DSPE_lib_minGW_\mingw_tdm_32\include -mkdir _DSPE_lib_minGW_\mingw_tdm_32\examples -mkdir _DSPE_lib_minGW_\mingw_tdm_32\examples\matlab -mkdir _DSPE_lib_minGW_\mingw_tdm_32\toolbox -cd ..\git_folder\DSPElib\DSPE_lib - -mkdir "Debug mingw_tdm_32" -mkdir "Debug mingw_tdm_32\src" -mkdir "Debug mingw_tdm_32\src\cpp" -mkdir "Debug mingw_tdm_32\src\nvwa" -cd "Debug mingw_tdm_32" -rm -rf src/cpp/DSPclocks.o src/Main.o src/Main.d src/cpp/DSPclocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_misc.d src/cpp/DSPmodules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSPmodules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSPmodules_misc.o src/cpp/DSPmodules_misc.d src/cpp/DSPmodules.d src/cpp/DSPmodules.o src/cpp/DSP_DOT.o src/cpp/DSPsockets.o src/cpp/DSPsockets.d - -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -fpermissive -o src\cpp\DSP_AudioMixer.o ..\src\cpp\DSP_AudioMixer.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_Fourier.o ..\src\cpp\DSP_Fourier.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPsockets.o ..\src\cpp\DSPsockets.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_misc.o ..\src\cpp\DSP_misc.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPclocks.o ..\src\cpp\DSPclocks.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules.o ..\src\cpp\DSPmodules.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules2.o ..\src\cpp\DSPmodules2.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_DOT.o ..\src\cpp\DSP_DOT.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\Main.o ..\src\Main.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSPmodules_misc.o ..\src\cpp\DSPmodules_misc.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\cpp\DSP_IO.o ..\src\cpp\DSP_IO.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/dbg -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -o src\nvwa\debug_new.o ..\src\nvwa\debug_new.cpp -g++ %comflag% -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\nvwa\debug_new.o src\cpp\DSPsockets.o src\cpp\DSPmodules_misc.o src\cpp\DSPmodules2.o src\cpp\DSPmodules.o src\cpp\DSPclocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\Main.o -lwinmm -lws2_32 - -cd .. -mkdir "Release mingw_tdm_32" -mkdir "Release mingw_tdm_32\src" -mkdir "Release mingw_tdm_32\src\cpp" -mkdir "Release mingw_tdm_32\src\nvwa" -cd "Release mingw_tdm_32" -rm -rf src/cpp/DSPclocks.o src/Main.o src/Main.d src/cpp/DSPclocks.d DSPE_lib.exe src/cpp/DSP_DOT.d src/cpp/DSP_misc.o src/cpp/DSP_misc.d src/cpp/DSPmodules2.d src/cpp/DSP_AudioMixer.d src/cpp/DSPmodules2.o src/cpp/DSP_AudioMixer.o src/cpp/DSP_IO.o src/cpp/DSP_IO.d src/cpp/DSP_Fourier.d src/cpp/DSP_Fourier.o src/cpp/DSPmodules_misc.o src/cpp/DSPmodules_misc.d src/cpp/DSPmodules.d src/cpp/DSPmodules.o src/cpp/DSP_DOT.o src/cpp/DSPsockets.o src/cpp/DSPsockets.d - -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -fpermissive -o src\cpp\DSP_AudioMixer.o ..\src\cpp\DSP_AudioMixer.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_Fourier.o ..\src\cpp\DSP_Fourier.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPsockets.o ..\src\cpp\DSPsockets.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_Misc.o ..\src\cpp\DSP_Misc.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPclocks.o ..\src\cpp\DSPclocks.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules.o ..\src\cpp\DSPmodules.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules2.o ..\src\cpp\DSPmodules2.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_DOT.o ..\src\cpp\DSP_DOT.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\Main.o ..\src\Main.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSPmodules_misc.o ..\src\cpp\DSPmodules_misc.cpp -g++ %comflag% -DWIN32 -D_FILE_OFFSET_BITS=64 -I../src/include -I../src/include/rls -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing -o src\cpp\DSP_IO.o ..\src\cpp\DSP_IO.cpp -g++ %comflag% -static-libgcc -static-libstdc++ -o DSPE_lib.exe src\cpp\DSPsockets.o src\cpp\DSPmodules_misc.o src\cpp\DSPmodules2.o src\cpp\DSPmodules.o src\cpp\DSPclocks.o src\cpp\DSP_misc.o src\cpp\DSP_IO.o src\cpp\DSP_Fourier.o src\cpp\DSP_DOT.o src\cpp\DSP_AudioMixer.o src\Main.o -lwinmm -lws2_32 - -cd .. - -copy /B examples\*.* ..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm_32\examples\*.* -copy /B examples\matlab\*.* ..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm_32\examples\matlab\*.* -copy /B matlab\toolbox\*.m ..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm_32\toolbox\*.m -copy /B src\include\*.h ..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm_32\include\*.* -copy /B src\include\rls\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm_32\rls\*.* -copy /B src\include\dbg\DSP_setup.h ..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm_32\dbg\*.* - -cd "Debug mingw_tdm_32\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSPsockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm_32\dbg\*.* -del libDSPE.a Y -copy /B libDSPEsockets.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm_32\dbg\*.* -del libDSPEsockets.a Y - -cd ..\..\.. - -cd "Release mingw_tdm_32\src\cpp" - -ar rc libDSPE.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSPE.a -ar rc libDSPEsockets.a DSPsockets.o -ranlib libDSPEsockets.a -pause - -copy /B libDSPE.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm_32\rls\*.* -del libDSPE.a Y -copy /B libDSPEsockets.a ..\..\..\..\..\..\workspace\_DSPE_lib_minGW_\mingw_tdm_32\rls\*.* -del libDSPEsockets.a Y - -cd ..\..\.. - -:End \ No newline at end of file diff --git a/examples/DSPE_examples.h b/examples/DSPE_examples.h index 5bd1f3c5e2806f862dd60ed578223c15d34de1ec..bbaa0df1b52d6a90b66a56fb94fd35cb18e91e78 100644 --- a/examples/DSPE_examples.h +++ b/examples/DSPE_examples.h @@ -9,7 +9,7 @@ #define EXAMPLES_DSPE_EXAMPLES_H_ int test_hello(void); -int test_sound_input(void); +int test_sound_input(bool use_audio_output = true); #endif /* EXAMPLES_DSPE_EXAMPLES_H_ */ diff --git a/examples/makefile b/examples/makefile index e746da42abb6b5e7e91c88d700f4420f4e10ef24..1b08befd50abffffe766bd4ea23b50bd636d9a53 100644 --- a/examples/makefile +++ b/examples/makefile @@ -1,5 +1,6 @@ # For 32-bit compilation use Mbit = 32 CC = g++ +com_ver = $(shell $(CC) -dumpmachine)-gcc_$(shell $(CC) -dumpversion) ifndef TYPE TYPE = dbg @@ -9,8 +10,8 @@ endif ifndef SRC_DIR SRC_DIR = . endif -ifndef SRC_DIR - DSPELIB_DIR_ROOT = ../../_DSPE_lib_minGW_/MinGW-W64_8.1.0 +ifndef DSPELIB_DIR_ROOT + DSPELIB_DIR_ROOT = ../_DSPE_lib_minGW_/$(com_ver) endif ifndef Mbit @@ -51,17 +52,17 @@ multirate.exe: multirate.o $(CC) -L"$(DSPELIB_DIR_ROOT)/$(TYPE)" "$(SRC_DIR)/multirate.o" -o"$(SRC_DIR)/multirate.exe" $(LINKER_FLAGS) -lDSPE -lwinmm callbacks.o: $(SRC_DIR)/callbacks.cpp - $(CC) -DWIN32 -I"$(DSPELIB_DIR_ROOT)/include" -I"$(DSPELIB_DIR_ROOT)/include/$(TYPE)" -c "$(SRC_DIR)/callbacks.cpp" -o "$(SRC_DIR)/callbacks.o" + $(CC) -DWIN32 -I"$(DSPELIB_DIR_ROOT)/include" -I"$(DSPELIB_DIR_ROOT)/include/$(TYPE)" $(CFLAGS) -c "$(SRC_DIR)/callbacks.cpp" -o "$(SRC_DIR)/callbacks.o" callbacks.exe: callbacks.o $(CC) -L"$(DSPELIB_DIR_ROOT)/$(TYPE)" "$(SRC_DIR)/callbacks.o" -o"$(SRC_DIR)/callbacks.exe" $(LINKER_FLAGS) -lDSPE -lwinmm socket_server.o: $(SRC_DIR)/socket_server.cpp - $(CC) -DWIN32 -I"$(DSPELIB_DIR_ROOT)/include" -I"$(DSPELIB_DIR_ROOT)/include/$(TYPE)" -c "$(SRC_DIR)/socket_server.cpp" -o "$(SRC_DIR)/socket_server.o" + $(CC) -DWIN32 -I"$(DSPELIB_DIR_ROOT)/include" -I"$(DSPELIB_DIR_ROOT)/include/$(TYPE)" $(CFLAGS) -c "$(SRC_DIR)/socket_server.cpp" -o "$(SRC_DIR)/socket_server.o" socket_server.exe: socket_server.o $(CC) -L"$(DSPELIB_DIR_ROOT)/$(TYPE)" "$(SRC_DIR)/socket_server.o" -o"$(SRC_DIR)/socket_server.exe" $(LINKER_FLAGS) -lDSPE -lwinmm -lDSPEsockets -lws2_32 socket_client.o: $(SRC_DIR)/socket_client.cpp - $(CC) -DWIN32 -I"$(DSPELIB_DIR_ROOT)/include" -I"$(DSPELIB_DIR_ROOT)/include/$(TYPE)" -c "$(SRC_DIR)/socket_client.cpp" -o "$(SRC_DIR)/socket_client.o" + $(CC) -DWIN32 -I"$(DSPELIB_DIR_ROOT)/include" -I"$(DSPELIB_DIR_ROOT)/include/$(TYPE)" $(CFLAGS) -c "$(SRC_DIR)/socket_client.cpp" -o "$(SRC_DIR)/socket_client.o" socket_client.exe: socket_client.o $(CC) -L"$(DSPELIB_DIR_ROOT)/$(TYPE)" "$(SRC_DIR)/socket_client.o" -o"$(SRC_DIR)/socket_client.exe" $(LINKER_FLAGS) -lDSPE -lwinmm -lDSPEsockets -lws2_32 diff --git a/examples/makefile-m64.linux b/examples/makefile-m64.linux index e6aeb43aa42a106f784f9da2f4f4360e57a0611d..a0995ab1f564e42312762470f7faf284e1578c29 100644 --- a/examples/makefile-m64.linux +++ b/examples/makefile-m64.linux @@ -1,5 +1,6 @@ # wersja dla kompilatora 64-bitowego (tdm-gcc 4.8.1): dodatkowa flaga -m64 CC = g++ +com_ver = $(shell $(CC) -dumpmachine)-gcc_$(shell $(CC) -dumpversion) ifndef TYPE TYPE = dbg @@ -9,8 +10,8 @@ endif ifndef SRC_DIR SRC_DIR = . endif -ifndef SRC_DIR - DSPELIB_DIR_ROOT = ../../_DSPE_lib_linux_/x86_64-linux-gnu-gcc_9 +ifndef DSPELIB_DIR_ROOT + DSPELIB_DIR_ROOT = ../_DSPE_lib_linux_/$(com_ver) endif ifndef Mbit diff --git a/examples/sound_input.cpp b/examples/sound_input.cpp index e15d363e1afee5af3f9895d1ae5731608e7b50b1..da1364f234ba12f3b3ab5ae11461f2767f8d751e 100644 --- a/examples/sound_input.cpp +++ b/examples/sound_input.cpp @@ -7,11 +7,14 @@ #ifndef INCLUDE_DSPE_EXAMPLES int main(void) +{ + bool use_audio_output = true; #else #include "DSPE_examples.h" -int test_sound_input(void) -#endif // INCLUDE_DSPE_EXAMPLES +int test_sound_input(bool use_audio_output) { +#endif // INCLUDE_DSPE_EXAMPLES + DSP::Clock_ptr MasterClock, AudioInClock; string tekst; int temp; @@ -25,17 +28,26 @@ int test_sound_input(void) MasterClock=DSP::Clock::CreateMasterClock(); +#ifndef INCLUDE_DSPE_EXAMPLES DSP::u::WaveInput WaveIn(MasterClock, "DSPElib.wav", "."); +#else + DSP::u::WaveInput WaveIn(MasterClock, "DSPElib.wav", "../examples"); +#endif // INCLUDE_DSPE_EXAMPLES + Fp = WaveIn.GetSamplingRate(); - DSP::u::AudioOutput AudioOut(Fp); + std::shared_ptr<DSP::Block> AudioOut = nullptr; + if (use_audio_output == true) + AudioOut.reset(new DSP::u::AudioOutput(Fp)); + else + AudioOut.reset(new DSP::u::Vacuum(1U)); - WaveIn.Output("out") >> AudioOut.Input("in"); + WaveIn.Output("out") >> AudioOut->Input("in"); Fp2 = 8000; long Fp_gcd = DSP::f::gcd(Fp, Fp2); AudioInClock=DSP::Clock::GetClock(MasterClock, Fp2 / Fp_gcd, Fp / Fp_gcd); - DSP::u::AudioInput AudioIn(AudioInClock, 8000, 1); + DSP::u::AudioInput AudioIn(AudioInClock, Fp2, 1); DSP::u::FileOutput WaveOut("captured_sample.wav",DSP::e::SampleType::ST_short, 1, DSP::e::FileType::FT_wav, Fp2); AudioIn.Output("out") >> WaveOut.Input("in"); @@ -51,8 +63,9 @@ int test_sound_input(void) DSP::log << "MAIN" << DSP::e::LogMode::second << temp << endl; temp++; } - while (WaveIn.GetBytesRead() != 0); + while ((temp <= 8) || (WaveIn.GetBytesRead() != 0)); + AudioOut.reset(); DSP::Clock::FreeClocks(); DSP::log << DSP::e::LogMode::Error << "MAIN" << DSP::e::LogMode::second << "end" << endl; diff --git a/make_examples.bat b/make_examples.bat deleted file mode 100644 index 1fef30e4ecd7c5a3d39e6361609b9433c9406ffd..0000000000000000000000000000000000000000 --- a/make_examples.bat +++ /dev/null @@ -1,29 +0,0 @@ -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -IF not exist E:\mingw\bin\ranlib.exe GOTO DriveC - -path=E:\mingw\bin;E:\msys\1.0\bin\;%path% -GOTO MakeExamples - -:DriveC -path=C:\mingw\bin;C:\msys\1.0\bin\;%path% - -:MakeExamples -cd ../_DSP_lib_minGW/examples - -make clean -make - -cd ../../Dsp_lib - -:End \ No newline at end of file diff --git a/make_examples_dev-cpp.bat b/make_examples_dev-cpp.bat deleted file mode 100644 index 6cba2b05be495364ea25a39bc394a2781bfac30e..0000000000000000000000000000000000000000 --- a/make_examples_dev-cpp.bat +++ /dev/null @@ -1,29 +0,0 @@ -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -IF not exist E:\mingw\bin\ranlib.exe GOTO DriveC - -path=E:\mingw\bin;E:\msys\1.0\bin\;%path% -GOTO MakeExamples - -:DriveC -path=C:\dev-cpp\bin;C:\msys\1.0\bin\;%path% - -:MakeExamples -cd ../_DSP_lib_dev-cpp/examples - -make clean -make - -cd ../../Dsp_lib - -:End \ No newline at end of file diff --git a/make_examples_gcc_4.bat b/make_examples_gcc_4.bat deleted file mode 100644 index 140d2a434e46f0fddb6db824347ef6248737274c..0000000000000000000000000000000000000000 --- a/make_examples_gcc_4.bat +++ /dev/null @@ -1,29 +0,0 @@ -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -IF not exist E:\mingw\bin\ranlib.exe GOTO DriveC - -path=E:\mingw\bin;E:\msys\1.0\bin\;%path% -GOTO MakeExamples - -:DriveC -path=C:\mingw_gcc_4\bin;C:\msys\1.0\bin\;%path% - -:MakeExamples -cd ../_DSP_lib_minGW_gcc4/examples - -make clean -make - -cd ../../Dsp_lib - -:End \ No newline at end of file diff --git a/make_examples_mingw_CodeBlocks_32bit_5.1.0.bat b/make_examples_mingw_CodeBlocks_32bit_5.1.0.bat deleted file mode 100644 index 028a301d1592fd3c5587bebc19523fb7d52c395f..0000000000000000000000000000000000000000 --- a/make_examples_mingw_CodeBlocks_32bit_5.1.0.bat +++ /dev/null @@ -1,34 +0,0 @@ -rem comflag=-m32 - kompilacja w wersji 32-bitowej -set comflag=-m32 -set com_ver=TDM_5.1.0 - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -rem path=c:\Dev-Cpp\MinGW64\bin;c:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% -rem path=e:\Dev-Cpp\MinGW64\bin;e:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% -path=e:\CodeBlocks\MinGW\bin;e:\CodeBlocks\MinGW\mingw32\bin\;d:\msys\1.0\bin\;%path% - - -GOTO MakeExamples - -:MakeExamples -rem cd ../_DSPE_lib_minGW_/CodeBlocks%comflag%_%com_ver%/examples -cd ../../../workspace/_DSPE_lib_minGW_/CodeBlocks%comflag%_%com_ver%/examples - -mingw32-make clean -pause -mingw32-make -f makefile%comflag% - -cd ../../../_DSPE_lib_minGW_ - -:End \ No newline at end of file diff --git a/make_examples_mingw_CodeBlocks_64bit_8.1.0(b).bat b/make_examples_mingw_CodeBlocks_64bit_8.1.0(b).bat deleted file mode 100644 index 5b8ccbe19151028286bfd8590a89dafa80deac08..0000000000000000000000000000000000000000 --- a/make_examples_mingw_CodeBlocks_64bit_8.1.0(b).bat +++ /dev/null @@ -1,39 +0,0 @@ -rem comflag=-m32 - kompilacja w wersji 32-bitowej -set comflag=-m64 -set com_ver=MinGW-W64_8.1.0 - -set filename=make_examples_mingw_CodeBlocks_64bit_8.1.0(b).bat - -IF exist %filename% GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist %filename% GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -rem path=c:\Dev-Cpp\MinGW64\bin;c:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% -rem path=e:\Dev-Cpp\MinGW64\bin;e:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% -rem path=e:\CodeBlocks\MinGW\bin;e:\CodeBlocks\MinGW\mingw32\bin\;e:\msys\1.0\bin\;%path% -path=d:\CodeBlocks_20_03\MinGW\bin;d:\CodeBlocks_20_03\MinGW\x86_64-w64-mingw32\bin\;d:\msys\1.0\bin\;%path% - - -GOTO MakeExamples - -:MakeExamples -set in_dir=%cd% - -rem cd ../_DSPE_lib_minGW_/CodeBlocks%comflag%_%com_ver%/examples -cd ../../../workspace/_DSPE_lib_minGW_/CodeBlocks%comflag%_%com_ver%/examples - -mingw32-make clean -pause -mingw32-make -f makefile%comflag% - -cd %in_dir% - -:End \ No newline at end of file diff --git a/make_examples_mingw_CodeBlocks_64bit_8.1.0(c).bat b/make_examples_mingw_CodeBlocks_64bit_8.1.0(c).bat deleted file mode 100644 index 2a057b8682dbe89612ebe480e546397abfe27e0f..0000000000000000000000000000000000000000 --- a/make_examples_mingw_CodeBlocks_64bit_8.1.0(c).bat +++ /dev/null @@ -1,44 +0,0 @@ -rem comflag=-m32 - kompilacja w wersji 32-bitowej -set comflag=-m64 -set com_ver=MinGW-W64_8.1.0 - -set start_dir=%cd% -rem set in_dir=%cd% -set in_dir=d:\Eclipse_Mars\git_folder\DSPElib\DSPE_lib - -rem set workspace_dir=d:\Eclipse_Mars\workspace -set workspace_dir=R:\workspace - -set filename=%in_dir%\make_examples_mingw_CodeBlocks_64bit_8.1.0(c).bat - -IF exist "%filename%" GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist "%filename%" GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -rem path=c:\Dev-Cpp\MinGW64\bin;c:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% -rem path=e:\Dev-Cpp\MinGW64\bin;e:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% -rem path=e:\CodeBlocks\MinGW\bin;e:\CodeBlocks\MinGW\mingw32\bin\;e:\msys\1.0\bin\;%path% -path=d:\CodeBlocks_20_03\MinGW\bin;d:\CodeBlocks_20_03\MinGW\x86_64-w64-mingw32\bin\;d:\msys\1.0\bin\;%path% - - -GOTO MakeExamples - -:MakeExamples -rem cd ../_DSPE_lib_minGW_/CodeBlocks%comflag%_%com_ver%/examples -cd /d "%workspace_dir%/_DSPE_lib_minGW_/CodeBlocks%comflag%_%com_ver%/examples" - -mingw32-make clean -pause -mingw32-make -f makefile%comflag% - -cd %start_dir% - -:End \ No newline at end of file diff --git a/make_examples_mingw_CodeBlocks_64bit_8.1.0.bat b/make_examples_mingw_CodeBlocks_64bit_8.1.0.bat deleted file mode 100644 index 3692be6c03a94d9a8725c37ea12f3cec91c26256..0000000000000000000000000000000000000000 --- a/make_examples_mingw_CodeBlocks_64bit_8.1.0.bat +++ /dev/null @@ -1,35 +0,0 @@ -rem comflag=-m32 - kompilacja w wersji 32-bitowej -set comflag=-m64 -set com_ver=MinGW-W64_8.1.0 - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -rem path=c:\Dev-Cpp\MinGW64\bin;c:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% -rem path=e:\Dev-Cpp\MinGW64\bin;e:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% -rem path=e:\CodeBlocks\MinGW\bin;e:\CodeBlocks\MinGW\mingw32\bin\;e:\msys\1.0\bin\;%path% -path=d:\CodeBlocks_20_03\MinGW\bin;d:\CodeBlocks_20_03\MinGW\x86_64-w64-mingw32\bin\;d:\msys\1.0\bin\;%path% - - -GOTO MakeExamples - -:MakeExamples -rem cd ../_DSPE_lib_minGW_/CodeBlocks%comflag%_%com_ver%/examples -cd ../../../workspace/_DSPE_lib_minGW_/CodeBlocks%comflag%_%com_ver%/examples - -mingw32-make clean -pause -mingw32-make -f makefile%comflag% - -cd ../../../_DSPE_lib_minGW_ - -:End \ No newline at end of file diff --git a/make_examples_mingw_DEV_32bit_4.8.1.bat b/make_examples_mingw_DEV_32bit_4.8.1.bat deleted file mode 100644 index 023067cdede038cea586fe268d2a3fed3e6e91f9..0000000000000000000000000000000000000000 --- a/make_examples_mingw_DEV_32bit_4.8.1.bat +++ /dev/null @@ -1,29 +0,0 @@ -rem comflag=-m32 - kompilacja w wersji 32-bitowej -set comflag=-m32 - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -path=c:\Dev-Cpp\MinGW64\bin;c:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% - -GOTO MakeExamples - -:MakeExamples -cd ../_DSPE_lib_minGW_/Dev-cpp%comflag%/examples - -mingw32-make clean -pause -mingw32-make -f makefile%comflag% - -cd ../../Dsp_lib - -:End \ No newline at end of file diff --git a/make_examples_mingw_DEV_32bit_4.9.2.bat b/make_examples_mingw_DEV_32bit_4.9.2.bat deleted file mode 100644 index 6ee1b0ea2281e8d1bdc37332bab5c429708aeb7f..0000000000000000000000000000000000000000 --- a/make_examples_mingw_DEV_32bit_4.9.2.bat +++ /dev/null @@ -1,32 +0,0 @@ -rem comflag=-m32 - kompilacja w wersji 32-bitowej -set comflag=-m32 - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -rem path=c:\Dev-Cpp\MinGW64\bin;c:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% -path=e:\Dev-Cpp\MinGW64\bin;e:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% - - -GOTO MakeExamples - -:MakeExamples -rem cd ../_DSPE_lib_minGW_/Dev-cpp%comflag%/examples -cd ../../../workspace/_DSPE_lib_minGW_/Dev-cpp%comflag%/examples - -mingw32-make clean -pause -mingw32-make -f makefile%comflag% - -cd ../../Dsp_lib - -:End \ No newline at end of file diff --git a/make_examples_mingw_DEV_64bit_4.8.1.bat b/make_examples_mingw_DEV_64bit_4.8.1.bat deleted file mode 100644 index 2c10ec394e1a69c8427d3310c088dbbd54e73d18..0000000000000000000000000000000000000000 --- a/make_examples_mingw_DEV_64bit_4.8.1.bat +++ /dev/null @@ -1,28 +0,0 @@ -rem comflag=-m64 - kompilacja w wersji 64-bitowej -set comflag=-m64 - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -path=c:\Dev-Cpp\MinGW64\bin;c:\Dev-Cpp\MinGW64\x86_64-w64-mingw32\bin\;%path% -GOTO MakeExamples - -:MakeExamples -cd ../_DSPE_lib_minGW_/Dev-cpp%comflag%/examples - -mingw32-make clean -pause -mingw32-make -f makefile%comflag% - -cd ../../Dsp_lib - -:End \ No newline at end of file diff --git a/makelib.bat b/makelib.bat deleted file mode 100644 index 6e8f010f9ce577c23da5f720ecf48b465945b646..0000000000000000000000000000000000000000 --- a/makelib.bat +++ /dev/null @@ -1,60 +0,0 @@ -IF exist makelib.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -IF not exist C:\MinGW\bin\ranlib.exe GOTO DriveE -path=C:\MinGW\bin\;%path% -rem path=E:\mingw\bin;E:\msys\1.0\bin\;%path% -GOTO MakeLib - -:DriveE -path=E:\MinGW\bin\;%path% - -:MakeLib - -cd .. -mkdir _DSP_lib -mkdir _DSP_lib\dbg -mkdir _DSP_lib\include -cd DSP_lib - -copy /B src\include\*.h ..\_DSP_lib\include\*.* -rem copy /B src\include\DSP_lib.h ..\_DSP_lib\include\*.* -rem copy /B src\include\DSP_IO.h ..\_DSP_lib\include\*.* -rem copy /B src\include\DSPtypes.h ..\_DSP_lib\include\*.* -rem copy /B src\include\DSPmodules.h ..\_DSP_lib\include\*.* -rem copy /B src\include\DSPmodules2.h ..\_DSP_lib\include\*.* -rem copy /B src\include\DSPclocks.h ..\_DSP_lib\include\*.* -rem copy /B src\include\DSP_misc.h ..\_DSP_lib\include\*.* -rem copy /B src\include\DSP_Fourier.h ..\_DSP_lib\include\*.* -rem copy /B src\include\DSP_AudioMixer.h ..\_DSP_lib\include\*.* - -cd Debug\src\cpp - -ar rc libDSP.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o MISCfunc.o DSP_Fourier.o DSP_AudioMixer.o -ranlib libDSP.a - -copy /B libDSP.a ..\..\..\..\_DSP_lib\dbg\*.* -del libDSP.a Y - -cd ..\..\.. - -cd Release\src\cpp - -ar rc libDSP.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o MISCfunc.o DSP_Fourier.o DSP_AudioMixer.o -ranlib libDSP.a - -copy /B libDSP.a ..\..\..\..\_DSP_lib\*.* -del libDSP.a Y - -cd ..\..\.. - -:End \ No newline at end of file diff --git a/makelib_anonymous_mingw.bat b/makelib_anonymous_mingw.bat deleted file mode 100644 index 02153a8e1502bcf9ab5280b9f63c503c115cbf40..0000000000000000000000000000000000000000 --- a/makelib_anonymous_mingw.bat +++ /dev/null @@ -1,62 +0,0 @@ -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -IF not exist E:\mingw\bin\ranlib.exe GOTO DriveC -rem path=E:\cygwin\bin;%path% -path=E:\mingw\bin;E:\msys\1.0\bin\;%path% -GOTO MakeLib - -:DriveC -path=C:\mingw\bin;C:\msys\1.0\bin\;%path% - -:MakeLib - -cd .. -mkdir _DSP_lib_minGW_anonymous -mkdir _DSP_lib_minGW_anonymous\rls -mkdir _DSP_lib_minGW_anonymous\dbg -mkdir _DSP_lib_minGW_anonymous\include -cd DSP_lib - -copy /B src\include\*.h ..\_DSP_lib_minGW_anonymous\include\*.* -copy /B src\include\rls\DSP_setup.h ..\_DSP_lib_minGW_anonymous\rls\*.* -copy /B src\include\dbg\DSP_setup.h ..\_DSP_lib_minGW_anonymous\dbg\*.* - -cd Debug_anonymous\src\cpp - -ar rc libDSP.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o MISCfunc.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSP.a -ar rc libDSPsockets.a DSPsockets.o -ranlib libDSPsockets.a - -copy /B libDSP.a ..\..\..\..\_DSP_lib_minGW_anonymous\dbg\*.* -del libDSP.a Y -copy /B libDSPsockets.a ..\..\..\..\_DSP_lib_minGW_anonymous\dbg\*.* -del libDSPsockets.a Y - -cd ..\..\.. - -cd Release_anonymous\src\cpp - -ar rc libDSP.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o MISCfunc.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSP.a -ar rc libDSPsockets.a DSPsockets.o -ranlib libDSPsockets.a - -copy /B libDSP.a ..\..\..\..\_DSP_lib_minGW_anonymous\rls\*.* -del libDSP.a Y -copy /B libDSPsockets.a ..\..\..\..\_DSP_lib_minGW_anonymous\rls\*.* -del libDSPsockets.a Y - -cd ..\..\.. - -:End \ No newline at end of file diff --git a/makelib_anonymous_mingw_gcc_4.bat b/makelib_anonymous_mingw_gcc_4.bat deleted file mode 100644 index 84e1aa6fb1aa9c0647ecdcf4cfee5ffd38447acb..0000000000000000000000000000000000000000 --- a/makelib_anonymous_mingw_gcc_4.bat +++ /dev/null @@ -1,64 +0,0 @@ -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -IF not exist E:\mingw\bin\ranlib.exe GOTO DriveC -rem path=E:\cygwin\bin;%path% -path=E:\mingw\bin;E:\msys\1.0\bin\;%path% -GOTO MakeLib - -:DriveC -path=C:\mingw\bin;C:\msys\1.0\bin\;%path% - -:MakeLib - -cd .. -mkdir _DSP_lib_minGW_anonymous_gcc4 -mkdir _DSP_lib_minGW_anonymous_gcc4\rls -mkdir _DSP_lib_minGW_anonymous_gcc4\dbg -mkdir _DSP_lib_minGW_anonymous_gcc4\include -cd DSP_lib - -copy /B src\include\*.h ..\_DSP_lib_minGW_anonymous_gcc4\include\*.* -copy /B src\include\rls\DSP_setup.h ..\_DSP_lib_minGW_anonymous_gcc4\rls\*.* -copy /B src\include\dbg\DSP_setup.h ..\_DSP_lib_minGW_anonymous_gcc4\dbg\*.* - -cd "Release gcc4 anonymous\src\cpp" - -ar rc libDSP.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o MISCfunc.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSP.a -ar rc libDSPsockets.a DSPsockets.o -ranlib libDSPsockets.a - -copy /B libDSP.a ..\..\..\..\_DSP_lib_minGW_anonymous_gcc4\rls\*.* -del libDSP.a Y -copy /B libDSPsockets.a ..\..\..\..\_DSP_lib_minGW_anonymous_gcc4\rls\*.* -del libDSPsockets.a Y - -cd ..\..\.. - - -cd "Debug gcc4 anonymous\src\cpp" - -ar rc libDSP.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o MISCfunc.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSP.a -ar rc libDSPsockets.a DSPsockets.o -ranlib libDSPsockets.a - -copy /B libDSP.a ..\..\..\..\_DSP_lib_minGW_anonymous_gcc4\dbg\*.* -del libDSP.a Y -copy /B libDSPsockets.a ..\..\..\..\_DSP_lib_minGW_anonymous_gcc4\dbg\*.* -del libDSPsockets.a Y - -cd ..\..\.. - - -:End \ No newline at end of file diff --git a/makelib_linux.sh b/makelib_linux.sh deleted file mode 100644 index 419a762aaf5599160b8dae760fca6547e818df6d..0000000000000000000000000000000000000000 --- a/makelib_linux.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -if [ ! -f makelib_linux.sh ]; then - echo Working directory is not correct - #rem pause - echo Trying "workspace/Dsp_lib" - cd workspace/Dsp_lib - - if [ ! -f makelib_linux.sh ]; then - echo Working directory is definitely is not correct !!! - return - fi -fi - -#:MakeLib - -cd .. -mkdir _DSP_lib_Linux -mkdir _DSP_lib_Linux/rls -mkdir _DSP_lib_Linux/dbg -mkdir _DSP_lib_Linux/include -cd DSP_lib - -cp src/include/*.h ../_DSP_lib_Linux/include/ -cp src/include/rls/DSP_setup.h ../_DSP_lib_Linux/rls/ -cp src/include/dbg/DSP_setup.h ../_DSP_lib_Linux/dbg/ - - -cd 'Debug Linux/src/cpp' - -ar rc libDSP.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o MISCfunc.o DSP_Fourier.o DSP_AudioMixer.o -ranlib libDSP.a - -cp libDSP.a ../../../../_DSP_lib_Linux/dbg/ -rm libDSP.a - -cd ../../.. - -cd 'Release Linux/src/cpp' - -ar rc libDSP.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o MISCfunc.o DSP_Fourier.o DSP_AudioMixer.o -ranlib libDSP.a - -cp libDSP.a ../../../../_DSP_lib_Linux/rls/ -rm libDSP.a - -cd ../../.. - -#:End \ No newline at end of file diff --git a/makelib_mingw.bat b/makelib_mingw.bat deleted file mode 100644 index 01752809df767663a508da87d9c3a9b652c7760c..0000000000000000000000000000000000000000 --- a/makelib_mingw.bat +++ /dev/null @@ -1,77 +0,0 @@ -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -IF not exist E:\mingw\bin\ranlib.exe GOTO DriveC -rem path=E:\cygwin\bin;%path% -path=E:\mingw\bin;E:\msys\1.0\bin\;%path% -GOTO MakeLib - -:DriveC -path=C:\mingw\bin;C:\msys\1.0\bin\;%path% - -:MakeLib - -cd .. -mkdir _DSP_lib_minGW -mkdir _DSP_lib_minGW\rls -mkdir _DSP_lib_minGW\dbg -mkdir _DSP_lib_minGW\include -mkdir _DSP_lib_minGW\examples -mkdir _DSP_lib_minGW\examples\matlab -mkdir _DSP_lib_minGW\toolbox -cd DSP_lib - -copy /B examples\*.* ..\_DSP_lib_minGW\examples\*.* -copy /B examples\matlab\*.* ..\_DSP_lib_minGW\examples\matlab\*.* -copy /B matlab\toolbox\*.m ..\_DSP_lib_minGW\toolbox\*.m -copy /B src\include\*.h ..\_DSP_lib_minGW\include\*.* -copy /B src\include\rls\DSP_setup.h ..\_DSP_lib_minGW\rls\*.* -copy /B src\include\dbg\DSP_setup.h ..\_DSP_lib_minGW\dbg\*.* - -rem copy /B src\include\DSP_lib.h ..\_DSP_lib_minGW\include\*.* -rem copy /B src\include\DSP_IO.h ..\_DSP_lib_minGW\include\*.* -rem copy /B src\include\DSPtypes.h ..\_DSP_lib_minGW\include\*.* -rem copy /B src\include\DSPmodules.h ..\_DSP_lib_minGW\include\*.* -rem copy /B src\include\DSPclocks.h ..\_DSP_lib_minGW\include\*.* -rem copy /B src\include\DSP_misc.h ..\_DSP_lib_minGW\include\*.* -rem copy /B src\include\DSP_Fourier.h ..\_DSP_lib_minGW\include\*.* -rem copy /B src\include\DSP_AudioMixer.h ..\_DSP_lib_minGW\include\*.* - -cd Debug\src\cpp - -ar rc libDSP.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o MISCfunc.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSP.a -ar rc libDSPsockets.a DSPsockets.o -ranlib libDSPsockets.a - -copy /B libDSP.a ..\..\..\..\_DSP_lib_minGW\dbg\*.* -del libDSP.a Y -copy /B libDSPsockets.a ..\..\..\..\_DSP_lib_minGW\dbg\*.* -del libDSPsockets.a Y - -cd ..\..\.. - -cd Release\src\cpp - -ar rc libDSP.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o MISCfunc.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSP.a -ar rc libDSPsockets.a DSPsockets.o -ranlib libDSPsockets.a - -copy /B libDSP.a ..\..\..\..\_DSP_lib_minGW\rls\*.* -del libDSP.a Y -copy /B libDSPsockets.a ..\..\..\..\_DSP_lib_minGW\rls\*.* -del libDSPsockets.a Y - -cd ..\..\.. - -:End \ No newline at end of file diff --git a/makelib_mingw_gcc_4.bat b/makelib_mingw_gcc_4.bat deleted file mode 100644 index c8957997de12b3fd6f7cea38a72dcc02874ee7d1..0000000000000000000000000000000000000000 --- a/makelib_mingw_gcc_4.bat +++ /dev/null @@ -1,68 +0,0 @@ -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is not correct -rem pause -echo Trying "workspace/Dsp_lib" -cd workspace/Dsp_lib - -IF exist makelib_mingw.bat GOTO AllOk -echo Working directory is definitely is not correct !!! -pause -GOTO End - -:AllOK -IF not exist E:\mingw\bin\ranlib.exe GOTO DriveC -rem path=E:\cygwin\bin;%path% -path=E:\mingw\bin;E:\msys\1.0\bin\;%path% -GOTO MakeLib - -:DriveC -path=C:\mingw_gcc_4\bin;C:\msys\1.0\bin\;%path% - -:MakeLib - -cd .. -mkdir _DSP_lib_minGW_gcc4 -mkdir _DSP_lib_minGW_gcc4\rls -mkdir _DSP_lib_minGW_gcc4\dbg -mkdir _DSP_lib_minGW_gcc4\include -mkdir _DSP_lib_minGW_gcc4\examples -mkdir _DSP_lib_minGW_gcc4\examples\matlab -mkdir _DSP_lib_minGW_gcc4\toolbox -cd DSP_lib - -copy /B examples\*.* ..\_DSP_lib_minGW_gcc4\examples\*.* -copy /B examples\matlab\*.* ..\_DSP_lib_minGW_gcc4\examples\matlab\*.* -copy /B matlab\toolbox\*.m ..\_DSP_lib_minGW_gcc4\toolbox\*.m -copy /B src\include\*.h ..\_DSP_lib_minGW_gcc4\include\*.* -copy /B src\include\rls\DSP_setup.h ..\_DSP_lib_minGW_gcc4\rls\*.* -copy /B src\include\dbg\DSP_setup.h ..\_DSP_lib_minGW_gcc4\dbg\*.* - -cd "Debug gcc4\src\cpp" - -ar rc libDSP.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o MISCfunc.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSP.a -ar rc libDSPsockets.a DSPsockets.o -ranlib libDSPsockets.a - -copy /B libDSP.a ..\..\..\..\_DSP_lib_minGW_gcc4\dbg\*.* -del libDSP.a Y -copy /B libDSPsockets.a ..\..\..\..\_DSP_lib_minGW_gcc4\dbg\*.* -del libDSPsockets.a Y - -cd ..\..\.. - -cd "Release gcc4\src\cpp" - -ar rc libDSP.a DSP_IO.o DSP_misc.o DSPclocks.o DSPmodules.o DSPmodules2.o MISCfunc.o DSP_Fourier.o DSP_AudioMixer.o DSPmodules_misc.o DSP_DOT.o -ranlib libDSP.a -ar rc libDSPsockets.a DSPsockets.o -ranlib libDSPsockets.a - -copy /B libDSP.a ..\..\..\..\_DSP_lib_minGW_gcc4\rls\*.* -del libDSP.a Y -copy /B libDSPsockets.a ..\..\..\..\_DSP_lib_minGW_gcc4\rls\*.* -del libDSPsockets.a Y - -cd ..\..\.. - -:End \ No newline at end of file diff --git a/src/Main.cpp b/src/Main.cpp index 339600de3ad8e36a397ff80d3adddb0642e9f802..333f2403aec0ea66342d53119a60e1c013dfc132 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -2772,7 +2772,7 @@ int test_ZPSTC_cw_3() } //ALSA_object.close_alsa_device(true); //snd_pcm_close(alsa_handle); - ALSA_object.close_PCM_device_output(); + ALSA_object.close_PCM_device_output(true); //free(buffer); return 0; @@ -2917,18 +2917,29 @@ polling: ALSA_object.log_driver_data(); unsigned int Fs = 44100; - int rs = ALSA_object.open_PCM_device_4_output(2, 16, Fs); - if (rs == 1) { - ALSA_object.close_PCM_device_output(); - } - - vector<int16_t> signal = test_record(); + //vector<int16_t> signal = test_record(); DSP::Float_vector float_signal; - for (auto ind=0; ind < signal.size(); ind++) { - float_signal[ind] = signal[ind]; + float_signal.resize(2*Fs); + // for (auto ind=0; ind < float_signal.size(); ind++) { + // float_signal[ind] = sin(6000.0 / Fs * ind); + // } + + const int no_of_channels = 2; + for (auto ind=0; ind < float_signal.size()/no_of_channels; ind++) { + //float_signal[no_of_channels*ind] = sin(6000.0 / Fs * ind); // M.B. moĹźna usĹyszeÄ nieciÄ gĹoĹÄ fazy na ĹÄ czeniach poszczegĂłlnych segmentĂłw + float_signal[no_of_channels*ind] = sin(2*DSP::M_PIf * 1000.0 / Fs * ind); // M.B. brak nieciÄ gĹoĹÄ fazy na ĹÄ czeniach poszczegĂłlnych segmentĂłw + float_signal[no_of_channels*ind+1] = 0; } - test_playback(float_signal); + + int rs = ALSA_object.open_PCM_device_4_output(no_of_channels, 16, Fs, float_signal.size()/no_of_channels); + + //test_playback(float_signal); + ALSA_object.append_playback_buffer(float_signal); // M.B. tutaj tylko rpzekazujemy dane do ALSA_object, ale jeszcze nie trafiajÄ do karty dĹşwiÄkowej + ALSA_object.append_playback_buffer(float_signal); // M.B. dopiero to wywoĹanie spowoduje faktyczne przesĹanie danych do karty dĹşwiÄkowej + ALSA_object.append_playback_buffer(float_signal); + ALSA_object.append_playback_buffer(float_signal); + ALSA_object.close_PCM_device_output(true); return 0; } @@ -2943,7 +2954,6 @@ int main(int argc, char*argv[]) #ifdef ALSA_support_H DSP::log << "test ALSA" << endl; test_ALSA(); - return 0; #endif // ALSA_support_H DSP::log << "test DSP::log" << endl; @@ -2961,13 +2971,16 @@ int main(int argc, char*argv[]) DSP::log << DSP::e::LogMode::pause << "Finished SolveMatrix test" << endl; #ifdef INCLUDE_DSPE_EXAMPLES - DSP::log << "Starting test_sound_input" << endl; - test_sound_input(); - DSP::log << DSP::e::LogMode::Error << "Finished test_sound_input" << endl; - + DSP::log << "Starting test_hello" << endl; test_hello(); DSP::log << DSP::e::LogMode::Error << "Finished test_hello" << endl; + + DSP::log << "Starting test_sound_input" << endl; + bool use_audio_output = false; + test_sound_input(use_audio_output); + DSP::log << DSP::e::LogMode::Error << "Finished test_sound_input" << endl; + #endif // INCLUDE_DSPE_EXAMPLES DSP::log << "Starting SymbolMapper test" << endl; diff --git a/src/Makefile.linux b/src/Makefile.linux index 2443d6c0b481b9c986ba6bb69521a7aefec7fcbc..3c15a389520de9722eefba24690a3969ab19c976 100644 --- a/src/Makefile.linux +++ b/src/Makefile.linux @@ -6,7 +6,8 @@ CC=g++ #comflag = -m32 # comflag = -m64 comflag = $(COMFLAG) -com_ver = $(shell gcc -dumpmachine)-gcc_$(shell gcc -dumpversion) +#com_ver = $(shell gcc -dumpmachine)-gcc_$(shell gcc -dumpversion) +com_ver = $(shell $(CC) -dumpmachine)-gcc_$(shell $(CC) -dumpversion) INSTALL_DIR_ROOT = ../_DSPE_lib_linux_ @@ -24,7 +25,7 @@ INCLUDES_RLS := -I./src/include -I./src/include/rls LIBS := -lasound # \TODO is DEVCPP ok or is it unnecessary -DFLAGS = -DLINUX -DDEVCPP -DINCLUDE_DSPE_EXAMPLES +DFLAGS = -DLINUX -DDEVCPP -DINCLUDE_DSPE_EXAMPLES # -DAUDIO_DEBUG_MESSAGES_ON CFLAGS_release = $(comflag) -std=c++0x -O3 -Wall -c -fmessage-length=0 -fno-strict-aliasing CFLAGS_debug = $(comflag) -std=c++0x -O0 -g3 -Wall -c -fmessage-length=0 -W -Wshadow -Wconversion -fstrict-aliasing -fmax-errors=5 # -U__STRICT_ANSI__ jest potrzebne do kompilacji debug_new.cpp, jeďż˝eli pomin�� ten plik to moďż˝na rďż˝wnieďż˝ wyrzuciďż˝ tďż˝ opcjďż˝ diff --git a/src/Makefile.win b/src/Makefile.win index bb7bcb6ce710fb66128a904a3c3889fa9841a236..0fc354838d1cebb99bef76ca0aa5a34287ca6a14 100644 --- a/src/Makefile.win +++ b/src/Makefile.win @@ -4,7 +4,8 @@ CC=g++ # comflag = -m32 # comflag = -m64 comflag = $(COMFLAG) -com_ver = MinGW-W64_8.1.0 +#com_ver = MinGW-W64_8.1.0 +com_ver = $(shell $(CC) -dumpmachine)-gcc_$(shell $(CC) -dumpversion) # INSTALL_DIR_ROOT = e:/Eclipse_Mars/workspace/_DSPE_lib_minGW_ # INSTALL_DIR_ROOT = ./_DSPE_lib_minGW_ diff --git a/src/cpp/ALSA_support.cpp b/src/cpp/ALSA_support.cpp index a54f695494429f2828b67f3fde1cf02cbfc255cb..1b3d7e7ee001e47e50ab1e1b96ed9f0625144e6b 100644 --- a/src/cpp/ALSA_support.cpp +++ b/src/cpp/ALSA_support.cpp @@ -1,11 +1,12 @@ /*! \file ALSA_support.cpp * ALSA support code file * - * \author Marek Blok + * \authors Damian KaraĹ, Marek Blok */ #include <ALSA_support.h> - +#include <vector> +#include <cmath> #include <DSP_lib.h> // for logging // ============================================================= // @@ -16,339 +17,1052 @@ DSP::ALSA_object_t::ALSA_object_t() { alsa_handle = NULL; hw_params = NULL; -}; + + std::string endianness; + endianness = system("lscpu | grep \"Byte Order\" | egrep -o 'Little Endian|Big Endian'"); + + if (endianness == "Big Endian") + IsLittleEndian = false; + else + IsLittleEndian = true; + + IsHigherQualityMode = false; + + non_blocking_mode = true; + + IsDeviceInputOpen = false; + IsDeviceOutputOpen = false; + + IsPlayingNow = false; + StopPlayback = false; + + StopRecording = false; + IsRecordingNow = false; + + OutDevNo = 1; + InDevNo = 1; + + NextBufferOutInd = 0; + + /* 44100 bits/second sampling rate (CD quality) */ + sampling_rate_alsa = 44100; + no_of_channels_alsa = 2; + no_of_bytes_in_channel = 2; + + audio_inbuffer_size_in_frames = 8000; + audio_outbuffer_size_in_frames = 8000; + size_b = 32; +} + DSP::ALSA_object_t::~ALSA_object_t() { - if (hw_params != NULL){ + if (hw_params != NULL) + { snd_pcm_hw_params_free(hw_params); hw_params = NULL; } + + buffers_8bit.clear(); + buffers_16bit.clear(); + buffers_32bit.clear(); + buffers_32bit_f.clear(); + buffers_64bit.clear(); + + capture_buffer.clear(); + + pcm_buffer.clear(); + pcm_buffer_size_in_frames.clear(); + + if (IsDeviceInputOpen) + close_PCM_device_input(); + if (IsDeviceOutputOpen) + close_PCM_device_output(true); } -unsigned int DSP::ALSA_object_t::select_input_device_by_number(const unsigned int &device_number) { - assert(!"ALSA_object_t::select_input_device_by_number not yet implemented"); +unsigned int DSP::ALSA_object_t::select_input_device_by_number(const unsigned int &device_number) +{ + InDevNo = device_number; + + return InDevNo; } -unsigned int DSP::ALSA_object_t::select_output_device_by_number(const unsigned int &device_number) { - assert(!"ALSA_object_t::select_output_device_by_number not yet implemented"); +unsigned int DSP::ALSA_object_t::select_output_device_by_number(const unsigned int &device_number) +{ + OutDevNo = device_number; + + return OutDevNo; } -bool DSP::ALSA_object_t::is_output_callback_supported(void) { - assert(!"ALSA_object_t::is_output_callback_supported not yet implemented"); +bool DSP::ALSA_object_t::is_input_callback_supported(void) +{ return false; } -bool DSP::ALSA_object_t::is_input_callback_supported(void) { - assert(!"ALSA_object_t::is_input_callback_supported not yet implemented"); +bool DSP::ALSA_object_t::is_output_callback_supported(void) +{ return false; } -void DSP::ALSA_object_t::log_driver_data() { - int val; - - DSP::log << "ALSA library version: " << SND_LIB_VERSION_STR << endl; - - DSP::log << endl; - DSP::log << "PCM stream types:" << endl; - for (val = 0; val <= SND_PCM_STREAM_LAST; val++) - DSP::log << " " << snd_pcm_stream_name((snd_pcm_stream_t)val) << endl; - - DSP::log << endl; - DSP::log << "PCM access types:" << endl; - for (val = 0; val <= SND_PCM_ACCESS_LAST; val++) - DSP::log << " " << snd_pcm_access_name((snd_pcm_access_t)val) << endl; - - DSP::log << endl; - DSP::log << "PCM formats:" << endl; - for (val = 0; val <= SND_PCM_FORMAT_LAST; val++) - if (snd_pcm_format_name((snd_pcm_format_t)val) != NULL) - DSP::log << " " << snd_pcm_format_name((snd_pcm_format_t)val) << - "(" << snd_pcm_format_description((snd_pcm_format_t)val) << ")" << endl; - - DSP::log << endl; - DSP::log << "PCM subformats:" << endl; - for (val = 0; val <= SND_PCM_SUBFORMAT_LAST; val++) - DSP::log << " " << snd_pcm_subformat_name((snd_pcm_subformat_t)val) << - "(" << snd_pcm_subformat_description((snd_pcm_subformat_t)val) << ")" << endl; - - DSP::log << endl; - DSP::log << "PCM states:" << endl; - for (val = 0; val <= SND_PCM_STATE_LAST; val++) - DSP::log << " " << snd_pcm_state_name((snd_pcm_state_t)val) << endl; +void DSP::ALSA_object_t::log_driver_data() +{ + #ifdef AUDIO_DEBUG_MESSAGES_ON + + //! For logging + int val; + + DSP::log << "ALSA library version: " << SND_LIB_VERSION_STR << endl; + + DSP::log << endl; + DSP::log << "PCM stream types:" << endl; + for (val = 0; val <= SND_PCM_STREAM_LAST; val++) + DSP::log << " " << snd_pcm_stream_name((snd_pcm_stream_t)val) << endl; + + DSP::log << endl; + DSP::log << "PCM access types:" << endl; + for (val = 0; val <= SND_PCM_ACCESS_LAST; val++) + DSP::log << " " << snd_pcm_access_name((snd_pcm_access_t)val) << endl; + + DSP::log << endl; + DSP::log << "PCM formats:" << endl; + for (val = 0; val <= SND_PCM_FORMAT_LAST; val++) + if (snd_pcm_format_name((snd_pcm_format_t)val) != NULL) + DSP::log << " " << snd_pcm_format_name((snd_pcm_format_t)val) << + "(" << snd_pcm_format_description((snd_pcm_format_t)val) << ")" << endl; + + DSP::log << endl; + DSP::log << "PCM subformats:" << endl; + for (val = 0; val <= SND_PCM_SUBFORMAT_LAST; val++) + DSP::log << " " << snd_pcm_subformat_name((snd_pcm_subformat_t)val) << + "(" << snd_pcm_subformat_description((snd_pcm_subformat_t)val) << ")" << endl; + + DSP::log << endl; + DSP::log << "PCM states: " << endl; + for (val = 0; val <= SND_PCM_STATE_LAST; val++) + DSP::log << " " << snd_pcm_state_name((snd_pcm_state_t)val) << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON } +int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type) +{ + //! Errors controller in API ALSA functions + int rc; + //! Errors controller in set_snd_pcm_format() function + int errc; -/* - -This example opens the default PCM device, sets -some parameters, and then displays the value -of most of the hardware parameters. It does not -perform any sound playback or recording. - -returns actually selected sampling_rate + //! Local configuration space handler + snd_pcm_hw_params_t *params; -*/ -int DSP::ALSA_object_t::open_alsa_device(snd_pcm_stream_t stream_type, int no_of_channels, unsigned int &sampling_rate) { - int rc; - snd_pcm_t *handle; + //! For logging unsigned int val, val2; + //! Auxiliary variable in API ALSA functions int dir; - snd_pcm_uframes_t frames; if (alsa_handle != NULL) close_alsa_device(); - // ==================================================== // - DSP::log << "Opening ALSA device" << endl; - - { + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "Opening ALSA device" << endl; + //! \TODO Test mode: Open mode (see SND_PCM_NONBLOCK, SND_PCM_ASYNC) - /* Open PCM device for playback. */ - rc = snd_pcm_open(&handle, "default", - stream_type, SND_PCM_NONBLOCK); - if (rc < 0) { - DSP::log << "unable to open pcm device: " << snd_strerror(rc) << endl; - //exit(1); - return -1; - } - alsa_handle = handle; - } + + if (stream_type == SND_PCM_STREAM_PLAYBACK) + DSP::log << "Opening PCM device for playback." << endl; + + else + DSP::log << "Opening PCM device for recording (capture)." << endl; + + #endif // AUDIO_DEBUG_MESSAGES_ON + rc = snd_pcm_open(&alsa_handle, "default", stream_type, SND_PCM_NONBLOCK); + + if (rc < 0) { - snd_pcm_hw_params_t *params; + DSP::log << "Unable to open pcm device: " << snd_strerror(rc) << endl; + return -1; + } - /* Allocate a hardware parameters object. */ - snd_pcm_hw_params_alloca(¶ms); + /*! Allocate a hardware parameters object. */ + snd_pcm_hw_params_alloca(¶ms); - /* Fill it in with default values. */ - snd_pcm_hw_params_any(alsa_handle, params); + /*! Fill it in with default values. */ + snd_pcm_hw_params_any(alsa_handle, params); - /* Set the desired hardware parameters. */ + // ============================================================= // + // Set the desired hardware parameters. + // ============================================================= // - /* Interleaved mode */ - snd_pcm_hw_params_set_access(handle, params, - SND_PCM_ACCESS_RW_INTERLEAVED); + /*! Interleaved mode */ + snd_pcm_hw_params_set_access(alsa_handle, params, SND_PCM_ACCESS_RW_INTERLEAVED); - //! \TODO Format selection based on input parameters - /* Signed 16-bit little-endian format */ - snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_S16_LE); + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "Setting the SND PCM FORMAT." << endl; + DSP::log << "Something less than 0 means an error occurance." << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + + errc = DSP::ALSA_object_t::set_snd_pcm_format(params); - /* Two channels (stereo) */ - snd_pcm_hw_params_set_channels(alsa_handle, params, no_of_channels); + if (errc < 0) + return -4; - /* 44100 bits/second sampling rate (CD quality) */ - snd_pcm_hw_params_set_rate_near(alsa_handle, params, &sampling_rate, &dir); + snd_pcm_hw_params_set_channels(alsa_handle, params, no_of_channels_alsa); - //snd_pcm_hw_params_set_buffer_size(); + snd_pcm_hw_params_set_rate_near(alsa_handle, params, &sampling_rate_alsa, &dir); - /* Write the parameters to the driver */ - rc = snd_pcm_hw_params(alsa_handle, params); - if (rc < 0) { - DSP::log << "unable to set hw parameters: " << snd_strerror(rc) << endl; - //snd_pcm_hw_params_free(params); - close_alsa_device(); - //exit(1); - return -2; + if (stream_type == SND_PCM_STREAM_PLAYBACK) + { + if (audio_outbuffer_size_in_frames <= 0) + audio_outbuffer_size_in_frames = 8000; + + size_b = audio_outbuffer_size_in_frames * no_of_channels_alsa * no_of_bytes_in_channel; + + rc = snd_pcm_hw_params_set_buffer_size(alsa_handle, params, DSP::NoOfAudioOutputBuffers*audio_outbuffer_size_in_frames); + + snd_pcm_uframes_t requested_audio_outbuffer_size_in_frames = audio_outbuffer_size_in_frames; + + if (rc < 0) + { + DSP::log << "Unable to set a buffer size with error code: " << rc << endl; + return -5; } - // make a copy of hardware parameters - snd_pcm_hw_params_malloc(&hw_params); - snd_pcm_hw_params_copy(hw_params, params); + + /*! Set period size to desired number of frames. */ + snd_pcm_hw_params_set_period_size_near(alsa_handle, params, &audio_outbuffer_size_in_frames, &dir); + + #ifdef AUDIO_DEBUG_MESSAGES_ON + if (audio_outbuffer_size_in_frames != requested_audio_outbuffer_size_in_frames) + { + DSP::log << "Current frames value should be equal: " << requested_audio_outbuffer_size_in_frames << endl; + DSP::log << "Frames is not equal to tmp_frames! Frames: " << audio_outbuffer_size_in_frames << endl; + } + + else + DSP::log << "Frames has been set correctly." << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON } - /* Display information about the PCM interface */ + else // stream_type == SND_PCM_STREAM_CAPTURE + { + if (audio_inbuffer_size_in_frames <= 0) + audio_inbuffer_size_in_frames = 8000; + + size_b = audio_inbuffer_size_in_frames * no_of_channels_alsa * no_of_bytes_in_channel; + + rc = snd_pcm_hw_params_set_buffer_size(alsa_handle, params, size_b); + + snd_pcm_uframes_t requested_audio_inbuffer_size_in_frames = audio_inbuffer_size_in_frames; + + if (rc < 0) + { + DSP::log << "Unable to set a buffer size with error code: " << rc << endl; + return -5; + } - DSP::log << "PCM handle name = '" << snd_pcm_name(alsa_handle) << "'" << endl; + /*! Set period size to desired number of frames. */ + snd_pcm_hw_params_set_period_size_near(alsa_handle, params, &audio_inbuffer_size_in_frames, &dir); - DSP::log << "PCM state = " << snd_pcm_state_name(snd_pcm_state(alsa_handle)) << endl; + #ifdef AUDIO_DEBUG_MESSAGES_ON + if (audio_inbuffer_size_in_frames != requested_audio_inbuffer_size_in_frames) + { + DSP::log << "Current frames value should be equal: " << requested_audio_inbuffer_size_in_frames << endl; + DSP::log << "Frames is not equal to tmp_frames! Frames: " << audio_inbuffer_size_in_frames << endl; + } - snd_pcm_hw_params_get_access(hw_params, (snd_pcm_access_t *) &val); - DSP::log << "access type = " << snd_pcm_access_name((snd_pcm_access_t)val) << endl; + else + DSP::log << "Frames has been set correctly." << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + } - snd_pcm_format_t format; - snd_pcm_hw_params_get_format(hw_params, &format); - DSP::log << "format = '" << snd_pcm_format_name(format) << "' " - << "(" << snd_pcm_format_description(format) << ")" << endl; + /* Write the parameters to the driver */ + rc = snd_pcm_hw_params(alsa_handle, params); - snd_pcm_hw_params_get_subformat(hw_params, (snd_pcm_subformat_t *)&val); - DSP::log << "subformat = '" << snd_pcm_subformat_name((snd_pcm_subformat_t)val) << "' " - << "(" << snd_pcm_subformat_description((snd_pcm_subformat_t)val) << ")" << endl; + if (rc < 0) + { + DSP::log << "Unable to set hw parameters: " << snd_strerror(rc) << endl; + DSP::log << "Closing ALSA device" << endl; - snd_pcm_hw_params_get_channels(hw_params, &val); - DSP::log << "channels = " << val << endl; + close_alsa_device(); + return -2; + } + /*! Make a copy of hardware parameters. */ + snd_pcm_hw_params_malloc(&hw_params); + snd_pcm_hw_params_copy(hw_params, params); + + // ============================================================= // + // Display information about the PCM interface. + // ============================================================= // + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "PCM handle name = '" << snd_pcm_name(alsa_handle) << "'" << endl; - snd_pcm_hw_params_get_rate(hw_params, &val, &dir); - DSP::log << "rate = " << val << " bps" << endl; + DSP::log << "PCM state = " << snd_pcm_state_name(snd_pcm_state(alsa_handle)) << endl; - snd_pcm_hw_params_get_period_time(hw_params, &val, &dir); - DSP::log << "period time = " << val << " us" << endl; + snd_pcm_hw_params_get_access(hw_params, (snd_pcm_access_t *) &val); + DSP::log << "access type = " << snd_pcm_access_name((snd_pcm_access_t)val) << endl; - snd_pcm_hw_params_get_period_size(hw_params, &frames, &dir); - DSP::log << "period size = " << (int) frames << " frames" << endl; + snd_pcm_format_t format; - snd_pcm_hw_params_get_buffer_time(hw_params, &val, &dir); - DSP::log << "buffer time = " << val << " us" << endl; + snd_pcm_hw_params_get_format(hw_params, &format); + DSP::log << "format = '" << snd_pcm_format_name(format) << "' " + << "(" << snd_pcm_format_description(format) << ")" << endl; - snd_pcm_hw_params_get_buffer_size(hw_params, (snd_pcm_uframes_t *) &val); - DSP::log << "buffer size = " << val << " frames" << endl; + snd_pcm_hw_params_get_subformat(hw_params, (snd_pcm_subformat_t *)&val); + DSP::log << "subformat = '" << snd_pcm_subformat_name((snd_pcm_subformat_t)val) << "' " + << "(" << snd_pcm_subformat_description((snd_pcm_subformat_t)val) << ")" << endl; + + snd_pcm_hw_params_get_channels(hw_params, &val); + DSP::log << "channels = " << val << endl; + + snd_pcm_hw_params_get_rate(hw_params, &val, &dir); + DSP::log << "rate = " << val << " bps" << endl; + + snd_pcm_hw_params_get_period_time(hw_params, &val, &dir); + DSP::log << "period time = " << val << " us" << endl; - snd_pcm_hw_params_get_periods(hw_params, &val, &dir); - DSP::log << "periods per buffer = " << val << " frames" << endl; + snd_pcm_hw_params_get_period_size(hw_params, (snd_pcm_uframes_t *)&val, &dir); + DSP::log << "period size = " << val << " frames" << endl; - snd_pcm_hw_params_get_rate_numden(hw_params, &val, &val2); - DSP::log << "exact rate = " << val << "/" << val2 << " bps" << endl; + snd_pcm_hw_params_get_buffer_time(hw_params, &val, &dir); + DSP::log << "buffer time = " << val << " us" << endl; + snd_pcm_hw_params_get_buffer_size(hw_params, (snd_pcm_uframes_t *) &val); + DSP::log << "buffer size = " << val << " frames" << endl; - val = snd_pcm_hw_params_get_sbits(hw_params); - DSP::log << "significant bits = " << val << endl; + snd_pcm_hw_params_get_periods(hw_params, &val, &dir); + DSP::log << "periods per buffer = " << val << " frames" << endl; - snd_pcm_hw_params_get_tick_time(hw_params, &val, &dir); // deprecated !!! - DSP::log << "tick time = " << val << " us" << endl; + snd_pcm_hw_params_get_rate_numden(hw_params, &val, &val2); + DSP::log << "exact rate = " << val << "/" << val2 << " bps" << endl; - val = snd_pcm_hw_params_is_batch(hw_params); - DSP::log << "is batch = " << val << endl; + val = snd_pcm_hw_params_get_sbits(hw_params); + DSP::log << "significant bits = " << val << endl; - val = snd_pcm_hw_params_is_block_transfer(hw_params); - DSP::log << "is block transfer = " << val << endl; + snd_pcm_hw_params_get_tick_time(hw_params, &val, &dir); // deprecated !!! + DSP::log << "tick time = " << val << " us" << endl; - val = snd_pcm_hw_params_is_double(hw_params); - DSP::log << "is double = " << val << endl; + val = snd_pcm_hw_params_is_batch(hw_params); + DSP::log << "is batch = " << val << endl; - val = snd_pcm_hw_params_is_half_duplex(hw_params); - DSP::log << "is half duplex = " << val << endl; + val = snd_pcm_hw_params_is_block_transfer(hw_params); + DSP::log << "is block transfer = " << val << endl; - val = snd_pcm_hw_params_is_joint_duplex(hw_params); - DSP::log <<"is joint duplex = " << val << endl; + val = snd_pcm_hw_params_is_double(hw_params); + DSP::log << "is double = " << val << endl; - val = snd_pcm_hw_params_can_overrange(hw_params); - DSP::log << "can overrange = " << val << endl; + val = snd_pcm_hw_params_is_half_duplex(hw_params); + DSP::log << "is half duplex = " << val << endl; - val = snd_pcm_hw_params_can_mmap_sample_resolution(hw_params); - DSP::log << "can mmap = " << val << endl; + val = snd_pcm_hw_params_is_joint_duplex(hw_params); + DSP::log <<"is joint duplex = " << val << endl; - val = snd_pcm_hw_params_can_pause(hw_params); - DSP::log << "can pause = " << val << endl; + val = snd_pcm_hw_params_can_overrange(hw_params); + DSP::log << "can overrange = " << val << endl; - val = snd_pcm_hw_params_can_resume(hw_params); - DSP::log << "can resume = " << val << endl; + val = snd_pcm_hw_params_can_mmap_sample_resolution(hw_params); + DSP::log << "can mmap = " << val << endl; - val = snd_pcm_hw_params_can_sync_start(hw_params); - DSP::log << "can sync start = " << val << endl; + val = snd_pcm_hw_params_can_pause(hw_params); + DSP::log << "can pause = " << val << endl; - //snd_pcm_hw_params_free(params); -// There are two ways of allocating such structures: -//1) Use snd_xxx_malloc() and snd_xxx_free() to allocate memory from the -//heap, or -//2) use snd_xxx_alloca() to allocate memory from the stack. -// -//The snd_xxx_alloca() functions behave just like alloca(): their memory -//is automatically freed when the function returns. + val = snd_pcm_hw_params_can_resume(hw_params); + DSP::log << "can resume = " << val << endl; - return 1; -} + val = snd_pcm_hw_params_can_sync_start(hw_params); + DSP::log << "can sync start = " << val << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON -void DSP::ALSA_object_t::get_period_size(snd_pcm_uframes_t &frames, unsigned int &period_time) { - int dir; + // snd_pcm_hw_params_free(params); + // There are two ways of allocating such structures: + // 1) Use snd_xxx_malloc() and snd_xxx_free() to allocate memory from the + // heap, or + // 2) use snd_xxx_alloca() to allocate memory from the stack. + + // The snd_xxx_alloca() functions behave just like alloca(): their memory + // is automatically freed when the function returns. - // snd_pcm_hw_params_current() // Retreive current PCM hardware configuration chosen with snd_pcm_hw_params. - //snd_pcm_hw_params_current(alsa_handle, hw_params); + // snd_pcm_hw_params_current() // Retreive current PCM hardware configuration chosen with snd_pcm_hw_params. + // snd_pcm_hw_params_current(alsa_handle, hw_params); // https://www.alsa-project.org/wiki/FramesPeriods // frame - size of sample in byts // A period is the number of frames in between each hardware interrupt - /* Use a buffer large enough to hold one period */ - snd_pcm_hw_params_get_period_size(hw_params, &frames, &dir); + /*! Use a buffer large enough to hold one period */ + + // Can be useful: + // snd_pcm_hw_params_get_period_size(hw_params, &frames, &dir); + + if (stream_type == SND_PCM_STREAM_PLAYBACK) + { + pcm_buffer.resize(DSP::NoOfAudioOutputBuffers); + pcm_buffer_size_in_frames.resize(DSP::NoOfAudioOutputBuffers); + + switch (no_of_bytes_in_channel) + { + case 1: + buffers_8bit.resize(DSP::NoOfAudioOutputBuffers); + + for(unsigned int ind = 0; ind < DSP::NoOfAudioOutputBuffers; ind++) + { + buffers_8bit[ind].resize(size_b / no_of_bytes_in_channel); + pcm_buffer[ind] = (uint8_t *)(buffers_8bit[ind].data()); + pcm_buffer_size_in_frames[ind] = (snd_pcm_sframes_t) buffers_8bit[ind].size() / no_of_channels_alsa; + } + break; + + case 2: + buffers_16bit.resize(DSP::NoOfAudioOutputBuffers); + + for(unsigned int ind = 0; ind < DSP::NoOfAudioOutputBuffers; ind++) + { + buffers_16bit[ind].resize(size_b / no_of_bytes_in_channel); + pcm_buffer[ind] = (uint8_t *)(buffers_16bit[ind].data()); + pcm_buffer_size_in_frames[ind] = (snd_pcm_sframes_t) buffers_16bit[ind].size() / no_of_channels_alsa; + } + break; + + case 3: + case 4: + if (IsHigherQualityMode) + { + buffers_32bit.resize(DSP::NoOfAudioOutputBuffers); + + for(unsigned int ind = 0; ind < DSP::NoOfAudioOutputBuffers; ind++) + { + buffers_32bit[ind].resize(size_b / no_of_bytes_in_channel); + pcm_buffer[ind] = (uint8_t *)(buffers_32bit[ind].data()); + pcm_buffer_size_in_frames[ind] = (snd_pcm_sframes_t) buffers_32bit[ind].size() / no_of_channels_alsa; + } + } + + else //! native mode + { + buffers_32bit_f.resize(DSP::NoOfAudioOutputBuffers); + + for(unsigned int ind = 0; ind < DSP::NoOfAudioOutputBuffers; ind++) + { + buffers_32bit_f[ind].resize(size_b / no_of_bytes_in_channel); + pcm_buffer[ind] = (uint8_t *)(buffers_32bit_f[ind].data()); + pcm_buffer_size_in_frames[ind] = (snd_pcm_sframes_t) buffers_32bit_f[ind].size() / no_of_channels_alsa; + } + } + break; + + case 8: + buffers_64bit.resize(DSP::NoOfAudioOutputBuffers); + + for(unsigned int ind = 0; ind < DSP::NoOfAudioOutputBuffers; ind++) + { + buffers_64bit[ind].resize(size_b / no_of_bytes_in_channel); + pcm_buffer[ind] = (uint8_t *)(buffers_64bit[ind].data()); + pcm_buffer_size_in_frames[ind] = (snd_pcm_sframes_t) buffers_64bit[ind].size() / no_of_channels_alsa; + } + break; + + default: + DSP::log << "Unsupported no of bytes in channel" << endl; + return -6; + break; + } + } + else // (stream_type == SND_PCM_STREAM_CAPTURE) + { + pcm_buffer.resize(1); + pcm_buffer_size_in_frames.resize(1); + + capture_buffer.resize(size_b); + + for(unsigned int ind = 0; ind < pcm_buffer.size(); ind++) + { + pcm_buffer[ind] = (uint8_t *)(capture_buffer.data()); + pcm_buffer_size_in_frames[ind] = (snd_pcm_sframes_t) capture_buffer.size() / no_of_bytes_in_channel / no_of_channels_alsa; + } + + switch (no_of_bytes_in_channel) + { + case 1: + InSampleTypeALSA = DSP::e::SampleType::ST_uchar; + break; + + case 2: + InSampleTypeALSA = DSP::e::SampleType::ST_short; + break; + + case 3: + InSampleTypeALSA = DSP::e::SampleType::ST_int; + break; + + case 4: + if (IsHigherQualityMode) + InSampleTypeALSA = DSP::e::SampleType::ST_int; + else + InSampleTypeALSA = DSP::e::SampleType::ST_float; + break; + + case 8: + InSampleTypeALSA = DSP::e::SampleType::ST_double; + break; + + default: + DSP::log << "Unsupported no of bytes in channel" << endl; + return -9; + break; + } + } + + if (non_blocking_mode == false) + { + rc = snd_pcm_nonblock(alsa_handle, 0); + + if (rc < 0) + { + DSP::log << "Unable to set blocking mode" << endl; + return -7; + } + } + + else + { + rc = snd_pcm_nonblock(alsa_handle, 1); + + if (rc < 0) + { + DSP::log << "Unable to set non blocking mode" << endl; + return -8; + } + } - /* We want to loop for 5 seconds */ - snd_pcm_hw_params_get_period_time(hw_params, &period_time, &dir); + return 1; } -long DSP::ALSA_object_t::open_PCM_device_4_output(const int &no_of_channels, int no_of_bits, const long &sampling_rate, const long &audio_outbuffer_size) { - assert(!"DSP::ALSA_object_t::open_PCM_device_4_output not implemented yet"); +int DSP::ALSA_object_t::set_snd_pcm_format(snd_pcm_hw_params_t *params) +{ + int errc; + + switch (no_of_bytes_in_channel) + { + case 1: + /*! Signed 8-bit format */ + errc = snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_U8); + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "Format set with error code: " << errc << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + break; + + case 2: + if (IsLittleEndian == false) + { + /*! Signed 16-bit big-endian format */ + errc = snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_S16_BE); + } + + else + { + /*! Signed 16-bit little-endian format */ + errc = snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_S16_LE); + } + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "Format set with error code: " << errc << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + break; + + case 3: // 32-bits buffer can be used + if (IsLittleEndian == false) + { + /*! Signed 24-bit big-endian low three bytes in 32-bit word format */ + errc = snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_S32_BE); + } + + else + { + /*! Signed 24-bit little-endian low three bytes in 32-bit word format */ + errc = snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_S32_LE); + } + + IsHigherQualityMode = true; + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "Format set with error code: " << errc << std::endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + break; + + case 4: + if (IsLittleEndian == false) + { + /*! Float Little Endian, Range -1.0 to 1.0 */ + errc = snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_FLOAT_BE); + + IsHigherQualityMode = false; // native + + if (errc < 0) + { + /*! Signed 32-bit little-endian format */ + errc = snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_S32_BE); + + IsHigherQualityMode = true; + } + } + + else + { + /*! Float Little Endian, Range -1.0 to 1.0 */ + errc = snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_FLOAT_LE); + + IsHigherQualityMode = false; // native + + if(errc < 0) + { + /*! Signed 32-bit little-endian format */ + errc = snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_S32_LE); + + IsHigherQualityMode = true; + } + } + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "Format set with error code: " << errc << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + break; + + case 8: + if (IsLittleEndian == false) + { + /*! Float Big Endian, Range -1.0 to 1.0 */ + errc = snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_FLOAT64_BE); + } + + else + { + /*! Float Little Endian, Range -1.0 to 1.0 */ + errc = snd_pcm_hw_params_set_format(alsa_handle, params, SND_PCM_FORMAT_FLOAT64_LE); + } + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "Format set with error code: " << errc << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + break; + + default: + DSP::log << "Unsupported no of bytes in channel" << endl; + return -1; + break; + } + + return errc; } -long DSP::ALSA_object_t::open_PCM_device_4_input(const int &no_of_channels, int no_of_bits, const long &sampling_rate, const long &audio_inbuffer_size) { - assert(!"DSP::ALSA_object_t::open_PCM_device_4_input not implemented yet"); +long DSP::ALSA_object_t::open_PCM_device_4_output(const int &no_of_channels, int no_of_bits, const long &sampling_rate, const long &audio_outbuffer_size) +{ + int rc; + + no_of_channels_alsa = (unsigned int) no_of_channels; + no_of_bytes_in_channel = (unsigned int) no_of_bits / 8; + sampling_rate_alsa = (unsigned int) sampling_rate; + audio_outbuffer_size_in_frames = (snd_pcm_uframes_t) audio_outbuffer_size; + + rc = open_alsa_device(SND_PCM_STREAM_PLAYBACK); + + if(rc > 0) + { + IsDeviceOutputOpen = true; + return (long) sampling_rate_alsa; + } + + else + { + DSP::log << "Device has not been opened. Error code: " << rc << endl; + return -1; + } } -long DSP::ALSA_object_t::append_playback_buffer(DSP::Float_vector &float_buffer) { - assert(!"DSP::ALSA_object_t::append_playback_buffer not implemented yet"); +long DSP::ALSA_object_t::open_PCM_device_4_input(const int &no_of_channels, int no_of_bits, const long &sampling_rate, const long &audio_inbuffer_size) +{ + int rc; + + no_of_channels_alsa = (unsigned int) no_of_channels; + no_of_bytes_in_channel = (unsigned int) no_of_bits / 8; + sampling_rate_alsa = (unsigned int) sampling_rate; + audio_inbuffer_size_in_frames = (snd_pcm_uframes_t) audio_inbuffer_size; + + rc = open_alsa_device(SND_PCM_STREAM_CAPTURE); + + if(rc > 0) + { + IsDeviceInputOpen = true; + return (long) sampling_rate_alsa; + } + else + { + DSP::log << "Device has not been opened. Error code: " << rc << endl; + return -1; + } } -bool DSP::ALSA_object_t::close_PCM_device_input(void) { - assert(!"DSP::ALSA_object_t::close_PCM_device_input not implemented yet"); +long DSP::ALSA_object_t::append_playback_buffer(DSP::Float_vector &float_buffer) +{ + snd_pcm_sframes_t rc = -1; + + while (1) + { + if (rc < 0) + { + // Regulation of sample values in case of exceeding the range [-1, 1] + for (unsigned int m = 0; m < float_buffer.size(); m++) + { + if (float_buffer[m] < -1) + float_buffer[m] = -1; + + else if (float_buffer[m] > 1) + float_buffer[m] = 1; + } + + // Converts samples format to the one suitable for the audio device + switch (no_of_bytes_in_channel) + { + case 1: + for (unsigned int n = 0; n < size_b / no_of_bytes_in_channel / no_of_channels_alsa; n++) + { + buffers_8bit[NextBufferOutInd][no_of_channels_alsa * n] = uint8_t(128 + 127 * float_buffer[no_of_channels_alsa * n]); + if (no_of_channels_alsa == 2) + buffers_8bit[NextBufferOutInd][no_of_channels_alsa * n + 1] = uint8_t(128 + 127 * float_buffer[no_of_channels_alsa * n + 1]); + } + break; + + case 2: + for (unsigned int n = 0; n < size_b / no_of_bytes_in_channel / no_of_channels_alsa; n++) + { + buffers_16bit[NextBufferOutInd][no_of_channels_alsa * n] = int16_t(INT16_MAX * float_buffer[no_of_channels_alsa * n]); + if (no_of_channels_alsa == 2) + buffers_16bit[NextBufferOutInd][no_of_channels_alsa * n + 1] = int16_t(INT16_MAX * float_buffer[no_of_channels_alsa * n + 1]); + } + break; + + case 3: + for (unsigned int n = 0; n < size_b / no_of_bytes_in_channel / no_of_channels_alsa; n++) + { + buffers_32bit[NextBufferOutInd][no_of_channels_alsa * n] = int32_t(INT32_MAX * float_buffer[no_of_channels_alsa * n]); + if (no_of_channels_alsa == 2) + buffers_32bit[NextBufferOutInd][no_of_channels_alsa * n + 1] = int32_t(INT32_MAX * float_buffer[no_of_channels_alsa * n + 1]); + } + break; + + case 4: + for (unsigned int n = 0; n < size_b / no_of_bytes_in_channel / no_of_channels_alsa; n++) + { + if (IsHigherQualityMode) + { + buffers_32bit[NextBufferOutInd][no_of_channels_alsa * n] = int32_t(INT32_MAX * float_buffer[no_of_channels_alsa * n]); + if (no_of_channels_alsa == 2) + buffers_32bit[NextBufferOutInd][no_of_channels_alsa * n + 1] = int32_t(INT32_MAX * float_buffer[no_of_channels_alsa * n + 1]); + + } + + else + { + buffers_32bit_f[NextBufferOutInd][no_of_channels_alsa * n] = float_buffer[no_of_channels_alsa * n]; + if (no_of_channels_alsa == 2) + buffers_32bit_f[NextBufferOutInd][no_of_channels_alsa * n + 1] = float_buffer[no_of_channels_alsa * n + 1]; + + } + } + break; + + case 8: + for (unsigned int n = 0; n < size_b / no_of_bytes_in_channel / no_of_channels_alsa; n++) + { + buffers_64bit[NextBufferOutInd][no_of_channels_alsa * n] = float_buffer[no_of_channels_alsa * n]; + if (no_of_channels_alsa == 2) + buffers_64bit[NextBufferOutInd][no_of_channels_alsa * n + 1] = float_buffer[no_of_channels_alsa * n + 1]; + + } + break; + + default: + DSP::log << "Unsupported no of bytes in channel" << endl; + break; + + // converting samples ends + } + + if (IsPlayingNow == false) + { + if (NextBufferOutInd == DSP::NoOfAudioOutputBuffers - 2) //all but one spare buffer are filled up + { + snd_pcm_prepare(alsa_handle); // solves underrun problem after filling ALSA buffer + + // send all data from buffers to soundcard to start playback + for (unsigned int ind = 0; ind < DSP::NoOfAudioOutputBuffers - 1; ind++) //one spare buffer + { + rc = DSP::ALSA_object_t::pcm_writei(pcm_buffer[ind], pcm_buffer_size_in_frames[ind]); + } + + IsPlayingNow = true; + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "IsPlayingNow set to true" << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + } + } + + else + rc = DSP::ALSA_object_t::pcm_writei(pcm_buffer[NextBufferOutInd], pcm_buffer_size_in_frames[NextBufferOutInd]); + + NextBufferOutInd++; + NextBufferOutInd %= DSP::NoOfAudioOutputBuffers; + + break; + } + + else + { + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "DSP::ALSA_object_t::append_playback_buffer error code is positive. Nothing to play." << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + + DSP::f::Sleep(0); + IsPlayingNow = false; + } + // end of the main loop + } + + return pcm_buffer_size_in_frames[NextBufferOutInd]; +} + +bool DSP::ALSA_object_t::close_PCM_device_input(void) +{ close_alsa_device(true); return true; } -bool DSP::ALSA_object_t::close_PCM_device_output(bool do_drain) { - assert(!"DSP::ALSA_object_t::close_PCM_device_output not implemented yet"); +bool DSP::ALSA_object_t::close_PCM_device_output(const bool &do_drain) +{ + stop_playback(); // just to be sure that all prepared buffershave been sent to sound card + close_alsa_device(do_drain); + return true; } -bool DSP::ALSA_object_t::is_device_playing(void) { - assert(!"DSP::ALSA_object_t::is_device_playing not implemented yet"); - return false; +bool DSP::ALSA_object_t::is_device_playing(void) +{ + return IsPlayingNow; } -bool DSP::ALSA_object_t::is_device_recording(void) { - assert(!"DSP::ALSA_object_t::is_device_recording not implemented yet"); - return false; +bool DSP::ALSA_object_t::is_device_recording(void) +{ + return IsRecordingNow; } -bool DSP::ALSA_object_t::stop_playback(void) { - assert(!"DSP::ALSA_object_t::stop_playback not implemented yet"); +bool DSP::ALSA_object_t::stop_playback(void) +{ + StopPlayback = true; + + snd_pcm_sframes_t rc; + snd_pcm_sframes_t buffer_size_in_frames; + + // if there are still buffers that haven't been yet sent to sound card then do it now + if (IsPlayingNow == false) + { + if (NextBufferOutInd > 0) // anything is in the buffer + { + // processing was too short so the playback haven't started yet + // send data stored in buffers to the sound card before closing the device + snd_pcm_prepare(alsa_handle); + + // send all data from buffers to soundcard to start playback + for (unsigned int ind = 0; ind < NextBufferOutInd; ind++) //one spare buffer + { + buffer_size_in_frames = pcm_buffer_size_in_frames[ind]; + rc = DSP::ALSA_object_t::pcm_writei(pcm_buffer[ind], buffer_size_in_frames); + } + if (rc > 0) + IsPlayingNow = true; + } + } + + return true; } -bool DSP::ALSA_object_t::stop_recording(void) { - assert(!"DSP::ALSA_object_t::stop_recording not implemented yet"); +bool DSP::ALSA_object_t::stop_recording(void) +{ + StopRecording = true; + return true; } -bool DSP::ALSA_object_t::start_recording(void) { - assert(!"DSP::ALSA_object_t::stop_recording not implemented yet"); +bool DSP::ALSA_object_t::start_recording(void) +{ + IsRecordingNow = true; + return true; } -bool DSP::ALSA_object_t::get_wave_in_raw_buffer(DSP::e::SampleType &InSampleType, std::vector<char> &wave_in_raw_buffer) { - assert(!"DSP::ALSA_object_t::get_wave_in_raw_buffer not implemented yet"); +bool DSP::ALSA_object_t::get_wave_in_raw_buffer(DSP::e::SampleType &InSampleType, std::vector<char> &wave_in_raw_buffer) +{ + InSampleType = this->InSampleTypeALSA; + + snd_pcm_sframes_t rc; + + for (unsigned int ind = 0; ind < pcm_buffer.size(); ind++) + { + while (pcm_buffer_size_in_frames[ind]) + { + rc = snd_pcm_readi(alsa_handle, pcm_buffer[ind], pcm_buffer_size_in_frames[ind]); + + switch (-rc) + { + case EPIPE: + + #ifdef AUDIO_DEBUG_MESSAGES_ON + // EPIPE means underrun + DSP::log << "Underrun occurred" << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + + snd_pcm_prepare(alsa_handle); + break; + + case EAGAIN: + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "EAGAIN occurred. Waiting for a free buffer." << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + + DSP::f::Sleep(0); + break; + + default: + if (rc > 0) + { + pcm_buffer_size_in_frames[ind] -= rc; + pcm_buffer[ind] += rc * no_of_channels_alsa * no_of_bytes_in_channel; + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "Short read. Current rc = " << rc << "." << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + + if (pcm_buffer_size_in_frames[ind] == 0) + { + wave_in_raw_buffer.resize(capture_buffer.size()); + std::swap(wave_in_raw_buffer, capture_buffer); + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "Inbuffer is full." << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + + pcm_buffer[ind] = (uint8_t *)(capture_buffer.data()); + pcm_buffer_size_in_frames[ind] = (snd_pcm_sframes_t) capture_buffer.size() / no_of_bytes_in_channel / no_of_channels_alsa; + + return true; + } + } + + else + { + #ifdef AUDIO_DEBUG_MESSAGES_ON + // EPIPE means underrun + DSP::log << "Unsupported error." << endl; + DSP::log << "Error from readi: " << snd_strerror(rc) << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + + pcm_buffer_size_in_frames[ind] = 0; + return false; + } + break; + } + } + } + return false; } -snd_pcm_sframes_t DSP::ALSA_object_t::pcm_writei(const void *buffer, snd_pcm_uframes_t &frames) { - snd_pcm_sframes_t rc = snd_pcm_writei(alsa_handle, buffer, frames); - if (rc == -EPIPE) { - /* EPIPE means underrun */ - fprintf(stderr, "underrun occurred\n"); - snd_pcm_prepare(alsa_handle); - } else if (rc < 0) { - fprintf(stderr, - "error from writei: %s\n", - snd_strerror(int(rc))); - } else if (rc != (int)frames) { - fprintf(stderr, - "short write, write %d frames\n", int(rc)); +snd_pcm_sframes_t DSP::ALSA_object_t::pcm_writei(const void *buffer, const snd_pcm_uframes_t &frames) +{ + snd_pcm_sframes_t rc; + snd_pcm_sframes_t buffer_size_in_frames = frames; + uint8_t* current_buffer = (uint8_t*) buffer; + + while (buffer_size_in_frames > 0) + { + rc = snd_pcm_writei(alsa_handle, current_buffer, buffer_size_in_frames); + + switch (-rc) + { + case EAGAIN: + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "EAGAIN occurred. Waiting for a free buffer." << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + //! \TODO M.B. In the future snd_pcm_status_get_avail / snd_pcm_avail_update could be used to select sleep time + DSP::f::Sleep(0); + break; + + case EPIPE: + #ifdef AUDIO_DEBUG_MESSAGES_ON + // EPIPE means underrun + DSP::log << "Underrun occurred" << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + + snd_pcm_prepare(alsa_handle); + //! \TODO snd_pcm_sw_params_set_start_threshold() : implement this solution (consider setting threshold to 1 so the sound playback will start without delay) + break; + + default: + if (rc > 0) + { + buffer_size_in_frames -= rc; + current_buffer += rc * no_of_channels_alsa * no_of_bytes_in_channel; + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "Short write. Current rc = " << rc << "." << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + } + + else + { + #ifdef AUDIO_DEBUG_MESSAGES_ON + // EPIPE means underrun + DSP::log << "Unsupported error." << endl; + DSP::log << "Error from writei: " << snd_strerror(rc) << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + + buffer_size_in_frames = 0; + } + break; + } } + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "The end of the playback" << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + return rc; } -void DSP::ALSA_object_t::close_alsa_device(bool do_drain, bool use_log) { - if (alsa_handle != NULL) { - if (do_drain == true) { +void DSP::ALSA_object_t::close_alsa_device(bool do_drain, bool use_log) +{ + if (alsa_handle != NULL) + { + if (do_drain == true) + { snd_pcm_drain(alsa_handle); } + + #ifdef AUDIO_DEBUG_MESSAGES_ON + DSP::log << "Closing the PCM device." << endl; + #endif // AUDIO_DEBUG_MESSAGES_ON + snd_pcm_close(alsa_handle); alsa_handle = NULL; - if (hw_params != NULL){ + if (hw_params != NULL) + { snd_pcm_hw_params_free(hw_params); hw_params = NULL; } } - if (use_log == true) { - DSP::log << "ALSA PCM sound closed" << endl; - } -} - - - + if (use_log == true) + { + DSP::log << "ALSA PCM sound closed." << endl; + } + IsDeviceInputOpen = false; + IsDeviceOutputOpen = false; +} diff --git a/src/cpp/DSP_IO.cpp b/src/cpp/DSP_IO.cpp index 504ae84cd0d49e7245e6436c9f3afa2939d1334e..328255b13f8229b13998ce2e4e35ab2d00fe573b 100644 --- a/src/cpp/DSP_IO.cpp +++ b/src/cpp/DSP_IO.cpp @@ -656,11 +656,11 @@ bool DSP::u::FileInput::CloseFile(void) //! needed to get function DSP::u::FileInput::GetHeader instances into library void dummy_GetHeader(void) { - DSP::u::FileInput *temp = NULL; + DSP::u::FileInput temp(NULL, ""); - temp->GetHeader<DSP::T_TAPE_header>(); - temp->GetHeader<DSP::T_FLT_header>(); - temp->GetHeader<DSP::T_WAVEchunk>(); + temp.GetHeader<DSP::T_TAPE_header>(); + temp.GetHeader<DSP::T_FLT_header>(); + temp.GetHeader<DSP::T_WAVEchunk>(); } template <class T> @@ -3995,6 +3995,28 @@ bool DSP::u::AudioInput::SOUND_object_callback(const DSP::e::SampleType &InSampl DSP::Float_ptr Sample; unsigned int ind; +#ifdef __DEBUG__ + switch (InSampleType) { + case DSP::e::SampleType::ST_short: { + if (InBufferLen != wave_in_raw_buffer.size() / sizeof(short)) { + DSP::log << "DSP::u::AudioInput::SOUND_object_callback" << DSP::e::LogMode::second << "incorrect wave_in_raw_buffer size: " << + wave_in_raw_buffer.size() << " instead of " << InBufferLen * sizeof(short) << endl; + } + } + break; + case DSP::e::SampleType::ST_uchar: { + if (InBufferLen != wave_in_raw_buffer.size() / sizeof(uint8_t)) { + DSP::log << "DSP::u::AudioInput::SOUND_object_callback" << DSP::e::LogMode::second << "incorrect wave_in_raw_buffer size: " << + wave_in_raw_buffer.size() << " instead of " << InBufferLen * sizeof(uint8_t) << endl; + } + } + break; + default: + DSP::log << "DSP::u::AudioInput::SOUND_object_callback" << DSP::e::LogMode::second << "Unsupported Current->InSampleType" << endl; + break; + } +#endif // __DEBUG__ + // reading sound card input buffer Sample=InBuffers[EmptyBufferIndex].data(); // ************************************************** // @@ -4028,7 +4050,7 @@ bool DSP::u::AudioInput::SOUND_object_callback(const DSP::e::SampleType &InSampl default: #ifdef __DEBUG__ - DSP::log << "DSP::u::AudioInput::waveInProc_short" << DSP::e::LogMode::second << "Unsupported Current->InSampleType" << endl; + DSP::log << "DSP::u::AudioInput::SOUND_object_callback" << DSP::e::LogMode::second << "Unsupported Current->InSampleType" << endl; #endif break; } diff --git a/src/cpp/WMM_support.cpp b/src/cpp/WMM_support.cpp index cba5f89939bd8173a829c01c5037d815301b26a3..44042e5b953d4ee6a1b301d757602056286ecbd1 100644 --- a/src/cpp/WMM_support.cpp +++ b/src/cpp/WMM_support.cpp @@ -618,7 +618,7 @@ long DSP::WMM_object_t::append_playback_buffer(DSP::Float_vector &float_buffer) if (NextBufferOutInd == DSP::NoOfAudioOutputBuffers - 2) //all but one spare buffer are filled up { // send all data from buffers to soundcard to start playback for (ind=0; ind < DSP::NoOfAudioOutputBuffers-1; ind++) //one spare buffer - { + { // send all data from buffers to soundcard to start playback result=waveOutWrite(hWaveOut, &(waveHeaderOut[ind]), sizeof(WAVEHDR)); DSP::f::AudioCheckError(result); diff --git a/src/include/ALSA_support.h b/src/include/ALSA_support.h index 5d413b71ab2a9da391fb64790c6e74c1ec2d099b..2c5c734bfdf75b6525583cfecf41755e1af15799 100644 --- a/src/include/ALSA_support.h +++ b/src/include/ALSA_support.h @@ -1,7 +1,7 @@ /*! \file ALSA_support.h * ALSA support header file * - * \author Marek Blok + * \authors Damian KaraĹ, Marek Blok */ //--------------------------------------------------------------------------- #ifndef ALSA_support_H @@ -12,51 +12,143 @@ /* All of the ALSA library API is defined in this header */ #include <alsa/asoundlib.h> - +#include <vector> +#include <cmath> #include <DSP_types.h> // for types namespace DSP { class ALSA_object_t : public DSP::SOUND_object_t { private: + //! PCM device handler snd_pcm_t *alsa_handle; + //! copy of set configuration space handler snd_pcm_hw_params_t *hw_params; - //! open default PCM device and return 1 on success or negative error code - /*! stream_type = SND_PCM_STREAM_PLAYBACK or SND_PCM_STREAM_CAPTURE + //! stores pointers to audio buffers + std::vector<uint8_t *> pcm_buffer; + //! stores size of audio buffers + std::vector<snd_pcm_sframes_t> pcm_buffer_size_in_frames; + + //! output device number used in next open operations + unsigned int OutDevNo; + //! input device number used in next open operations + unsigned int InDevNo; + + //! keeping track of which outbuffer is currently being filled + unsigned int NextBufferOutInd; + + //! sampling rate + unsigned int sampling_rate_alsa; + //! number of channels + unsigned int no_of_channels_alsa; + //! number of bytes in channel + unsigned int no_of_bytes_in_channel; + + /*! + It is better to use STD containers - they are more convenient, + and they mean fewer problems with memory leaks. */ - int open_alsa_device(snd_pcm_stream_t stream_type, int no_of_channels, unsigned int &sampling_rate); + //! outbuffers depending on samples type + std::vector<std::vector<uint8_t>> buffers_8bit; + std::vector<std::vector<int16_t>> buffers_16bit; + std::vector<std::vector<int32_t>> buffers_32bit; + std::vector<std::vector<float>> buffers_32bit_f; + std::vector<std::vector<double>> buffers_64bit; + + //! inbuffer + std::vector<char> capture_buffer; + + //! samples have integer values instead of float ones + bool IsHigherQualityMode; + + //! CPU architecture - endianness + bool IsLittleEndian; + + //! Is the PCM device opened for recording? + bool IsDeviceInputOpen; + //! Is the PCM device opened for playback? + bool IsDeviceOutputOpen; + + //! Has playback already started? + bool IsPlayingNow; + //! Is playback stopped? + bool StopPlayback; + + //! Has recording already started? + bool StopRecording; + //! Has recording already started? + bool IsRecordingNow; + + //! audio inbuffer size in samples + snd_pcm_uframes_t audio_inbuffer_size_in_frames; + //! audio outbuffer size in samples + snd_pcm_uframes_t audio_outbuffer_size_in_frames; + + //! type of samples in WaveInBuffers + DSP::e::SampleType InSampleTypeALSA; + + //! We always use the non-blocking mode in DSPElib + bool non_blocking_mode; + + //! buffer capacity + int size_b; + + /*! Open default PCM device and return 1 on success or negative error code + stream_type = SND_PCM_STREAM_PLAYBACK or SND_PCM_STREAM_CAPTURE + the rest of the parameters are set in the class + */ + int open_alsa_device(snd_pcm_stream_t stream_type); + //! Close opened PCM device void close_alsa_device(bool do_drain = false, bool use_log = false); - void get_period_size(snd_pcm_uframes_t &frames, unsigned int &period_time); - snd_pcm_sframes_t pcm_writei(const void *buffer, snd_pcm_uframes_t &frames); + //void get_period_size(snd_pcm_uframes_t &frames, unsigned int &period_time); + + //! playback + snd_pcm_sframes_t pcm_writei(const void *buffer, const snd_pcm_uframes_t &frames); // M.B. this will be more transparent + + //! Set SND PCM format depending on no of bytes in channel and CPU endianness + int set_snd_pcm_format(snd_pcm_hw_params_t *params); public: - //! log basic ALSA information + //! Log basic ALSA information void log_driver_data(); + //! Select the desired device from the interface for recording unsigned int select_input_device_by_number(const unsigned int &device_number=UINT_MAX); + //! Select the desired device from the interface for playback unsigned int select_output_device_by_number(const unsigned int &device_number=UINT_MAX); + //! Open PCM device for playback long open_PCM_device_4_output(const int &no_of_channels, int no_of_bits, const long &sampling_rate, const long &audio_outbuffer_size = -1); + //! Open PCM device for recording long open_PCM_device_4_input(const int &no_of_channels, int no_of_bits, const long &sampling_rate, const long &audio_inbuffer_size = -1); + + //! Closes PCM device from recording bool close_PCM_device_input(void); + //! Closes PCM device from playback bool close_PCM_device_output(const bool &do_drain); - //! returns true is the playback is on + //! Returns true is the playback is on bool is_device_playing(void); - //! initializes playback stopping + + //! Initializes playback stopping bool stop_playback(void); - //! returns true is the sound capture is on + + //! Returns true is the sound capture is on bool is_device_recording(void); - //! returns true is the sound capture is on + + //! Returns true is the sound capture is on bool stop_recording(void); //! \note values stored in float_buffer might be altered long append_playback_buffer(DSP::Float_vector &float_buffer); + //! Starts sound capture bool start_recording(void); + + //! For sound capture bool get_wave_in_raw_buffer(DSP::e::SampleType &InSampleType, std::vector<char> &wave_in_raw_buffer); //! Returns false if callbacks are not supported of recording @@ -65,8 +157,9 @@ namespace DSP { //! Returns false if callbacks are not supported of playback bool is_output_callback_supported(void); - //! object constructor + //! ALSA_obcject_t class constructor ALSA_object_t(); + //! ALSA_obcject_t class destructor ~ALSA_object_t(); }; diff --git a/src/include/DSP_types.h b/src/include/DSP_types.h index a434110ba8b0bc60ff8c81a97b42b9df3002e8d4..5f2cb5e2ef4b7fb2ae75a27d02fc0fae46b964bd 100644 --- a/src/include/DSP_types.h +++ b/src/include/DSP_types.h @@ -569,17 +569,11 @@ namespace DSP { virtual unsigned int select_output_device_by_number(const unsigned int &device_number=UINT_MAX) = 0; //! audio_outbuffer_size is in samples (note that, for example, sample for 16bit stereo is represented by 4bytes) - /*! On success returns actual sampling rate of the opened device - * On fail returen -1; - */ virtual long open_PCM_device_4_output(const int &no_of_channels, int no_of_bits, const long &sampling_rate, const long &audio_outbuffer_size = -1) = 0; //! audio_inbuffer_size is in samples (note that, for example, sample for 16bit stereo is represented by 4bytes) - /*! On success returns actual sampling rate of the opened device. - * On fail returen -1; - */ virtual long open_PCM_device_4_input(const int &no_of_channels, int no_of_bits, const long &sampling_rate, const long &audio_inbuffer_size = -1) = 0; virtual bool close_PCM_device_input(void) = 0; - //! close sound card output + //! close sound card output /*! if do_drain == true wait until sound card stops playing */ virtual bool close_PCM_device_output(const bool &do_drain) = 0; @@ -596,10 +590,10 @@ namespace DSP { virtual bool stop_recording(void) = 0; /*! Appends data to audio buffers and sends data to sound card is buffer is full. - * The class implementation should provide DSP::NoOfAudioOutputBuffers buffers with space for audio_outbuffer_size sample each. + * The class implementation should provide at least DSP::NoOfAudioOutputBuffers buffers with space for audio_outbuffer_size sample each. * When sound is playing then if the function call results in filling the buffer (or buffers) * all full buffers should be sent to the sound card. - * When sound has not stated playing yet then full buffers should be sent to the sound card only when + * When sound has not stated playing yest then full buffers sould be sent to the sound card only when * DSP::NoOfAudioOutputBuffers-1 buffers are filled. This prevents sound staterring and leaves one spare buffer for new samples. * * \note values stored in float_buffer might be altered