commit 67035c4fecbf67a9b2760b37fdef3c4c1c0b62b3 parent 92389622dfa3961cba697062ff6ba3d1ba9d9f7d Author: Harald Hvaal <[email protected]> Date: Thu, 28 May 2009 20:19:11 +0900 Importing the cmake build files. This does not compile completely because the old GUI is not included Diffstat:
| A | CMakeLists.txt | | | 7 | +++++++ |
| A | cmake/FindAlsa.cmake | | | 69 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | cmake/FindJACK.cmake | | | 31 | +++++++++++++++++++++++++++++++ |
| A | cmake/FindMXML.cmake | | | 31 | +++++++++++++++++++++++++++++++ |
| A | cmake/FindPortAudio.cmake | | | 31 | +++++++++++++++++++++++++++++++ |
| A | cmake/Findfftw3.cmake | | | 31 | +++++++++++++++++++++++++++++++ |
| A | src/CMakeLists.txt | | | 82 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | src/DSP/CMakeLists.txt | | | 13 | +++++++++++++ |
| A | src/Effects/CMakeLists.txt | | | 19 | +++++++++++++++++++ |
| A | src/Input/CMakeLists.txt | | | 22 | ++++++++++++++++++++++ |
| A | src/Misc/CMakeLists.txt | | | 25 | +++++++++++++++++++++++++ |
| A | src/Misc/Control.h | | | 100 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | src/NewUI/CMakeLists.txt | | | 36 | ++++++++++++++++++++++++++++++++++++ |
| A | src/Output/CMakeLists.txt | | | 32 | ++++++++++++++++++++++++++++++++ |
| A | src/Params/CMakeLists.txt | | | 18 | ++++++++++++++++++ |
| A | src/Seq/CMakeLists.txt | | | 11 | +++++++++++ |
| A | src/Synth/CMakeLists.txt | | | 15 | +++++++++++++++ |
17 files changed, 573 insertions(+), 0 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -0,0 +1,7 @@ + +cmake_minimum_required(VERSION 2.6) +project(zynaddsubfx) + +#set(lib_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib) + +add_subdirectory(src) diff --git a/cmake/FindAlsa.cmake b/cmake/FindAlsa.cmake @@ -0,0 +1,69 @@ +# Alsa check, based on libkmid/configure.in.in. +# Only the support for Alsa >= 0.9.x was included; 0.5.x was dropped (but feel free to re-add it if you need it) +# It defines ... +# It offers the following macros: +# ALSA_CONFIGURE_FILE(config_header) - generate a config.h, typical usage: +# ALSA_CONFIGURE_FILE(${CMAKE_BINARY_DIR}/config-alsa.h) +# ALSA_VERSION_STRING(version_string) looks for alsa/version.h and reads the version string into +# the first argument passed to the macro + +# Copyright (c) 2006, David Faure, <[email protected]> +# Copyright (c) 2007, Matthias Kretz <[email protected]> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +include(CheckIncludeFiles) +include(CheckIncludeFileCXX) +include(CheckLibraryExists) + +# Already done by toplevel +find_library(ASOUND_LIBRARY asound) +set(ASOUND_LIBRARY_DIR "") +if(ASOUND_LIBRARY) + get_filename_component(ASOUND_LIBRARY_DIR ${ASOUND_LIBRARY} PATH) +endif(ASOUND_LIBRARY) + +check_library_exists(asound snd_seq_create_simple_port "${ASOUND_LIBRARY_DIR}" HAVE_LIBASOUND2) +if(HAVE_LIBASOUND2) + message(STATUS "Found ALSA: ${ASOUND_LIBRARY}") +else(HAVE_LIBASOUND2) + message(STATUS "ALSA not found") +endif(HAVE_LIBASOUND2) +set(ALSA_FOUND ${HAVE_LIBASOUND2}) + +find_path(ALSA_INCLUDES alsa/version.h) + +macro(ALSA_VERSION_STRING _result) + # check for version in alsa/version.h + if(ALSA_INCLUDES) + file(READ "${ALSA_INCLUDES}/alsa/version.h" _ALSA_VERSION_CONTENT) + string(REGEX REPLACE ".*SND_LIB_VERSION_STR.*\"(.*)\".*" "\\1" ${_result} ${_ALSA_VERSION_CONTENT}) + else(ALSA_INCLUDES) + message(STATUS "ALSA version not known. ALSA output will probably not work correctly.") + endif(ALSA_INCLUDES) +endmacro(ALSA_VERSION_STRING _result) + + +get_filename_component(_FIND_ALSA_MODULE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) +macro(ALSA_CONFIGURE_FILE _destFile) + check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H) + check_include_files(machine/soundcard.h HAVE_MACHINE_SOUNDCARD_H) + + check_include_files(linux/awe_voice.h HAVE_LINUX_AWE_VOICE_H) + check_include_files(awe_voice.h HAVE_AWE_VOICE_H) + check_include_files(/usr/src/sys/i386/isa/sound/awe_voice.h HAVE__USR_SRC_SYS_I386_ISA_SOUND_AWE_VOICE_H) + check_include_files(/usr/src/sys/gnu/i386/isa/sound/awe_voice.h HAVE__USR_SRC_SYS_GNU_I386_ISA_SOUND_AWE_VOICE_H) + + check_include_file_cxx(sys/asoundlib.h HAVE_SYS_ASOUNDLIB_H) + check_include_file_cxx(alsa/asoundlib.h HAVE_ALSA_ASOUNDLIB_H) + + check_library_exists(asound snd_pcm_resume "${ASOUND_LIBRARY_DIR}" ASOUND_HAS_SND_PCM_RESUME) + if(ASOUND_HAS_SND_PCM_RESUME) + set(HAVE_SND_PCM_RESUME 1) + endif(ASOUND_HAS_SND_PCM_RESUME) + + configure_file(${_FIND_ALSA_MODULE_DIR}/config-alsa.h.cmake ${_destFile}) +endmacro(ALSA_CONFIGURE_FILE _destFile) + +mark_as_advanced(ALSA_INCLUDES ASOUND_LIBRARY) diff --git a/cmake/FindJACK.cmake b/cmake/FindJACK.cmake @@ -0,0 +1,31 @@ +# - Try to find Motif (or lesstif) +# Once done this will define: +# JACK_FOUND - system has JACK +# JACK_INCLUDE_DIR - incude paths to use Motif +# JACK_LIBRARIES - Link these to use Motif + +SET(JACK_FOUND 0) + +IF(UNIX) + FIND_PATH(JACK_INCLUDE_DIR + jack/ringbuffer.h + /usr/include + ) + + FIND_LIBRARY(JACK_LIBRARIES + jack + /usr/lib + ) + +ENDIF(UNIX) + +# handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(JACK DEFAULT_MSG JACK_LIBRARIES JACK_INCLUDE_DIR) + + +MARK_AS_ADVANCED( + JACK_INCLUDE_DIR + JACK_LIBRARIES +) diff --git a/cmake/FindMXML.cmake b/cmake/FindMXML.cmake @@ -0,0 +1,31 @@ +# - Try to find Motif (or lesstif) +# Once done this will define: +# MXML_FOUND - system has MXML +# MXML_INCLUDE_DIR - incude paths to use Motif +# MXML_LIBRARIES - Link these to use Motif + +SET(MXML_FOUND 0) + +IF(UNIX) + FIND_PATH(MXML_INCLUDE_DIR + mxml.h + /usr/include + ) + + FIND_LIBRARY(MXML_LIBRARIES + mxml + /usr/lib + ) + +ENDIF(UNIX) + +# handle the QUIETLY and REQUIRED arguments and set MXML_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(MXML DEFAULT_MSG MXML_LIBRARIES MXML_INCLUDE_DIR) + + +MARK_AS_ADVANCED( + MXML_INCLUDE_DIR + MXML_LIBRARIES +) diff --git a/cmake/FindPortAudio.cmake b/cmake/FindPortAudio.cmake @@ -0,0 +1,31 @@ +# - Try to find Motif (or lesstif) +# Once done this will define: +# PORTAUDIO_FOUND - system has PORTAUDIO +# PORTAUDIO_INCLUDE_DIR - incude paths to use Motif +# PORTAUDIO_LIBRARIES - Link these to use Motif + +SET(PORTAUDIO_FOUND 0) + +IF(UNIX) + FIND_PATH(PORTAUDIO_INCLUDE_DIR + portaudio.h + /usr/include + ) + + FIND_LIBRARY(PORTAUDIO_LIBRARIES + portaudio + /usr/lib + ) + +ENDIF(UNIX) + +# handle the QUIETLY and REQUIRED arguments and set PORTAUDIO_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PortAudio DEFAULT_MSG PORTAUDIO_LIBRARIES PORTAUDIO_INCLUDE_DIR) + + +MARK_AS_ADVANCED( + PORTAUDIO_INCLUDE_DIR + PORTAUDIO_LIBRARIES +) diff --git a/cmake/Findfftw3.cmake b/cmake/Findfftw3.cmake @@ -0,0 +1,31 @@ +# - Try to find Motif (or lesstif) +# Once done this will define: +# fftw3_FOUND - system has fftw3 +# fftw3_INCLUDE_DIR - incude paths to use Motif +# fftw3_LIBRARIES - Link these to use Motif + +SET(fftw3_FOUND 0) + +IF(UNIX) + FIND_PATH(fftw3_INCLUDE_DIR + fftw3.h + /usr/include + ) + + FIND_LIBRARY(fftw3_LIBRARIES + fftw3 + /usr/lib + ) + +ENDIF(UNIX) + +# handle the QUIETLY and REQUIRED arguments and set fftw3_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(fftw3 DEFAULT_MSG fftw3_LIBRARIES fftw3_INCLUDE_DIR) + + +MARK_AS_ADVANCED( + fftw3_INCLUDE_DIR + fftw3_LIBRARIES +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt @@ -0,0 +1,82 @@ +FIND_PACKAGE(Qt4) +INCLUDE(${QT_USE_FILE}) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") + +#settings. These cache variables can be changed before compile +#in CMakeCache.txt +SET (FFTW_VERSION 3 CACHE STRING "Version number of FFTW") +SET (OutputModule jack CACHE STRING "Output module, either alsa, jack or portaudio") + + +if (OutputModule STREQUAL alsa) + set(AlsaMidiOutput TRUE) +elseif(OutputModule STREQUAL jack) + set(JackOutput TRUE) +elseif(OutputModule STREQUAL portaudio) + set(PortAudioOutput TRUE) +else () + message(FATAL_ERROR "OutputModule must be either alsa, jack or portaudio") +endif() + +message(STATUS "OutputModule set to ${OutputModule}") + +# setting dependent stuff +if(AlsaMidiOutput) + FIND_PACKAGE(Alsa) + add_definitions(-DOSSAUDIOOUT) +endif() + +if(JackOutput) + FIND_PACKAGE(JACK) + include_directories(${JACK_INCLUDE_DIR}) + add_definitions(-DJACKAUDIOOUT) +endif() + +if(PortAudioOutput) + FIND_PACKAGE(PortAudio) + include_directories(${PORTAUDIO_INCLUDE_DIR}) + add_definitions(-DPAAUDIOOUT) +endif() + +add_definitions(-DFFTW_VERSION_${FFTW_VERSION} + -DOS_LINUX + -DALSAMIDIIN + -DASM_F2I_YES + ) + + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/NewUI + ${CMAKE_CURRENT_SOURCE_DIR}/NewUI) + +add_subdirectory(Misc) +add_subdirectory(Input) +add_subdirectory(Output) +#add_subdirectory(NewUI) +add_subdirectory(Synth) +add_subdirectory(Seq) +add_subdirectory(Effects) +add_subdirectory(Params) +add_subdirectory(DSP) + +set(zynaddsubfxgui_SRCS + #main.cpp + main.C + ) + +add_executable(zynaddsubfxgui + ${zynaddsubfxgui_SRCS} +) + +target_link_libraries(zynaddsubfxgui + zynaddsubfxgui_input + zynaddsubfxgui_output + zynaddsubfxgui_misc + zynaddsubfxgui_synth + zynaddsubfxgui_seq + zynaddsubfxgui_effect + zynaddsubfxgui_params + zynaddsubfxgui_dsp + zynaddsubfxguilib) + diff --git a/src/DSP/CMakeLists.txt b/src/DSP/CMakeLists.txt @@ -0,0 +1,13 @@ +set(zynaddsubfxgui_dsp_SRCS + AnalogFilter.C + FFTwrapper.C + Filter.C + FormantFilter.C + SVFilter.C +) + +add_library(zynaddsubfxgui_dsp STATIC + ${zynaddsubfxgui_dsp_SRCS} + ) + +target_link_libraries(zynaddsubfxgui_dsp ${ASOUND_LIBRARY}) diff --git a/src/Effects/CMakeLists.txt b/src/Effects/CMakeLists.txt @@ -0,0 +1,19 @@ +set(zynaddsubfxgui_effect_SRCS + Alienwah.C + Chorus.C + Distorsion.C + DynamicFilter.C + Echo.C + Effect.C + EffectLFO.C + EffectMgr.C + EQ.C + Phaser.C + Reverb.C +) + +add_library(zynaddsubfxgui_effect STATIC + ${zynaddsubfxgui_effect_SRCS} + ) + +target_link_libraries(zynaddsubfxgui_effect ${ASOUND_LIBRARY}) diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt @@ -0,0 +1,22 @@ +SET (AlsaMidiInput On CACHE BOOL "Include ALSA Midi input") +set(zynaddsubfxgui_input_SRCS + MidiIn.C + NULLMidiIn.C + #OSSMidiIn.C + #WINMidiIn.C +) +FIND_PACKAGE(Alsa) + +if(AlsaMidiInput) + set(zynaddsubfxgui_input_SRCS + ${zynaddsubfxgui_input_SRCS} + ALSAMidiIn.C + ) + message("Alsa midi input enabled") +endif(AlsaMidiInput) + +add_library(zynaddsubfxgui_input STATIC + ${zynaddsubfxgui_input_SRCS} + ) + +target_link_libraries(zynaddsubfxgui_input ${QT_LIBRARIES} ${ASOUND_LIBRARY}) diff --git a/src/Misc/CMakeLists.txt b/src/Misc/CMakeLists.txt @@ -0,0 +1,25 @@ +find_package(MXML) +find_package(fftw3) + +include_directories(${MXML_INCLUDE_DIR}) + +set(zynaddsubfxgui_misc_SRCS + Bank.C + Config.C + Dump.C + Master.C + Microtonal.C + Part.C + Util.C + XMLwrapper.C +) + +add_library(zynaddsubfxgui_misc STATIC + ${zynaddsubfxgui_misc_SRCS} + ) + +target_link_libraries(zynaddsubfxgui_misc + zynaddsubfxgui_output + ${MXML_LIBRARIES} + ${fftw3_LIBRARIES} + ) diff --git a/src/Misc/Control.h b/src/Misc/Control.h @@ -0,0 +1,100 @@ +/* + ZynAddSubFX - a software synthesizer + + Dump.h - It dumps the notes to a text file + + Copyright (C) 2009 Harald Hvaal + Author: Harald Hvaal + + This program is free software; you can redistribute it and/or modify + it under the terms of version 2 of the GNU General Public License + as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License (version 2 or later) for more details. + + You should have received a copy of the GNU General Public License (version 2) + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef _CONTROL_H_ +#define _CONTROL_H_ + +#include <string> + +class Control +{ + public: + /** + * The parent is the logical owner of this control. Parent should only + * be null for the root node. + * The id is a string uniquely identifying this control within the + * context of the parent control. No spaces or dots are allowed in this + * id. + * Children id's are denoted by <parent-id>.<children-id>, so that one + * can refer to any control in the hierarchy by separating them with + * dots. Example: Main.AddSynth.FrequencyLFO.Amplitude + */ + Control(Control *parent, string id); + + /** + * Will recursively get the XML representation for all the subcontrols. + * Used for saving to file and copy-pasting settings + */ + string getXMLRepresentation(); + + /** + * Set the value of this (and possibly subcomponents as well) based on + * a xml description. + */ + void restoreFromXML(string xml); + + /** + * Register a controluser. This will cause this user to be notified + * whenever the contents of the control changes. + */ + void registerControlUser(ControlUser *user); + + /** + * This should return a string representation of the controls internal + * value + */ + virtual string getStringRepresentation() = 0; + +}; + +class FloatControl : public Control +{ + public: + /** + * Set the value of this control. If the ControlUser variable is set, + * then this user will not be updated with the new value. This is to + * avoid setting a value being set back to the source that set it + * (which would be redundant, or possibly causing infinite setValue + * loops). + * NOTE: this function is thread-safe (using a mutex internally) + */ + void setValue(float value, ControlUser *user = NULL); + + /** + * Reimplemented from Control + */ + virtual string getStringRepresentation(); + + float value(); +}; + +class ControlUser +{ + public: + /** + * Pure virtual method, to notify the controluser that the value has + * been changed internally, and needs to be read again. + */ + virtual void controlUpdated(Control *control) = 0; +}; + +#endif /* _CONTROL_H_ */ diff --git a/src/NewUI/CMakeLists.txt b/src/NewUI/CMakeLists.txt @@ -0,0 +1,36 @@ + +set(zynaddsubfxguilib_SRCS + dial.cpp + bankui.C + masterui.C + addnoteui.C + unitbox.C + lfobox.C + envelopebox.C + ) + +SET( zynaddsubfxguilib_MOC_HDRS + masterui.h + bankui.h + addnoteui.h + unitbox.h + lfobox.h + envelopebox.h +) + +SET( zynaddsubfxguilib_UIS + masterUI.ui + addnoteui.ui + lfobox.ui + envelopebox.ui +) + +qt4_wrap_ui(zynaddsubfxguilib_UIS_HDRS ${zynaddsubfxguilib_UIS} ) +qt4_automoc(${zynaddsubfxguilib_SRCS}) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}) +add_library(zynaddsubfxguilib STATIC + ${zynaddsubfxguilib_SRCS} + ${zynaddsubfxguilib_UIS} + ) +target_link_libraries(zynaddsubfxguilib) diff --git a/src/Output/CMakeLists.txt b/src/Output/CMakeLists.txt @@ -0,0 +1,32 @@ +set(zynaddsubfxgui_output_SRCS + Recorder.C +) + +if(AlsaMidiOutput) + set(zynaddsubfxgui_output_SRCS + ${zynaddsubfxgui_output_SRCS} + OSSaudiooutput.C) + set(zynaddsubfxgui_output_lib ${ASOUND_LIBRARY}) +endif(AlsaMidiOutput) + +if(JackOutput) + include_directories(${JACK_INCLUDE_DIR}) + set(zynaddsubfxgui_output_SRCS + ${zynaddsubfxgui_output_SRCS} + JACKaudiooutput.C) + set(zynaddsubfxgui_output_lib ${JACK_LIBRARIES}) +endif(JackOutput) + +if(PortAudioOutput) + include_directories(${PORTAUDIO_INCLUDE_DIR}) + set(zynaddsubfxgui_output_SRCS + ${zynaddsubfxgui_output_SRCS} + PAaudiooutput.C) + set(zynaddsubfxgui_output_lib ${PORTAUDIO_LIBRARIES}) +endif(PortAudioOutput) + +add_library(zynaddsubfxgui_output STATIC + ${zynaddsubfxgui_output_SRCS} + ) + +target_link_libraries(zynaddsubfxgui_output ${zynaddsubfxgui_output_lib}) diff --git a/src/Params/CMakeLists.txt b/src/Params/CMakeLists.txt @@ -0,0 +1,18 @@ +set(zynaddsubfxgui_params_SRCS + ADnoteParameters.C + Controller.C + EnvelopeParams.C + FilterParams.C + LFOParams.C + PADnoteParameters.C + Presets.C + PresetsStore.C + SUBnoteParameters.C + +) + +add_library(zynaddsubfxgui_params STATIC + ${zynaddsubfxgui_params_SRCS} + ) + +target_link_libraries(zynaddsubfxgui_params ${ASOUND_LIBRARY}) diff --git a/src/Seq/CMakeLists.txt b/src/Seq/CMakeLists.txt @@ -0,0 +1,11 @@ +set(zynaddsubfxgui_seq_SRCS + MIDIEvents.C + MIDIFile.C + Sequencer.C +) + +add_library(zynaddsubfxgui_seq STATIC + ${zynaddsubfxgui_seq_SRCS} + ) + +target_link_libraries(zynaddsubfxgui_seq ${ASOUND_LIBRARY}) diff --git a/src/Synth/CMakeLists.txt b/src/Synth/CMakeLists.txt @@ -0,0 +1,15 @@ +set(zynaddsubfxgui_synth_SRCS + ADnote.C + Envelope.C + LFO.C + OscilGen.C + PADnote.C + Resonance.C + SUBnote.C +) + +add_library(zynaddsubfxgui_synth STATIC + ${zynaddsubfxgui_synth_SRCS} + ) + +target_link_libraries(zynaddsubfxgui_synth ${ASOUND_LIBRARY})