commit 2d91785b9f4a884e37e7c74480a1705383f93cf4 parent 81c3e9f786f035e53b63bc10600916f6cd99ec50 Author: fundamental <[email protected]> Date: Fri, 26 Jun 2009 17:41:29 -0400 Merge branch 'master' into portamento Diffstat:
82 files changed, 1031 insertions(+), 1017 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -0,0 +1,7 @@ +*.o +*~ +src/UI/*.h +src/UI/*.cc +src/zynaddsubfx +src/Tests/runner +src/Tests/runner.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.6) project(zynaddsubfx) -#set(lib_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib) - add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt @@ -1,13 +1,23 @@ -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 +######### Settings ########### +# NOTE: These cache variables should normallly not be changed in this +# file, but either in in CMakeCache.txt before compile, or by passing +# parameters directly into cmake using the -D flag. SET (FFTW_VERSION 3 CACHE STRING "Version number of FFTW") SET (OutputModule jack CACHE STRING "Output module, either alsa, jack or portaudio") -set (WANT_FLTK ON) - +SET (GuiModule fltk CACHE STRING "GUI module, either fltk, qt or off") + +# Now, handle the incoming settings and set define flags/variables based +# on this + +if (GuiModule STREQUAL qt) + set (QtGui TRUE) +elseif(GuiModule STREQUAL fltk) + set (FltkGui TRUE) +elseif(GuiModule STREQUAL off) + add_definitions(-DDISABLE_GUI) +else () + message(FATAL_ERROR "GUI module must be either fltk, qt or off") +endif() if (OutputModule STREQUAL alsa) set(AlsaMidiOutput TRUE) @@ -19,9 +29,12 @@ else () message(FATAL_ERROR "OutputModule must be either alsa, jack or portaudio") endif() -message(STATUS "OutputModule set to ${OutputModule}") +########### Settings dependant code ########### +# From here on, the setting variables have been prepared so concentrate +# on the actual compiling. + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") -# setting dependent stuff if(AlsaMidiOutput) FIND_PACKAGE(Alsa) add_definitions(-DOSSAUDIOOUT) @@ -46,7 +59,7 @@ add_definitions(-DFFTW_VERSION_${FFTW_VERSION} ) - if(WANT_FLTK) # Check for FLTK +if(FltkGui) # Check for FLTK find_package(FLTK REQUIRED) # message(STATUS "FLTK_LIBRARIES: ${FLTK_LIBRARIES}") # message("FLTK_MATH_LIBRARY: ${FLTK_MATH_LIBRARY}") @@ -62,54 +75,64 @@ add_definitions(-DFFTW_VERSION_${FFTW_VERSION} mark_as_advanced(FORCE FLTK_INCLUDE_DIR) mark_as_advanced(FORCE FLTK_MATH_LIBRARY) - set(FLTK_LIBRARIES + + set(GUI_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_MATH_LIBRARY} ${FLTK_FORMS_LIBRARY} ${FLTK_IMAGES_LIBRARY} ${FLTK_GL_LIBRARY} - ) - add_definitions(-DWANT_GUI) - message(STATUS "will build gui") + zynaddsubfx_gui + ) + add_definitions(-DFLTK_GUI) + + message(STATUS "Will build fltk gui") + + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/UI + ${CMAKE_CURRENT_BINARY_DIR}/UI + ) + + add_subdirectory(UI) endif() +########### General section ############## +# Following this should be only general compilation code, and no mention +# of module-specific variables + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/NewUI - ${CMAKE_CURRENT_SOURCE_DIR}/NewUI) + ) add_subdirectory(Misc) add_subdirectory(Input) add_subdirectory(Output) add_subdirectory(Controls) -#add_subdirectory(NewUI) add_subdirectory(Synth) add_subdirectory(Seq) add_subdirectory(Effects) add_subdirectory(Params) add_subdirectory(DSP) -add_subdirectory(UI) add_subdirectory(Samples) -set(zynaddsubfxgui_SRCS - #main.cpp - main.C +set(zynaddsubfx_SRCS + main.cpp ) -add_executable(zynaddsubfxgui - ${zynaddsubfxgui_SRCS} +add_executable(zynaddsubfx + ${zynaddsubfx_SRCS} ) -target_link_libraries(zynaddsubfxgui - zynaddsubfxgui_input - zynaddsubfxgui_output - zynaddsubfxgui_misc - zynaddsubfxgui_synth - zynaddsubfxgui_seq - zynaddsubfxgui_effect - zynaddsubfxgui_params - zynaddsubfxgui_dsp - zynaddsubfxgui_samples - zynaddsubfxgui_controls - ${FLTK_LIBRARIES} - zynaddsubfxguilib) +target_link_libraries(zynaddsubfx + zynaddsubfx_input + zynaddsubfx_output + zynaddsubfx_misc + zynaddsubfx_synth + zynaddsubfx_seq + zynaddsubfx_effect + zynaddsubfx_params + zynaddsubfx_dsp + zynaddsubfx_samples + zynaddsubfx_controls + ${GUI_LIBRARIES} + ) diff --git a/src/Controls/CMakeLists.txt b/src/Controls/CMakeLists.txt @@ -1,8 +1,8 @@ -set(zynaddsubfxgui_controls_SRCS - Control.C - DelayCtl.C +set(zynaddsubfx_controls_SRCS + Control.cpp + DelayCtl.cpp ) -add_library(zynaddsubfxgui_controls STATIC - ${zynaddsubfxgui_controls_SRCS} +add_library(zynaddsubfx_controls STATIC + ${zynaddsubfx_controls_SRCS} ) diff --git a/src/Controls/Control.C b/src/Controls/Control.cpp diff --git a/src/Controls/DelayCtl.C b/src/Controls/DelayCtl.cpp diff --git a/src/DSP/AnalogFilter.C b/src/DSP/AnalogFilter.cpp diff --git a/src/DSP/CMakeLists.txt b/src/DSP/CMakeLists.txt @@ -1,13 +1,13 @@ -set(zynaddsubfxgui_dsp_SRCS - AnalogFilter.C - FFTwrapper.C - Filter.C - FormantFilter.C - SVFilter.C +set(zynaddsubfx_dsp_SRCS + AnalogFilter.cpp + FFTwrapper.cpp + Filter.cpp + FormantFilter.cpp + SVFilter.cpp ) -add_library(zynaddsubfxgui_dsp STATIC - ${zynaddsubfxgui_dsp_SRCS} +add_library(zynaddsubfx_dsp STATIC + ${zynaddsubfx_dsp_SRCS} ) -target_link_libraries(zynaddsubfxgui_dsp ${ASOUND_LIBRARY}) +target_link_libraries(zynaddsubfx_dsp ${ASOUND_LIBRARY}) diff --git a/src/DSP/FFTwrapper.C b/src/DSP/FFTwrapper.cpp diff --git a/src/DSP/Filter.C b/src/DSP/Filter.cpp diff --git a/src/DSP/FormantFilter.C b/src/DSP/FormantFilter.cpp diff --git a/src/DSP/SVFilter.C b/src/DSP/SVFilter.cpp diff --git a/src/Effects/Alienwah.C b/src/Effects/Alienwah.cpp diff --git a/src/Effects/CMakeLists.txt b/src/Effects/CMakeLists.txt @@ -1,19 +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 +set(zynaddsubfx_effect_SRCS + Alienwah.cpp + Chorus.cpp + Distorsion.cpp + DynamicFilter.cpp + Echo.cpp + Effect.cpp + EffectLFO.cpp + EffectMgr.cpp + EQ.cpp + Phaser.cpp + Reverb.cpp ) -add_library(zynaddsubfxgui_effect STATIC - ${zynaddsubfxgui_effect_SRCS} +add_library(zynaddsubfx_effect STATIC + ${zynaddsubfx_effect_SRCS} ) -target_link_libraries(zynaddsubfxgui_effect ${ASOUND_LIBRARY}) +target_link_libraries(zynaddsubfx_effect ${ASOUND_LIBRARY}) diff --git a/src/Effects/Chorus.C b/src/Effects/Chorus.cpp diff --git a/src/Effects/Distorsion.C b/src/Effects/Distorsion.cpp diff --git a/src/Effects/DynamicFilter.C b/src/Effects/DynamicFilter.cpp diff --git a/src/Effects/EQ.C b/src/Effects/EQ.cpp diff --git a/src/Effects/Echo.C b/src/Effects/Echo.cpp diff --git a/src/Effects/Effect.C b/src/Effects/Effect.cpp diff --git a/src/Effects/EffectLFO.C b/src/Effects/EffectLFO.cpp diff --git a/src/Effects/EffectMgr.C b/src/Effects/EffectMgr.cpp diff --git a/src/Effects/Phaser.C b/src/Effects/Phaser.cpp diff --git a/src/Effects/Reverb.C b/src/Effects/Reverb.cpp diff --git a/src/Input/ALSAMidiIn.C b/src/Input/ALSAMidiIn.cpp diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt @@ -1,22 +1,22 @@ SET (AlsaMidiInput On CACHE BOOL "Include ALSA Midi input") -set(zynaddsubfxgui_input_SRCS - MidiIn.C - NULLMidiIn.C - #OSSMidiIn.C - #WINMidiIn.C +set(zynaddsubfx_input_SRCS + MidiIn.cpp + NULLMidiIn.cpp + #OSSMidiIn.cpp + #WINMidiIn.cpp ) FIND_PACKAGE(Alsa) if(AlsaMidiInput) - set(zynaddsubfxgui_input_SRCS - ${zynaddsubfxgui_input_SRCS} - ALSAMidiIn.C + set(zynaddsubfx_input_SRCS + ${zynaddsubfx_input_SRCS} + ALSAMidiIn.cpp ) message("Alsa midi input enabled") endif(AlsaMidiInput) -add_library(zynaddsubfxgui_input STATIC - ${zynaddsubfxgui_input_SRCS} +add_library(zynaddsubfx_input STATIC + ${zynaddsubfx_input_SRCS} ) -target_link_libraries(zynaddsubfxgui_input ${QT_LIBRARIES} ${ASOUND_LIBRARY}) +target_link_libraries(zynaddsubfx_input ${QT_LIBRARIES} ${ASOUND_LIBRARY}) diff --git a/src/Input/MidiIn.C b/src/Input/MidiIn.cpp diff --git a/src/Input/NULLMidiIn.C b/src/Input/NULLMidiIn.cpp diff --git a/src/Input/OSSMidiIn.C b/src/Input/OSSMidiIn.cpp diff --git a/src/Input/WINMidiIn.C b/src/Input/WINMidiIn.cpp diff --git a/src/Makefile b/src/Makefile @@ -11,7 +11,7 @@ CXXFLAGS += -DOS_$(OS_PORT) -D$(MIDIIN)MIDIIN -DFFTW_VERSION_$(FFTW_VERSION) -DA ifeq ($(DISABLE_GUI),YES) CXXFLAGS += -DDISABLE_GUI else - CXXFLAGS += `fltk-config --cflags` + CXXFLAGS += -DFLTK_GUI `fltk-config --cflags` endif ifeq ($(AUDIOOUT),OSS_AND_JACK) @@ -86,7 +86,7 @@ all: $(MAKE) -C UI $@ # @sh -c "cd UI ; $(CXX) -MM -MG -w *.cc >> ../Make.deps ; cd .." - @for name in $(SUBDIRS); do sh -c "cd $$name ; $(CXX) -MM -MG -w *.C >> ../Make.deps ; cd .."; done + @for name in $(SUBDIRS); do sh -c "cd $$name ; $(CXX) -MM -MG -w *.cpp >> ../Make.deps ; cd .."; done $(MAKE) subdirs $(MAKE) objs rm -f zynaddsubfx zynaddsubfx.exe diff --git a/src/Misc/Bank.C b/src/Misc/Bank.cpp diff --git a/src/Misc/CMakeLists.txt b/src/Misc/CMakeLists.txt @@ -3,23 +3,23 @@ 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 +set(zynaddsubfx_misc_SRCS + Bank.cpp + Config.cpp + Dump.cpp + Master.cpp + Microtonal.cpp + Part.cpp + Util.cpp + XMLwrapper.cpp ) -add_library(zynaddsubfxgui_misc STATIC - ${zynaddsubfxgui_misc_SRCS} +add_library(zynaddsubfx_misc STATIC + ${zynaddsubfx_misc_SRCS} ) -target_link_libraries(zynaddsubfxgui_misc - zynaddsubfxgui_output +target_link_libraries(zynaddsubfx_misc + zynaddsubfx_output ${MXML_LIBRARIES} ${fftw3_LIBRARIES} ) diff --git a/src/Misc/Config.C b/src/Misc/Config.cpp diff --git a/src/Misc/Dump.C b/src/Misc/Dump.cpp diff --git a/src/Misc/LASHClient.C b/src/Misc/LASHClient.cpp diff --git a/src/Misc/Master.C b/src/Misc/Master.cpp diff --git a/src/Misc/Microtonal.C b/src/Misc/Microtonal.cpp diff --git a/src/Misc/Part.C b/src/Misc/Part.cpp diff --git a/src/Misc/Stereo.C b/src/Misc/Stereo.cpp diff --git a/src/Misc/Stereo.h b/src/Misc/Stereo.h @@ -62,6 +62,6 @@ private: T rightChannel; }; -#include "Stereo.C" +#include "Stereo.cpp" #endif diff --git a/src/Misc/Util.C b/src/Misc/Util.cpp diff --git a/src/Misc/XMLwrapper.C b/src/Misc/XMLwrapper.cpp diff --git a/src/NewUI/CMakeLists.txt b/src/NewUI/CMakeLists.txt @@ -1,36 +0,0 @@ - -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 @@ -1,33 +1,33 @@ -set(zynaddsubfxgui_output_SRCS - Recorder.C - WAVaudiooutput.C +set(zynaddsubfx_output_SRCS + Recorder.cpp + WAVaudiooutput.cpp ) if(AlsaMidiOutput) - set(zynaddsubfxgui_output_SRCS - ${zynaddsubfxgui_output_SRCS} - OSSaudiooutput.C) - set(zynaddsubfxgui_output_lib ${ASOUND_LIBRARY}) + set(zynaddsubfx_output_SRCS + ${zynaddsubfx_output_SRCS} + OSSaudiooutput.cpp) + set(zynaddsubfx_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}) + set(zynaddsubfx_output_SRCS + ${zynaddsubfx_output_SRCS} + JACKaudiooutput.cpp) + set(zynaddsubfx_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}) + set(zynaddsubfx_output_SRCS + ${zynaddsubfx_output_SRCS} + PAaudiooutput.cpp) + set(zynaddsubfx_output_lib ${PORTAUDIO_LIBRARIES}) endif(PortAudioOutput) -add_library(zynaddsubfxgui_output STATIC - ${zynaddsubfxgui_output_SRCS} +add_library(zynaddsubfx_output STATIC + ${zynaddsubfx_output_SRCS} ) -target_link_libraries(zynaddsubfxgui_output ${zynaddsubfxgui_output_lib}) +target_link_libraries(zynaddsubfx_output ${zynaddsubfx_output_lib}) diff --git a/src/Output/DSSIaudiooutput.C b/src/Output/DSSIaudiooutput.cpp diff --git a/src/Output/JACK_RTaudiooutput.C b/src/Output/JACK_RTaudiooutput.cpp diff --git a/src/Output/JACKaudiooutput.C b/src/Output/JACKaudiooutput.cpp diff --git a/src/Output/OSSaudiooutput.C b/src/Output/OSSaudiooutput.cpp diff --git a/src/Output/PAaudiooutput.C b/src/Output/PAaudiooutput.cpp diff --git a/src/Output/Recorder.C b/src/Output/Recorder.cpp diff --git a/src/Output/VSTaudiooutput.C b/src/Output/VSTaudiooutput.cpp diff --git a/src/Output/WAVaudiooutput.C b/src/Output/WAVaudiooutput.cpp diff --git a/src/Params/ADnoteParameters.C b/src/Params/ADnoteParameters.cpp diff --git a/src/Params/CMakeLists.txt b/src/Params/CMakeLists.txt @@ -1,18 +1,18 @@ -set(zynaddsubfxgui_params_SRCS - ADnoteParameters.C - Controller.C - EnvelopeParams.C - FilterParams.C - LFOParams.C - PADnoteParameters.C - Presets.C - PresetsStore.C - SUBnoteParameters.C +set(zynaddsubfx_params_SRCS + ADnoteParameters.cpp + Controller.cpp + EnvelopeParams.cpp + FilterParams.cpp + LFOParams.cpp + PADnoteParameters.cpp + Presets.cpp + PresetsStore.cpp + SUBnoteParameters.cpp ) -add_library(zynaddsubfxgui_params STATIC - ${zynaddsubfxgui_params_SRCS} +add_library(zynaddsubfx_params STATIC + ${zynaddsubfx_params_SRCS} ) -target_link_libraries(zynaddsubfxgui_params ${ASOUND_LIBRARY}) +target_link_libraries(zynaddsubfx_params ${ASOUND_LIBRARY}) diff --git a/src/Params/Controller.C b/src/Params/Controller.cpp diff --git a/src/Params/EnvelopeParams.C b/src/Params/EnvelopeParams.cpp diff --git a/src/Params/FilterParams.C b/src/Params/FilterParams.cpp diff --git a/src/Params/LFOParams.C b/src/Params/LFOParams.cpp diff --git a/src/Params/PADnoteParameters.C b/src/Params/PADnoteParameters.cpp diff --git a/src/Params/Presets.C b/src/Params/Presets.cpp diff --git a/src/Params/PresetsStore.C b/src/Params/PresetsStore.cpp diff --git a/src/Params/SUBnoteParameters.C b/src/Params/SUBnoteParameters.cpp diff --git a/src/Samples/AuSample.C b/src/Samples/AuSample.cpp diff --git a/src/Samples/CMakeLists.txt b/src/Samples/CMakeLists.txt @@ -1,14 +1,14 @@ -set(zynaddsubfxgui_samples_SRCS - AuSample.C - FqSample.C - Sample.C - #StereoSample.C +set(zynaddsubfx_samples_SRCS + AuSample.cpp + FqSample.cpp + Sample.cpp + #StereoSample.cpp ) -add_library(zynaddsubfxgui_samples STATIC - ${zynaddsubfxgui_samples_SRCS} +add_library(zynaddsubfx_samples STATIC + ${zynaddsubfx_samples_SRCS} ) -target_link_libraries(zynaddsubfxgui_samples - zynaddsubfxgui_samples +target_link_libraries(zynaddsubfx_samples + zynaddsubfx_samples ) diff --git a/src/Samples/FqSample.C b/src/Samples/FqSample.cpp diff --git a/src/Samples/Sample.C b/src/Samples/Sample.cpp diff --git a/src/Seq/CMakeLists.txt b/src/Seq/CMakeLists.txt @@ -1,11 +1,11 @@ -set(zynaddsubfxgui_seq_SRCS - MIDIEvents.C - MIDIFile.C - Sequencer.C +set(zynaddsubfx_seq_SRCS + MIDIEvents.cpp + MIDIFile.cpp + Sequencer.cpp ) -add_library(zynaddsubfxgui_seq STATIC - ${zynaddsubfxgui_seq_SRCS} +add_library(zynaddsubfx_seq STATIC + ${zynaddsubfx_seq_SRCS} ) -target_link_libraries(zynaddsubfxgui_seq ${ASOUND_LIBRARY}) +target_link_libraries(zynaddsubfx_seq ${ASOUND_LIBRARY}) diff --git a/src/Seq/MIDIEvents.C b/src/Seq/MIDIEvents.cpp diff --git a/src/Seq/MIDIFile.C b/src/Seq/MIDIFile.cpp diff --git a/src/Seq/Sequencer.C b/src/Seq/Sequencer.cpp diff --git a/src/Synth/ADnote.C b/src/Synth/ADnote.cpp diff --git a/src/Synth/CMakeLists.txt b/src/Synth/CMakeLists.txt @@ -1,15 +1,15 @@ -set(zynaddsubfxgui_synth_SRCS - ADnote.C - Envelope.C - LFO.C - OscilGen.C - PADnote.C - Resonance.C - SUBnote.C +set(zynaddsubfx_synth_SRCS + ADnote.cpp + Envelope.cpp + LFO.cpp + OscilGen.cpp + PADnote.cpp + Resonance.cpp + SUBnote.cpp ) -add_library(zynaddsubfxgui_synth STATIC - ${zynaddsubfxgui_synth_SRCS} +add_library(zynaddsubfx_synth STATIC + ${zynaddsubfx_synth_SRCS} ) -target_link_libraries(zynaddsubfxgui_synth ${ASOUND_LIBRARY}) +target_link_libraries(zynaddsubfx_synth ${ASOUND_LIBRARY}) diff --git a/src/Synth/Envelope.C b/src/Synth/Envelope.cpp diff --git a/src/Synth/LFO.C b/src/Synth/LFO.cpp diff --git a/src/Synth/OscilGen.C b/src/Synth/OscilGen.cpp diff --git a/src/Synth/PADnote.C b/src/Synth/PADnote.cpp diff --git a/src/Synth/Resonance.C b/src/Synth/Resonance.cpp diff --git a/src/Synth/SUBnote.C b/src/Synth/SUBnote.cpp diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt @@ -25,10 +25,10 @@ set(UI_fl_files include_directories(${CMAKE_CURRENT_BINARY_DIR}) set_source_files_properties(UI/MasterUI.h PROPERTIES GENERATED 1) -fltk_wrap_ui(zynaddsubfxguilib ${UI_fl_files}) +fltk_wrap_ui(zynaddsubfx_gui ${UI_fl_files}) -add_library(zynaddsubfxguilib STATIC +add_library(zynaddsubfx_gui STATIC ${UI_objs} - ${zynaddsubfxguilib_FLTK_UI_SRCS} + ${zynaddsubfx_gui_FLTK_UI_SRCS} ) -target_link_libraries(zynaddsubfxguilib) +target_link_libraries(zynaddsubfx_gui) diff --git a/src/main.C b/src/main.C @@ -1,824 +0,0 @@ -/* - ZynAddSubFX - a software synthesizer - - main.c - Main file of the synthesizer - Copyright (C) 2002-2005 Nasca Octavian Paul - Author: Nasca Octavian Paul - - 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 - -*/ - -#include <stdio.h>//remove once iostream is used -#include <iostream> - -#include <unistd.h> -#include <pthread.h> - -#ifdef OS_LINUX -#include <getopt.h> -#elif OS_WINDOIWS -#include <winbase.h> -#include <windows.h> -#endif - -#include "Misc/Master.h" -#include "Misc/Util.h" -#include "Misc/Dump.h" -extern Dump dump; - -#ifdef ALSAMIDIIN -#include "Input/ALSAMidiIn.h" -#endif - -#ifdef OSSMIDIIN -#include "Input/OSSMidiIn.h" -#endif - -#if (defined(NONEMIDIIN)||defined(VSTMIDIIN)) -#include "Input/NULLMidiIn.h" -#endif - -#ifdef WINMIDIIN -#include "Input/WINMidiIn.h" -#endif - -#ifndef DISABLE_GUI -#include "UI/MasterUI.h" -MasterUI *ui; -#endif - -using namespace std; - -pthread_t thr1,thr2,thr3,thr4; -Master *master; -int swaplr=0;//1 for left-right swapping -bool usejackit=false; - -#ifdef JACKAUDIOOUT -#include "Output/JACKaudiooutput.h" -#endif - -#ifdef JACK_RTAUDIOOUT -#include "Output/JACKaudiooutput.h" -#endif - -#ifdef PAAUDIOOUT -#include "Output/PAaudiooutput.h" -#endif - -#ifdef OSSAUDIOOUT -#include "Output/OSSaudiooutput.h" -OSSaudiooutput *audioout; -#endif - -#ifdef USE_LASH -#include "Misc/LASHClient.h" -LASHClient *lash; -#endif - -MidiIn *Midi; -int Pexitprogram=0;//if the UI set this to 1, the program will exit - -/* - * Try to get the realtime priority - */ -void set_realtime() -{ -#ifdef OS_LINUX - sched_param sc; - - sc.sched_priority=50; - - //if you want get "sched_setscheduler undeclared" from compilation, you can safely remove the folowing line - sched_setscheduler(0,SCHED_FIFO,&sc); -// if (err==0) printf("Real-time"); -#endif -}; - -/* - * Midi input thread - */ -#if !(defined(WINMIDIIN)||defined(VSTMIDIIN)) -void *thread1(void *arg) -{ - MidiCmdType cmdtype=MidiNoteOFF; - unsigned char cmdchan=0,note=0,vel=0; - int cmdparams[MP_MAX_BYTES]; - for (int i=0;i<MP_MAX_BYTES;++i) - cmdparams[i]=0; - - set_realtime(); - while (Pexitprogram==0) { - Midi->getmidicmd(cmdtype,cmdchan,cmdparams); - note=cmdparams[0]; - vel=cmdparams[1]; - - pthread_mutex_lock(&master->mutex); - - if ((cmdtype==MidiNoteON)&&(note!=0)) master->NoteOn(cmdchan,note,vel); - if ((cmdtype==MidiNoteOFF)&&(note!=0)) master->NoteOff(cmdchan,note); - if (cmdtype==MidiController) master->SetController(cmdchan,cmdparams[0],cmdparams[1]); - - pthread_mutex_unlock(&master->mutex); - }; - - return(0); -}; -#endif - -/* - * Wave output thread (for OSS AUDIO out) - */ -#if defined(OSSAUDIOOUT) -//!(defined(JACKAUDIOOUT)||defined(JACK_RTAUDIOOUT)||defined(PAAUDIOOUT)||defined(VSTAUDIOOUT)) - -void *thread2(void *arg) -{ - REALTYPE outputl[SOUND_BUFFER_SIZE]; - REALTYPE outputr[SOUND_BUFFER_SIZE]; - - set_realtime(); - while (Pexitprogram==0) { - pthread_mutex_lock(&master->mutex); - master->AudioOut(outputl,outputr); - pthread_mutex_unlock(&master->mutex); - -#ifndef NONEAUDIOOUT - audioout->OSSout(outputl,outputr); -#endif - - /** / int i,x,x2; - REALTYPE xx,xx2; - - short int xsmps[SOUND_BUFFER_SIZE*2]; - for (i=0;i<SOUND_BUFFER_SIZE;i++){//output to stdout - xx=-outputl[i]*32767; - xx2=-outputr[i]*32767; - if (xx<-32768) xx=-32768; - if (xx>32767) xx=32767; - if (xx2<-32768) xx2=-32768; - if (xx2>32767) xx2=32767; - x=(short int) xx; - x2=(short int) xx2; - xsmps[i*2]=x;xsmps[i*2+1]=x2; - }; - write(1,&xsmps,SOUND_BUFFER_SIZE*2*2); - - / * */ - }; - return(0); -}; -#endif - -/* - * User Interface thread - */ - - -void *thread3(void *arg) -{ -#ifndef DISABLE_GUI - ui->showUI(); - while (Pexitprogram==0) { -#ifdef USE_LASH - string filename; - switch (lash->checkevents(filename)) { - case LASHClient::Save: - ui->do_save_master(filename); - lash->confirmevent(LASHClient::Save); - break; - case LASHClient::Restore: - ui->do_load_master(filename); - lash->confirmevent(LASHClient::Restore); - break; - case LASHClient::Quit: - Pexitprogram = 1; - default: - break; - } -#endif - Fl::wait(); - } -#endif - return(0); -}; - -/* - * Sequencer thread (test) - */ -void *thread4(void *arg) -{ - while (Pexitprogram==0) { - int type,par1,par2,again,midichan; - for (int ntrack=0;ntrack<NUM_MIDI_TRACKS;ntrack++) { - if (master->seq.play==0) break; - do { - again=master->seq.getevent(ntrack,&midichan,&type,&par1,&par2); -// printf("ntrack=%d again=%d\n",ntrack,again); - if (type>0) { -// printf("%d %d %d %d %d\n",type,midichan,chan,par1,par2); - -// if (cmdtype==MidiController) master->SetController(cmdchan,cmdparams[0],cmdparams[1]); - - - - pthread_mutex_lock(&master->mutex); - if (type==1) {//note_on or note_off - if (par2!=0) master->NoteOn(midichan,par1,par2); - else master->NoteOff(midichan,par1); - }; - pthread_mutex_unlock(&master->mutex); - }; - } while (again>0); - - }; -//if (!realtime player) atunci fac asta -//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -#ifdef OS_LINUX - usleep(1000); -#elif OS_WINDOWS - Sleep(1); -#endif - }; - - return(0); -}; - -/* - * Program initialisation - */ - - -void initprogram() -{ - cerr.precision(1); - cerr << std::fixed; -#ifndef JACKAUDIOOUT -#ifndef JACK_RTAUDIOOUT - cerr << "\nSample Rate = \t\t" << SAMPLE_RATE << endl; -#endif -#endif - cerr << "Sound Buffer Size = \t" << SOUND_BUFFER_SIZE << " samples" << endl; - cerr << "Internal latency = \t" << SOUND_BUFFER_SIZE*1000.0/SAMPLE_RATE << " ms" << endl; - cerr << "ADsynth Oscil.Size = \t" << OSCIL_SIZE << " samples" << endl; - - //fflush(stderr); - srand(time(NULL)); - denormalkillbuf=new REALTYPE [SOUND_BUFFER_SIZE]; - for (int i=0;i<SOUND_BUFFER_SIZE;i++) denormalkillbuf[i]=(RND-0.5)*1e-16; - - OscilGen::tmpsmps=new REALTYPE[OSCIL_SIZE]; - newFFTFREQS(&OscilGen::outoscilFFTfreqs,OSCIL_SIZE/2); - - master=new Master(); - master->swaplr=swaplr; - -#if defined(JACKAUDIOOUT) - if (usejackit) { - bool tmp=JACKaudiooutputinit(master); -#if defined(OSSAUDIOOUT) - if (!tmp) cout << "\nUsing OSS instead." << endl; -#else - if (!tmp) exit(1); -#endif - usejackit=tmp; - }; -#endif -#if defined(OSSAUDIOOUT) - if (!usejackit) audioout=new OSSaudiooutput(); - else audioout=NULL; -#endif - -#ifdef JACK_RTAUDIOOUT - JACKaudiooutputinit(master); -#endif -#ifdef PAAUDIOOUT - PAaudiooutputinit(master); -#endif - -#ifdef ALSAMIDIIN - Midi=new ALSAMidiIn(); -#endif -#ifdef OSSMIDIIN - Midi=new OSSMidiIn(); -#endif -#if (defined(NONEMIDIIN)||(defined(VSTMIDIIN))) - Midi=new NULLMidiIn(); -#endif -#ifndef DISABLE_GUI - ui=new MasterUI(master,&Pexitprogram); -#endif -}; - -/* - * Program exit - */ -void exitprogram() -{ - pthread_mutex_lock(&master->mutex); -#ifdef OSSAUDIOOUT - delete(audioout); -#endif -#ifdef JACKAUDIOOUT - if (usejackit) JACKfinish(); -#endif -#ifdef JACK_RTAUDIOOUT - JACKfinish(); -#endif -#ifdef PAAUDIOOUT - PAfinish(); -#endif - -#ifndef DISABLE_GUI - delete(ui); -#endif - delete(Midi); - delete(master); - -#ifdef USE_LASH - delete(lash); -#endif - -// pthread_mutex_unlock(&master->mutex); - delete [] denormalkillbuf; - delete [] OscilGen::tmpsmps; - deleteFFTFREQS(&OscilGen::outoscilFFTfreqs); - -}; - -#ifdef OS_WINDOWS -#define ARGSIZE 100 -char winoptarguments[ARGSIZE]; -char getopt(int argc, char *argv[], const char *shortopts, int *index) -{ - winoptarguments[0]=0; - char result=0; - - if (*index>=argc) return(-1); - - if (strlen(argv[*index])==2) - if (argv[*index][0]=='-') { - result=argv[*index][1]; - if (*index+1<argc) { - snprintf(winoptarguments,ARGSIZE,"%s",argv[*index+1]); - }; - }; - (*index)++; - return(result); -}; -int opterr=0; -#undef ARGSIZE - -#endif - -#ifndef VSTAUDIOOUT -int main(int argc, char *argv[]) -{ - -#ifdef USE_LASH - lash = new LASHClient(&argc, &argv); -#endif - - config.init(); - dump.startnow(); - int noui=0; -#ifdef JACKAUDIOOUT - usejackit=true;//use jack by default -#endif - cerr<<"\nZynAddSubFX - Copyright (c) 2002-2008 Nasca Octavian Paul and others"<<endl; - cerr << "Compiled: " << __DATE__ << " " << __TIME__ << endl; - cerr << "This program is free software (GNU GPL v.2 or later) and \n"; - cerr << "it comes with ABSOLUTELY NO WARRANTY.\n" << endl; -#ifdef OS_LINUX - if (argc==1) cerr << "Try 'zynaddsubfx --help' for command-line options." << endl; -#else - if (argc==1) cerr << "Try 'zynaddsubfx -h' for command-line options.\n" << endl; -#endif - /* Get the settings from the Config*/ - SAMPLE_RATE=config.cfg.SampleRate; - SOUND_BUFFER_SIZE=config.cfg.SoundBufferSize; - OSCIL_SIZE=config.cfg.OscilSize; - swaplr=config.cfg.SwapStereo; - - /* Parse command-line options */ -#ifdef OS_LINUX - struct option opts[]={ - {"load",2,NULL,'l'}, - {"load-instrument",2,NULL,'L'}, - {"sample-rate",2,NULL,'r'}, - {"buffer-size",2,NULL,'b'}, - {"oscil-size",2,NULL,'o'}, - {"dump",2,NULL,'D'}, - {"swap",2,NULL,'S'}, - {"no-gui",2,NULL,'U'}, - {"not-use-jack",2,NULL,'A'}, - {"dummy",2,NULL,'Y'}, - {"help",2,NULL,'h'}, - {0,0,0,0} - }; -#endif - opterr=0; - int option_index=0,opt,exitwithhelp=0; - - char loadfile[1001]; - ZERO(loadfile,1001); - char loadinstrument[1001]; - ZERO(loadinstrument,1001); - - while (1) { - /**\todo check this process for a small memory leak*/ -#ifdef OS_LINUX - opt=getopt_long(argc,argv,"l:L:r:b:o:hSDUAY",opts,&option_index); - char *optarguments=optarg; -#else - opt=getopt(argc,argv,"l:L:r:b:o:hSDUAY",&option_index); - char *optarguments=&winoptarguments[0]; -#endif - - if (opt==-1) break; - - int tmp; - switch (opt) { - case 'h': - exitwithhelp=1; - break; - case 'Y':/* this command a dummy command (has NO effect) - and is used because I need for NSIS installer - (NSIS sometimes forces a command line for a - program, even if I don't need that; eg. when - I want to add a icon to a shortcut. - */ - break; - case 'U': - noui=1; - break; - case 'A': -#ifdef JACKAUDIOOUT -#ifdef OSSAUDIOOUT - usejackit=false; -#endif -#endif - break; - case 'l': - tmp=0; - if (optarguments!=NULL) { - snprintf(loadfile,1000,"%s",optarguments); - }; - break; - case 'L': - tmp=0; - if (optarguments!=NULL) { - snprintf(loadinstrument,1000,"%s",optarguments); - }; - break; - case 'r': - tmp=0; - if (optarguments!=NULL) tmp=atoi(optarguments); - if (tmp>=4000) { - SAMPLE_RATE=tmp; - } else { - cerr << "ERROR:Incorrect sample rate: " << optarguments << endl; - exit(1); - }; - break; - case 'b': - tmp=0; - if (optarguments!=NULL) tmp=atoi(optarguments); - if (tmp>=2) { - SOUND_BUFFER_SIZE=tmp; - } else { - cerr << "ERROR:Incorrect buffer size: " << optarguments << endl; - exit(1); - }; - break; - case 'o': - tmp=0; - if (optarguments!=NULL) tmp=atoi(optarguments); - OSCIL_SIZE=tmp; - if (OSCIL_SIZE<MAX_AD_HARMONICS*2) OSCIL_SIZE=MAX_AD_HARMONICS*2; - OSCIL_SIZE=(int) pow(2,ceil(log (OSCIL_SIZE-1.0)/log(2.0))); - if (tmp!=OSCIL_SIZE) { - cerr << "\nOSCIL_SIZE is wrong (must be 2^n) or too small. Adjusting to "; - cerr << OSCIL_SIZE << "." << endl; - } - break; - case 'S': - swaplr=1; - break; - case 'D': - dump.startnow(); - break; - case '?': - cerr << "ERROR:Bad option or parameter.\n" << endl; - exitwithhelp=1; - break; - }; - }; - - if (exitwithhelp!=0) { - cout << "Usage: zynaddsubfx [OPTION]\n" << endl; - cout << " -h , --help \t\t\t\t display command-line help and exit" << endl; - cout << " -l file, --load=FILE\t\t\t loads a .xmz file" << endl; - cout << " -L file, --load-instrument=FILE\t\t loads a .xiz file" << endl; - cout << " -r SR, --sample-rate=SR\t\t set the sample rate SR" << endl; - cout << " -b BS, --buffer-size=SR\t\t set the buffer size (granularity)" << endl; - cout << " -o OS, --oscil-size=OS\t\t set the ADsynth oscil. size" << endl; - cout << " -S , --swap\t\t\t\t swap Left <--> Right" << endl; - cout << " -D , --dump\t\t\t\t Dumps midi note ON/OFF commands" << endl; - cout << " -U , --no-gui\t\t\t\t Run ZynAddSubFX without user interface" << endl; -#ifdef JACKAUDIOOUT -#ifdef OSSAUDIOOUT - cout << " -A , --not-use-jack\t\t\t Use OSS/ALSA instead of JACK" << endl; -#endif -#endif -#ifdef OS_WINDOWS - cout << "\nWARNING: On Windows systems, only short comandline parameters works." << endl; - cout << " eg. instead '--buffer-size=512' use '-b 512'" << endl; -#endif - cout << '\n' << endl; - return(0); - }; - - //--------- - - initprogram(); - -#ifdef USE_LASH -#ifdef ALSAMIDIIN - ALSAMidiIn* alsamidi = dynamic_cast<ALSAMidiIn*>(Midi); - if (alsamidi) - lash->setalsaid(alsamidi->getalsaid()); -#endif -#ifdef JACKAUDIOOUT - lash->setjackname(JACKgetname()); -#endif -#endif - - if (strlen(loadfile)>1) { - int tmp=master->loadXML(loadfile); - if (tmp<0) { - fprintf(stderr,"ERROR:Could not load master file %s .\n",loadfile); - exit(1); - } else { - master->applyparameters(); -#ifndef DISABLE_GUI - if (noui==0) ui->refresh_master_ui(); -#endif - cout << "Master file loaded." << endl; - }; - }; - - if (strlen(loadinstrument)>1) { - int loadtopart=0; - int tmp=master->part[loadtopart]->loadXMLinstrument(loadinstrument); - if (tmp<0) { - cerr << "ERROR:Could not load instrument file " << loadinstrument << '.' << endl; - exit(1); - } else { - master->part[loadtopart]->applyparameters(); -#ifndef DISABLE_GUI - if (noui==0) ui->refresh_master_ui(); -#endif - cout << "Instrument file loaded." << endl; - }; - }; - - -#if !(defined(NONEMIDIIN)||defined(WINMIDIIN)||defined(VSTMIDIIN)) - pthread_create(&thr1,NULL,thread1,NULL); -#endif - -#ifdef OSSAUDIOOUT -//!(defined(JACKAUDIOOUT)||defined(JACK_RTAUDIOOUT)||defined(PAAUDIOOUT)||defined(VSTAUDIOOUT)) - if (!usejackit) pthread_create(&thr2,NULL,thread2,NULL); -#endif - - /*It is not working and I don't know why - //drop the suid-root permisions - #if !(defined(JACKAUDIOOUT)||defined(PAAUDIOOUT)||defined(VSTAUDIOOUT)|| (defined (WINMIDIIN)) ) - setuid(getuid()); - seteuid(getuid()); - // setreuid(getuid(),getuid()); - // setregid(getuid(),getuid()); - #endif - */ - if (noui==0) pthread_create(&thr3,NULL,thread3,NULL); - - pthread_create(&thr4,NULL,thread4,NULL); -#ifdef WINMIDIIN - InitWinMidi(master); -#endif - - while (Pexitprogram==0) { -#ifdef OS_LINUX - usleep(100000); -#elif OS_WINDOWS - Sleep(100); -#endif - }; - -#ifdef WINMIDIIN - StopWinMidi(); -#endif - - exitprogram(); - return(0); -}; - - -#else - -#include "Output/VSTaudiooutput.h" - -#define main main_plugin -extern "C" __declspec(dllexport) AEffect *main_plugin(audioMasterCallback audioMaster); - -int instances=-1; - -AEffect *main (audioMasterCallback audioMaster) -{ -// if (audioMaster(0,audioMasterVersion,0,0,0,0)!=0) { -// return(0); -// }; - - if (instances==-1) { - Midi=new NULLMidiIn(); - denormalkillbuf=new REALTYPE [SOUND_BUFFER_SIZE]; - for (int i=0;i<SOUND_BUFFER_SIZE;i++) denormalkillbuf[i]=(RND-0.5)*1e-16; - instances=0; - }; - - if (instances!=0) return(0);//don't allow multiple instances - - AudioEffect *sintetizator=new VSTSynth(audioMaster); - - return sintetizator->getAeffect(); -}; - -void* hInstance; -BOOL WINAPI DllMain (HINSTANCE hInst,DWORD dwReason,LPVOID lpvReserved) -{ - hInstance=hInst; - return(1); -}; - -void *thread(void *arg) -{ - VSTSynth *vs=(VSTSynth *) arg; - - /* FILE *a=fopen("aaaa1","a"); - fprintf(a,"%lx %lx %lx -i=%d\n",vs,0,vs->vmaster,instances); - fflush(a);fclose(a); - */ - - vs->ui=new MasterUI(vs->vmaster,&vs->Pexitprogram); - - /* a=fopen("aaaa1","a"); - fprintf(a,"%lx %lx %lx\n",vs,vs->ui->master,vs->vmaster); - fflush(a);fclose(a); - */ - - vs->ui->showUI(); - - /* a=fopen("aaaa1","a"); - fprintf(a,"%lx %lx %lx\n",vs,vs->ui,vs->vmaster); - fflush(a);fclose(a); - */ - - while (vs->Pexitprogram==0) Fl::wait(0.01); - - delete(vs->ui); - Fl::wait(0.01); - - /* a=fopen("aaaa1","a"); - fprintf(a,"EXIT\n"); - fflush(a);fclose(a); - */ - - - pthread_exit(0); - return(0); -}; - -//Parts of the VSTSynth class -VSTSynth::VSTSynth (audioMasterCallback audioMaster):AudioEffectX(audioMaster,1,0) -{ - instances++; - - if (audioMaster) { - setNumInputs(0); - setNumOutputs(2); - setUniqueID('ZASF'); - canProcessReplacing(); -// hasVu(false); -// hasClip(false); - - isSynth(true); - - programsAreChunks(true); - - }; - - - SAMPLE_RATE=config.cfg.SampleRate; - SOUND_BUFFER_SIZE=config.cfg.SoundBufferSize; - OSCIL_SIZE=config.cfg.OscilSize; - swaplr=config.cfg.SwapStereo; - this->Pexitprogram=0; - - this->vmaster=new Master(); - this->vmaster->swaplr=swaplr; - - -// FILE *a=fopen("aaaa0","a"); -// fprintf(a,"%lx %lx %lx\n",this,this->ui,this->ui->masterwindow); -// fflush(a);fclose(a); - - pthread_create(&this->thr,NULL,thread,this); - -// suspend(); - -}; - - - -VSTSynth::~VSTSynth() -{ - this->Pexitprogram=1; - - Sleep(200);//wait the thread to finish - -// pthread_mutex_lock(&vmaster->mutex); - - - delete(this->vmaster); - - instances--; -}; - -long VSTSynth::processEvents(VstEvents *events) -{ - for (int i=0;i<events->numEvents;i++) { - - //debug stuff -// FILE *a=fopen("events","a"); -// fprintf(a,"%lx\n",events->events[i]->type); -// fflush(a);fclose(a); - - if ((events->events[i])->type != kVstMidiType) continue; - VstMidiEvent *ev= (VstMidiEvent*) events->events[i]; - unsigned char *data= (unsigned char *)ev->midiData; - int status=data[0]/16; - int cmdchan=data[0]&0x0f; - int cntl; - - pthread_mutex_lock(&vmaster->mutex); - switch (status) { - case 0x8: - vmaster->NoteOff(cmdchan,data[1]&0x7f); - break; - case 0x9: - if (data[2]==0) vmaster->NoteOff(cmdchan,data[1]&0x7f); - else vmaster->NoteOn(cmdchan,data[1]&0x7f,data[2]&0x7f); - break; - case 0xB: - cntl=Midi->getcontroller(data[1]&0x7f); - vmaster->SetController(cmdchan,cntl,data[2]&0x7f); - break; - case 0xE: - vmaster->SetController(cmdchan,C_pitchwheel,data[1]+data[2]*(long int) 128-8192); - break; - }; - pthread_mutex_unlock(&vmaster->mutex); - - }; - - return(1); -}; - -long VSTSynth::getChunk(void** data,bool isPreset) -{ - int size=0; - size=vmaster->getalldata((char **)data); - return((long)size); -}; - -long VSTSynth::setChunk(void *data,long size,bool isPreset) -{ - vmaster->putalldata((char*)data,size); - return(0); -}; -#endif - diff --git a/src/main.cpp b/src/main.cpp @@ -0,0 +1,846 @@ +/* + ZynAddSubFX - a software synthesizer + + main.c - Main file of the synthesizer + Copyright (C) 2002-2005 Nasca Octavian Paul + Author: Nasca Octavian Paul + + 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 + +*/ + +#include <stdio.h>//remove once iostream is used +#include <iostream> + +#include <unistd.h> +#include <pthread.h> + +#ifdef OS_LINUX +#include <getopt.h> +#elif OS_WINDOIWS +#include <winbase.h> +#include <windows.h> +#endif + +#include "Misc/Master.h" +#include "Misc/Util.h" +#include "Misc/Dump.h" +extern Dump dump; + +#ifdef ALSAMIDIIN +#include "Input/ALSAMidiIn.h" +#endif + +#ifdef OSSMIDIIN +#include "Input/OSSMidiIn.h" +#endif + +#if (defined(NONEMIDIIN)||defined(VSTMIDIIN)) +#include "Input/NULLMidiIn.h" +#endif + +#ifdef WINMIDIIN +#include "Input/WINMidiIn.h" +#endif + +#ifndef DISABLE_GUI +#ifdef QT_GUI + +#include <QApplication> +#include "masterui.h" +QApplication *app; + +#elif defined FLTK_GUI + +#include "UI/MasterUI.h" +#endif // FLTK_GUI + +MasterUI *ui; + +#endif //DISABLE_GUI + +using namespace std; + +pthread_t thr1,thr2,thr3,thr4; +Master *master; +int swaplr=0;//1 for left-right swapping +bool usejackit=false; + +#ifdef JACKAUDIOOUT +#include "Output/JACKaudiooutput.h" +#endif + +#ifdef JACK_RTAUDIOOUT +#include "Output/JACKaudiooutput.h" +#endif + +#ifdef PAAUDIOOUT +#include "Output/PAaudiooutput.h" +#endif + +#ifdef OSSAUDIOOUT +#include "Output/OSSaudiooutput.h" +OSSaudiooutput *audioout; +#endif + +#ifdef USE_LASH +#include "Misc/LASHClient.h" +LASHClient *lash; +#endif + +MidiIn *Midi; +int Pexitprogram=0;//if the UI set this to 1, the program will exit + +/* + * Try to get the realtime priority + */ +void set_realtime() +{ +#ifdef OS_LINUX + sched_param sc; + + sc.sched_priority=50; + + //if you want get "sched_setscheduler undeclared" from compilation, you can safely remove the folowing line + sched_setscheduler(0,SCHED_FIFO,&sc); +// if (err==0) printf("Real-time"); +#endif +}; + +/* + * Midi input thread + */ +#if !(defined(WINMIDIIN)||defined(VSTMIDIIN)) +void *thread1(void *arg) +{ + MidiCmdType cmdtype=MidiNoteOFF; + unsigned char cmdchan=0,note=0,vel=0; + int cmdparams[MP_MAX_BYTES]; + for (int i=0;i<MP_MAX_BYTES;++i) + cmdparams[i]=0; + + set_realtime(); + while (Pexitprogram==0) { + Midi->getmidicmd(cmdtype,cmdchan,cmdparams); + note=cmdparams[0]; + vel=cmdparams[1]; + + pthread_mutex_lock(&master->mutex); + + if ((cmdtype==MidiNoteON)&&(note!=0)) master->NoteOn(cmdchan,note,vel); + if ((cmdtype==MidiNoteOFF)&&(note!=0)) master->NoteOff(cmdchan,note); + if (cmdtype==MidiController) master->SetController(cmdchan,cmdparams[0],cmdparams[1]); + + pthread_mutex_unlock(&master->mutex); + }; + + return(0); +}; +#endif + +/* + * Wave output thread (for OSS AUDIO out) + */ +#if defined(OSSAUDIOOUT) +//!(defined(JACKAUDIOOUT)||defined(JACK_RTAUDIOOUT)||defined(PAAUDIOOUT)||defined(VSTAUDIOOUT)) + +void *thread2(void *arg) +{ + REALTYPE outputl[SOUND_BUFFER_SIZE]; + REALTYPE outputr[SOUND_BUFFER_SIZE]; + + set_realtime(); + while (Pexitprogram==0) { + pthread_mutex_lock(&master->mutex); + master->AudioOut(outputl,outputr); + pthread_mutex_unlock(&master->mutex); + +#ifndef NONEAUDIOOUT + audioout->OSSout(outputl,outputr); +#endif + + /** / int i,x,x2; + REALTYPE xx,xx2; + + short int xsmps[SOUND_BUFFER_SIZE*2]; + for (i=0;i<SOUND_BUFFER_SIZE;i++){//output to stdout + xx=-outputl[i]*32767; + xx2=-outputr[i]*32767; + if (xx<-32768) xx=-32768; + if (xx>32767) xx=32767; + if (xx2<-32768) xx2=-32768; + if (xx2>32767) xx2=32767; + x=(short int) xx; + x2=(short int) xx2; + xsmps[i*2]=x;xsmps[i*2+1]=x2; + }; + write(1,&xsmps,SOUND_BUFFER_SIZE*2*2); + + / * */ + }; + return(0); +}; +#endif + +/* + * User Interface thread + */ + + +void *thread3(void *arg) +{ +#ifndef DISABLE_GUI + +#ifdef FLTK_GUI + ui->showUI(); + + while (Pexitprogram==0) { +#ifdef USE_LASH + string filename; + switch (lash->checkevents(filename)) { + case LASHClient::Save: + ui->do_save_master(filename); + lash->confirmevent(LASHClient::Save); + break; + case LASHClient::Restore: + ui->do_load_master(filename); + lash->confirmevent(LASHClient::Restore); + break; + case LASHClient::Quit: + Pexitprogram = 1; + default: + break; + } +#endif //USE_LASH + Fl::wait(); + } + +#elif defined QT_GUI + app = new QApplication(0, 0); + ui=new MasterUI(master, 0); + ui->show(); + app->exec(); +#endif //defined QT_GUI + +#endif //DISABLE_GUI + return(0); +}; + +/* + * Sequencer thread (test) + */ +void *thread4(void *arg) +{ + while (Pexitprogram==0) { + int type,par1,par2,again,midichan; + for (int ntrack=0;ntrack<NUM_MIDI_TRACKS;ntrack++) { + if (master->seq.play==0) break; + do { + again=master->seq.getevent(ntrack,&midichan,&type,&par1,&par2); +// printf("ntrack=%d again=%d\n",ntrack,again); + if (type>0) { +// printf("%d %d %d %d %d\n",type,midichan,chan,par1,par2); + +// if (cmdtype==MidiController) master->SetController(cmdchan,cmdparams[0],cmdparams[1]); + + + + pthread_mutex_lock(&master->mutex); + if (type==1) {//note_on or note_off + if (par2!=0) master->NoteOn(midichan,par1,par2); + else master->NoteOff(midichan,par1); + }; + pthread_mutex_unlock(&master->mutex); + }; + } while (again>0); + + }; +//if (!realtime player) atunci fac asta +//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +#ifdef OS_LINUX + usleep(1000); +#elif OS_WINDOWS + Sleep(1); +#endif + }; + + return(0); +}; + +/* + * Program initialisation + */ + + +void initprogram() +{ + cerr.precision(1); + cerr << std::fixed; +#ifndef JACKAUDIOOUT +#ifndef JACK_RTAUDIOOUT + cerr << "\nSample Rate = \t\t" << SAMPLE_RATE << endl; +#endif +#endif + cerr << "Sound Buffer Size = \t" << SOUND_BUFFER_SIZE << " samples" << endl; + cerr << "Internal latency = \t" << SOUND_BUFFER_SIZE*1000.0/SAMPLE_RATE << " ms" << endl; + cerr << "ADsynth Oscil.Size = \t" << OSCIL_SIZE << " samples" << endl; + + //fflush(stderr); + srand(time(NULL)); + denormalkillbuf=new REALTYPE [SOUND_BUFFER_SIZE]; + for (int i=0;i<SOUND_BUFFER_SIZE;i++) denormalkillbuf[i]=(RND-0.5)*1e-16; + + OscilGen::tmpsmps=new REALTYPE[OSCIL_SIZE]; + newFFTFREQS(&OscilGen::outoscilFFTfreqs,OSCIL_SIZE/2); + + master=new Master(); + master->swaplr=swaplr; + +#if defined(JACKAUDIOOUT) + if (usejackit) { + bool tmp=JACKaudiooutputinit(master); +#if defined(OSSAUDIOOUT) + if (!tmp) cout << "\nUsing OSS instead." << endl; +#else + if (!tmp) exit(1); +#endif + usejackit=tmp; + }; +#endif +#if defined(OSSAUDIOOUT) + if (!usejackit) audioout=new OSSaudiooutput(); + else audioout=NULL; +#endif + +#ifdef JACK_RTAUDIOOUT + JACKaudiooutputinit(master); +#endif +#ifdef PAAUDIOOUT + PAaudiooutputinit(master); +#endif + +#ifdef ALSAMIDIIN + Midi=new ALSAMidiIn(); +#endif +#ifdef OSSMIDIIN + Midi=new OSSMidiIn(); +#endif +#if (defined(NONEMIDIIN)||(defined(VSTMIDIIN))) + Midi=new NULLMidiIn(); +#endif +#ifndef DISABLE_GUI + ui=new MasterUI(master,&Pexitprogram); +#endif +}; + +/* + * Program exit + */ +void exitprogram() +{ + pthread_mutex_lock(&master->mutex); +#ifdef OSSAUDIOOUT + delete(audioout); +#endif +#ifdef JACKAUDIOOUT + if (usejackit) JACKfinish(); +#endif +#ifdef JACK_RTAUDIOOUT + JACKfinish(); +#endif +#ifdef PAAUDIOOUT + PAfinish(); +#endif + +#ifndef DISABLE_GUI + delete(ui); +#endif + delete(Midi); + delete(master); + +#ifdef USE_LASH + delete(lash); +#endif + +// pthread_mutex_unlock(&master->mutex); + delete [] denormalkillbuf; + delete [] OscilGen::tmpsmps; + deleteFFTFREQS(&OscilGen::outoscilFFTfreqs); + +}; + +#ifdef OS_WINDOWS +#define ARGSIZE 100 +char winoptarguments[ARGSIZE]; +char getopt(int argc, char *argv[], const char *shortopts, int *index) +{ + winoptarguments[0]=0; + char result=0; + + if (*index>=argc) return(-1); + + if (strlen(argv[*index])==2) + if (argv[*index][0]=='-') { + result=argv[*index][1]; + if (*index+1<argc) { + snprintf(winoptarguments,ARGSIZE,"%s",argv[*index+1]); + }; + }; + (*index)++; + return(result); +}; +int opterr=0; +#undef ARGSIZE + +#endif + +#ifndef VSTAUDIOOUT +int main(int argc, char *argv[]) +{ + +#ifdef USE_LASH + lash = new LASHClient(&argc, &argv); +#endif + + config.init(); + dump.startnow(); + int noui=0; +#ifdef JACKAUDIOOUT + usejackit=true;//use jack by default +#endif + cerr<<"\nZynAddSubFX - Copyright (c) 2002-2008 Nasca Octavian Paul and others"<<endl; + cerr << "Compiled: " << __DATE__ << " " << __TIME__ << endl; + cerr << "This program is free software (GNU GPL v.2 or later) and \n"; + cerr << "it comes with ABSOLUTELY NO WARRANTY.\n" << endl; +#ifdef OS_LINUX + if (argc==1) cerr << "Try 'zynaddsubfx --help' for command-line options." << endl; +#else + if (argc==1) cerr << "Try 'zynaddsubfx -h' for command-line options.\n" << endl; +#endif + /* Get the settings from the Config*/ + SAMPLE_RATE=config.cfg.SampleRate; + SOUND_BUFFER_SIZE=config.cfg.SoundBufferSize; + OSCIL_SIZE=config.cfg.OscilSize; + swaplr=config.cfg.SwapStereo; + + /* Parse command-line options */ +#ifdef OS_LINUX + struct option opts[]={ + {"load",2,NULL,'l'}, + {"load-instrument",2,NULL,'L'}, + {"sample-rate",2,NULL,'r'}, + {"buffer-size",2,NULL,'b'}, + {"oscil-size",2,NULL,'o'}, + {"dump",2,NULL,'D'}, + {"swap",2,NULL,'S'}, + {"no-gui",2,NULL,'U'}, + {"not-use-jack",2,NULL,'A'}, + {"dummy",2,NULL,'Y'}, + {"help",2,NULL,'h'}, + {0,0,0,0} + }; +#endif + opterr=0; + int option_index=0,opt,exitwithhelp=0; + + char loadfile[1001]; + ZERO(loadfile,1001); + char loadinstrument[1001]; + ZERO(loadinstrument,1001); + + while (1) { + /**\todo check this process for a small memory leak*/ +#ifdef OS_LINUX + opt=getopt_long(argc,argv,"l:L:r:b:o:hSDUAY",opts,&option_index); + char *optarguments=optarg; +#else + opt=getopt(argc,argv,"l:L:r:b:o:hSDUAY",&option_index); + char *optarguments=&winoptarguments[0]; +#endif + + if (opt==-1) break; + + int tmp; + switch (opt) { + case 'h': + exitwithhelp=1; + break; + case 'Y':/* this command a dummy command (has NO effect) + and is used because I need for NSIS installer + (NSIS sometimes forces a command line for a + program, even if I don't need that; eg. when + I want to add a icon to a shortcut. + */ + break; + case 'U': + noui=1; + break; + case 'A': +#ifdef JACKAUDIOOUT +#ifdef OSSAUDIOOUT + usejackit=false; +#endif +#endif + break; + case 'l': + tmp=0; + if (optarguments!=NULL) { + snprintf(loadfile,1000,"%s",optarguments); + }; + break; + case 'L': + tmp=0; + if (optarguments!=NULL) { + snprintf(loadinstrument,1000,"%s",optarguments); + }; + break; + case 'r': + tmp=0; + if (optarguments!=NULL) tmp=atoi(optarguments); + if (tmp>=4000) { + SAMPLE_RATE=tmp; + } else { + cerr << "ERROR:Incorrect sample rate: " << optarguments << endl; + exit(1); + }; + break; + case 'b': + tmp=0; + if (optarguments!=NULL) tmp=atoi(optarguments); + if (tmp>=2) { + SOUND_BUFFER_SIZE=tmp; + } else { + cerr << "ERROR:Incorrect buffer size: " << optarguments << endl; + exit(1); + }; + break; + case 'o': + tmp=0; + if (optarguments!=NULL) tmp=atoi(optarguments); + OSCIL_SIZE=tmp; + if (OSCIL_SIZE<MAX_AD_HARMONICS*2) OSCIL_SIZE=MAX_AD_HARMONICS*2; + OSCIL_SIZE=(int) pow(2,ceil(log (OSCIL_SIZE-1.0)/log(2.0))); + if (tmp!=OSCIL_SIZE) { + cerr << "\nOSCIL_SIZE is wrong (must be 2^n) or too small. Adjusting to "; + cerr << OSCIL_SIZE << "." << endl; + } + break; + case 'S': + swaplr=1; + break; + case 'D': + dump.startnow(); + break; + case '?': + cerr << "ERROR:Bad option or parameter.\n" << endl; + exitwithhelp=1; + break; + }; + }; + + if (exitwithhelp!=0) { + cout << "Usage: zynaddsubfx [OPTION]\n" << endl; + cout << " -h , --help \t\t\t\t display command-line help and exit" << endl; + cout << " -l file, --load=FILE\t\t\t loads a .xmz file" << endl; + cout << " -L file, --load-instrument=FILE\t\t loads a .xiz file" << endl; + cout << " -r SR, --sample-rate=SR\t\t set the sample rate SR" << endl; + cout << " -b BS, --buffer-size=SR\t\t set the buffer size (granularity)" << endl; + cout << " -o OS, --oscil-size=OS\t\t set the ADsynth oscil. size" << endl; + cout << " -S , --swap\t\t\t\t swap Left <--> Right" << endl; + cout << " -D , --dump\t\t\t\t Dumps midi note ON/OFF commands" << endl; + cout << " -U , --no-gui\t\t\t\t Run ZynAddSubFX without user interface" << endl; +#ifdef JACKAUDIOOUT +#ifdef OSSAUDIOOUT + cout << " -A , --not-use-jack\t\t\t Use OSS/ALSA instead of JACK" << endl; +#endif +#endif +#ifdef OS_WINDOWS + cout << "\nWARNING: On Windows systems, only short comandline parameters works." << endl; + cout << " eg. instead '--buffer-size=512' use '-b 512'" << endl; +#endif + cout << '\n' << endl; + return(0); + }; + + //--------- + + initprogram(); + +#ifdef USE_LASH +#ifdef ALSAMIDIIN + ALSAMidiIn* alsamidi = dynamic_cast<ALSAMidiIn*>(Midi); + if (alsamidi) + lash->setalsaid(alsamidi->getalsaid()); +#endif +#ifdef JACKAUDIOOUT + lash->setjackname(JACKgetname()); +#endif +#endif + + if (strlen(loadfile)>1) { + int tmp=master->loadXML(loadfile); + if (tmp<0) { + fprintf(stderr,"ERROR:Could not load master file %s .\n",loadfile); + exit(1); + } else { + master->applyparameters(); +#ifndef DISABLE_GUI + if (noui==0) ui->refresh_master_ui(); +#endif + cout << "Master file loaded." << endl; + }; + }; + + if (strlen(loadinstrument)>1) { + int loadtopart=0; + int tmp=master->part[loadtopart]->loadXMLinstrument(loadinstrument); + if (tmp<0) { + cerr << "ERROR:Could not load instrument file " << loadinstrument << '.' << endl; + exit(1); + } else { + master->part[loadtopart]->applyparameters(); +#ifndef DISABLE_GUI + if (noui==0) ui->refresh_master_ui(); +#endif + cout << "Instrument file loaded." << endl; + }; + }; + + +#if !(defined(NONEMIDIIN)||defined(WINMIDIIN)||defined(VSTMIDIIN)) + pthread_create(&thr1,NULL,thread1,NULL); +#endif + +#ifdef OSSAUDIOOUT +//!(defined(JACKAUDIOOUT)||defined(JACK_RTAUDIOOUT)||defined(PAAUDIOOUT)||defined(VSTAUDIOOUT)) + if (!usejackit) pthread_create(&thr2,NULL,thread2,NULL); +#endif + + /*It is not working and I don't know why + //drop the suid-root permisions + #if !(defined(JACKAUDIOOUT)||defined(PAAUDIOOUT)||defined(VSTAUDIOOUT)|| (defined (WINMIDIIN)) ) + setuid(getuid()); + seteuid(getuid()); + // setreuid(getuid(),getuid()); + // setregid(getuid(),getuid()); + #endif + */ + if (noui==0) pthread_create(&thr3,NULL,thread3,NULL); + + pthread_create(&thr4,NULL,thread4,NULL); +#ifdef WINMIDIIN + InitWinMidi(master); +#endif + + while (Pexitprogram==0) { +#ifdef OS_LINUX + usleep(100000); +#elif OS_WINDOWS + Sleep(100); +#endif + }; + +#ifdef WINMIDIIN + StopWinMidi(); +#endif + + exitprogram(); + return(0); +}; + + +#else + +#include "Output/VSTaudiooutput.h" + +#define main main_plugin +extern "C" __declspec(dllexport) AEffect *main_plugin(audioMasterCallback audioMaster); + +int instances=-1; + +AEffect *main (audioMasterCallback audioMaster) +{ +// if (audioMaster(0,audioMasterVersion,0,0,0,0)!=0) { +// return(0); +// }; + + if (instances==-1) { + Midi=new NULLMidiIn(); + denormalkillbuf=new REALTYPE [SOUND_BUFFER_SIZE]; + for (int i=0;i<SOUND_BUFFER_SIZE;i++) denormalkillbuf[i]=(RND-0.5)*1e-16; + instances=0; + }; + + if (instances!=0) return(0);//don't allow multiple instances + + AudioEffect *sintetizator=new VSTSynth(audioMaster); + + return sintetizator->getAeffect(); +}; + +void* hInstance; +BOOL WINAPI DllMain (HINSTANCE hInst,DWORD dwReason,LPVOID lpvReserved) +{ + hInstance=hInst; + return(1); +}; + +void *thread(void *arg) +{ + VSTSynth *vs=(VSTSynth *) arg; + + /* FILE *a=fopen("aaaa1","a"); + fprintf(a,"%lx %lx %lx -i=%d\n",vs,0,vs->vmaster,instances); + fflush(a);fclose(a); + */ + + vs->ui=new MasterUI(vs->vmaster,&vs->Pexitprogram); + + /* a=fopen("aaaa1","a"); + fprintf(a,"%lx %lx %lx\n",vs,vs->ui->master,vs->vmaster); + fflush(a);fclose(a); + */ + + vs->ui->showUI(); + + /* a=fopen("aaaa1","a"); + fprintf(a,"%lx %lx %lx\n",vs,vs->ui,vs->vmaster); + fflush(a);fclose(a); + */ + + while (vs->Pexitprogram==0) Fl::wait(0.01); + + delete(vs->ui); + Fl::wait(0.01); + + /* a=fopen("aaaa1","a"); + fprintf(a,"EXIT\n"); + fflush(a);fclose(a); + */ + + + pthread_exit(0); + return(0); +}; + +//Parts of the VSTSynth class +VSTSynth::VSTSynth (audioMasterCallback audioMaster):AudioEffectX(audioMaster,1,0) +{ + instances++; + + if (audioMaster) { + setNumInputs(0); + setNumOutputs(2); + setUniqueID('ZASF'); + canProcessReplacing(); +// hasVu(false); +// hasClip(false); + + isSynth(true); + + programsAreChunks(true); + + }; + + + SAMPLE_RATE=config.cfg.SampleRate; + SOUND_BUFFER_SIZE=config.cfg.SoundBufferSize; + OSCIL_SIZE=config.cfg.OscilSize; + swaplr=config.cfg.SwapStereo; + this->Pexitprogram=0; + + this->vmaster=new Master(); + this->vmaster->swaplr=swaplr; + + +// FILE *a=fopen("aaaa0","a"); +// fprintf(a,"%lx %lx %lx\n",this,this->ui,this->ui->masterwindow); +// fflush(a);fclose(a); + + pthread_create(&this->thr,NULL,thread,this); + +// suspend(); + +}; + + + +VSTSynth::~VSTSynth() +{ + this->Pexitprogram=1; + + Sleep(200);//wait the thread to finish + +// pthread_mutex_lock(&vmaster->mutex); + + + delete(this->vmaster); + + instances--; +}; + +long VSTSynth::processEvents(VstEvents *events) +{ + for (int i=0;i<events->numEvents;i++) { + + //debug stuff +// FILE *a=fopen("events","a"); +// fprintf(a,"%lx\n",events->events[i]->type); +// fflush(a);fclose(a); + + if ((events->events[i])->type != kVstMidiType) continue; + VstMidiEvent *ev= (VstMidiEvent*) events->events[i]; + unsigned char *data= (unsigned char *)ev->midiData; + int status=data[0]/16; + int cmdchan=data[0]&0x0f; + int cntl; + + pthread_mutex_lock(&vmaster->mutex); + switch (status) { + case 0x8: + vmaster->NoteOff(cmdchan,data[1]&0x7f); + break; + case 0x9: + if (data[2]==0) vmaster->NoteOff(cmdchan,data[1]&0x7f); + else vmaster->NoteOn(cmdchan,data[1]&0x7f,data[2]&0x7f); + break; + case 0xB: + cntl=Midi->getcontroller(data[1]&0x7f); + vmaster->SetController(cmdchan,cntl,data[2]&0x7f); + break; + case 0xE: + vmaster->SetController(cmdchan,C_pitchwheel,data[1]+data[2]*(long int) 128-8192); + break; + }; + pthread_mutex_unlock(&vmaster->mutex); + + }; + + return(1); +}; + +long VSTSynth::getChunk(void** data,bool isPreset) +{ + int size=0; + size=vmaster->getalldata((char **)data); + return((long)size); +}; + +long VSTSynth::setChunk(void *data,long size,bool isPreset) +{ + vmaster->putalldata((char*)data,size); + return(0); +}; +#endif +