Skip to content

Commit

Permalink
Merge pull request #133 from mimic-sussex/master
Browse files Browse the repository at this point in the history
fft memory fixed
  • Loading branch information
chriskiefer authored Jan 18, 2023
2 parents c46b747 a58752e commit 8899dde
Show file tree
Hide file tree
Showing 30 changed files with 74 additions and 330 deletions.
13 changes: 1 addition & 12 deletions cpp/commandline/maximilian_examples/1.TestTone/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
13 changes: 1 addition & 12 deletions cpp/commandline/maximilian_examples/10.Filters/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
13 changes: 1 addition & 12 deletions cpp/commandline/maximilian_examples/11.Mixing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
13 changes: 1 addition & 12 deletions cpp/commandline/maximilian_examples/14.monosynth/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
13 changes: 1 addition & 12 deletions cpp/commandline/maximilian_examples/15.polysynth/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
13 changes: 1 addition & 12 deletions cpp/commandline/maximilian_examples/16.Replicant/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
13 changes: 1 addition & 12 deletions cpp/commandline/maximilian_examples/17.Compressor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
13 changes: 1 addition & 12 deletions cpp/commandline/maximilian_examples/2.TwoTones/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
15 changes: 3 additions & 12 deletions cpp/commandline/maximilian_examples/20.FFT_example/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,19 1,10 @@

cmake_minimum_required (VERSION 3.15)

project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp ../../../../src/libs/fft.cpp ../../../../src/libs/maxiFFT.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)
SET(MAXI_SRC_EXTENDED ../../../../src/libs/fft.cpp ../../../../src/libs/maxiFFT.cpp)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
include(../maximilianExamples.cmake)
13 changes: 2 additions & 11 deletions cpp/commandline/maximilian_examples/21.Recording/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,7 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)
include(../maximilianExamples.cmake)


if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
12 changes: 1 addition & 11 deletions cpp/commandline/maximilian_examples/22.Analysis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,6 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
12 changes: 1 addition & 11 deletions cpp/commandline/maximilian_examples/23.Chorus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,6 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
12 changes: 1 addition & 11 deletions cpp/commandline/maximilian_examples/24.Flanger/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,6 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
13 changes: 1 addition & 12 deletions cpp/commandline/maximilian_examples/3.AM1/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
13 changes: 1 addition & 12 deletions cpp/commandline/maximilian_examples/4.AM2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
13 changes: 1 addition & 12 deletions cpp/commandline/maximilian_examples/5.FM1/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
13 changes: 1 addition & 12 deletions cpp/commandline/maximilian_examples/6.FM2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 4,5 @@ project (maximilian)

set(CMAKE_CXX_STANDARD 17)

include_directories(../..)
include_directories(../../../../src)
include_directories(../../../../src/libs)
include(../maximilianExamples.cmake)

add_executable(maximilian ./main.cpp ../../player.cpp ../../RtAudio.cpp ../../../../src/maximilian.cpp)
target_compile_options(maximilian PUBLIC -Wall)
target_link_libraries(maximilian PUBLIC -lpthread)

if (UNIX)
MESSAGE(STATUS "Linux build")
target_link_libraries(maximilian PUBLIC -lasound)
add_definitions(-D__LINUX_ALSA__)
endif()
Loading

0 comments on commit 8899dde

Please sign in to comment.