From e7b8f32d1a2e0f5c9d118353e33b0b15bdd69d24 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 4 Nov 2012 14:29:18 +0000 Subject: [PATCH] Continue rework, rename some files --- Makefile | 9 +- c++/Makefile.mk | 44 ++++++ c++/carla-backend/carla_backend.hpp | 12 +- c++/carla-discovery/Makefile | 37 +++-- c++/carla-discovery/Makefile.dbg | 91 ------------- c++/carla-discovery/carla-discovery.cpp | 126 ++++++++++++++---- c++/carla-discovery/carla-discovery.pro | 45 +++++++ .../qtcreator/carla-discovery.pro | 44 ------ .../DistrhoPluginInfo.h | 0 .../carla_engine.cpp | 0 .../carla_engine.hpp | 0 .../carla_engine_jack.cpp | 0 .../carla_engine_rtaudio.cpp | 0 .../carla_osc.cpp | 0 .../carla_osc.hpp | 0 .../carla_shared.cpp | 0 .../carla_shared.hpp | 0 .../carla_threads.cpp | 0 .../carla_threads.hpp | 0 .../distrho-plugin-toolkit/DistrhoPlugin.h | 0 .../DistrhoPluginMain.cpp | 0 .../distrho-plugin-toolkit/DistrhoUI.h | 0 .../distrho-plugin-toolkit/DistrhoUIMain.cpp | 0 .../distrho-plugin-toolkit/DistrhoUIOpenGL.h | 0 .../DistrhoUIOpenGLExt.h | 0 .../distrho-plugin-toolkit/DistrhoUIQt4.h | 0 .../distrho-plugin-toolkit/DistrhoUtils.h | 0 .../distrho-plugin-toolkit/distrho.doxygen | 0 .../src/DistrhoDefines.h | 0 .../src/DistrhoPlugin.cpp | 0 .../src/DistrhoPluginInternal.h | 0 .../src/DistrhoPluginJACK.cpp | 0 .../src/DistrhoPluginLADSPA+DSSI.cpp | 0 .../src/DistrhoPluginLV2.cpp | 0 .../src/DistrhoPluginLV2export.cpp | 0 .../src/DistrhoPluginVST.cpp | 0 .../distrho-plugin-toolkit/src/DistrhoUI.cpp | 0 .../src/DistrhoUIDSSI.cpp | 0 .../src/DistrhoUIInternal.h | 0 .../src/DistrhoUILV2.cpp | 0 .../src/DistrhoUIOpenGL.cpp | 0 .../src/DistrhoUIOpenGLExt.cpp | 0 .../src/DistrhoUIQt4.cpp | 0 .../distrho-plugin-toolkit/src/dssi | 0 .../distrho-plugin-toolkit/src/ladspa | 0 .../distrho-plugin-toolkit/src/lv2-sdk | 0 .../distrho-plugin-toolkit/src/pugl/pugl.h | 0 .../src/pugl/pugl_internal.h | 0 .../src/pugl/pugl_osx.m | 0 .../src/pugl/pugl_win.cpp | 0 .../src/pugl/pugl_x11.c | 0 .../rtaudio-4.0.11/Makefile.in | 0 .../rtaudio-4.0.11/RtAudio.cpp | 0 .../rtaudio-4.0.11/RtAudio.h | 0 .../rtaudio-4.0.11/RtError.h | 0 .../rtaudio-4.0.11/config/config.guess | 0 .../rtaudio-4.0.11/config/config.sub | 0 .../rtaudio-4.0.11/config/install.sh | 0 .../rtaudio-4.0.11/configure | 0 .../rtaudio-4.0.11/configure.ac | 0 .../contrib/python/pyrtaudio/PyRtAudioTest.py | 0 .../contrib/python/pyrtaudio/readme | 0 .../python/pyrtaudio/rtaudiomodule.cpp | 0 .../contrib/python/pyrtaudio/setup.py | 0 .../rtaudio-4.0.11/doc/doxygen/Doxyfile | 0 .../doc/doxygen/acknowledge.txt | 0 .../rtaudio-4.0.11/doc/doxygen/apinotes.txt | 0 .../rtaudio-4.0.11/doc/doxygen/compiling.txt | 0 .../rtaudio-4.0.11/doc/doxygen/duplex.txt | 0 .../rtaudio-4.0.11/doc/doxygen/error.txt | 0 .../rtaudio-4.0.11/doc/doxygen/footer.html | 0 .../rtaudio-4.0.11/doc/doxygen/header.html | 0 .../rtaudio-4.0.11/doc/doxygen/license.txt | 0 .../rtaudio-4.0.11/doc/doxygen/multi.txt | 0 .../rtaudio-4.0.11/doc/doxygen/playback.txt | 0 .../rtaudio-4.0.11/doc/doxygen/probe.txt | 0 .../rtaudio-4.0.11/doc/doxygen/recording.txt | 0 .../rtaudio-4.0.11/doc/doxygen/settings.txt | 0 .../rtaudio-4.0.11/doc/doxygen/tutorial.txt | 0 .../doc/html/RtAudio_8h-source.html | 0 .../rtaudio-4.0.11/doc/html/RtAudio_8h.html | 0 .../doc/html/RtAudio_8h_source.html | 0 .../doc/html/RtError_8h-source.html | 0 .../doc/html/RtError_8h_source.html | 0 .../rtaudio-4.0.11/doc/html/acknowledge.html | 0 .../rtaudio-4.0.11/doc/html/annotated.html | 0 .../rtaudio-4.0.11/doc/html/apinotes.html | 0 .../rtaudio-4.0.11/doc/html/bugs.html | 0 .../doc/html/classRtAudio-members.html | 0 .../rtaudio-4.0.11/doc/html/classRtAudio.html | 0 .../doc/html/classRtError-members.html | 0 .../rtaudio-4.0.11/doc/html/classRtError.html | 0 .../rtaudio-4.0.11/doc/html/classes.html | 0 .../rtaudio-4.0.11/doc/html/compiling.html | 0 .../rtaudio-4.0.11/doc/html/doxygen.css | 0 .../rtaudio-4.0.11/doc/html/doxygen.png | Bin .../rtaudio-4.0.11/doc/html/duplex.html | 0 .../rtaudio-4.0.11/doc/html/errors.html | 0 .../rtaudio-4.0.11/doc/html/files.html | 0 .../rtaudio-4.0.11/doc/html/functions.html | 0 .../doc/html/functions_enum.html | 0 .../doc/html/functions_eval.html | 0 .../doc/html/functions_func.html | 0 .../doc/html/functions_vars.html | 0 .../rtaudio-4.0.11/doc/html/globals.html | 0 .../rtaudio-4.0.11/doc/html/globals_enum.html | 0 .../rtaudio-4.0.11/doc/html/globals_eval.html | 0 .../rtaudio-4.0.11/doc/html/globals_type.html | 0 .../rtaudio-4.0.11/doc/html/index.html | 0 .../rtaudio-4.0.11/doc/html/license.html | 0 .../rtaudio-4.0.11/doc/html/multi.html | 0 .../rtaudio-4.0.11/doc/html/pages.html | 0 .../rtaudio-4.0.11/doc/html/playback.html | 0 .../rtaudio-4.0.11/doc/html/probe.html | 0 .../rtaudio-4.0.11/doc/html/recording.html | 0 .../rtaudio-4.0.11/doc/html/settings.html | 0 .../html/structRtAudioDeviceInfo-members.html | 0 .../doc/html/structRtAudioDeviceInfo.html | 0 ...structRtAudioStreamParameters-members.html | 0 .../html/structRtAudioStreamParameters.html | 0 .../structRtAudio_1_1DeviceInfo-members.html | 0 .../doc/html/structRtAudio_1_1DeviceInfo.html | 0 ...tructRtAudio_1_1StreamOptions-members.html | 0 .../html/structRtAudio_1_1StreamOptions.html | 0 ...ctRtAudio_1_1StreamParameters-members.html | 0 .../structRtAudio_1_1StreamParameters.html | 0 .../rtaudio-4.0.11/doc/html/tab_b.gif | Bin .../rtaudio-4.0.11/doc/html/tab_l.gif | Bin .../rtaudio-4.0.11/doc/html/tab_r.gif | Bin .../rtaudio-4.0.11/doc/html/tabs.css | 0 .../rtaudio-4.0.11/doc/html/updates.html | 0 .../rtaudio-4.0.11/doc/images/ccrma.gif | Bin .../rtaudio-4.0.11/doc/images/mcgill.gif | Bin .../rtaudio-4.0.11/doc/release.txt | 0 .../rtaudio-4.0.11/include/asio.cpp | 0 .../rtaudio-4.0.11/include/asio.h | 0 .../rtaudio-4.0.11/include/asiodrivers.cpp | 0 .../rtaudio-4.0.11/include/asiodrivers.h | 0 .../rtaudio-4.0.11/include/asiodrvr.h | 0 .../rtaudio-4.0.11/include/asiolist.cpp | 0 .../rtaudio-4.0.11/include/asiolist.h | 0 .../rtaudio-4.0.11/include/asiosys.h | 0 .../rtaudio-4.0.11/include/dsound.h | 0 .../rtaudio-4.0.11/include/ginclude.h | 0 .../rtaudio-4.0.11/include/iasiodrv.h | 0 .../include/iasiothiscallresolver.cpp | 0 .../include/iasiothiscallresolver.h | 0 .../rtaudio-4.0.11/include/soundcard.h | 0 .../rtaudio-4.0.11/install | 0 .../rtaudio-4.0.11/readme | 0 .../rtaudio-4.0.11/rtaudio-config.in | 0 .../rtaudio-4.0.11/tests/Makefile.in | 0 .../tests/Windows/audioprobe.dsp | 0 .../rtaudio-4.0.11/tests/Windows/duplex.dsp | 0 .../rtaudio-4.0.11/tests/Windows/playraw.dsp | 0 .../rtaudio-4.0.11/tests/Windows/playsaw.dsp | 0 .../rtaudio-4.0.11/tests/Windows/record.dsp | 0 .../rtaudio-4.0.11/tests/Windows/rtaudio.dsw | 0 .../rtaudio-4.0.11/tests/Windows/testall.dsp | 0 .../tests/Windows/teststops.dsp | 0 .../rtaudio-4.0.11/tests/audioprobe.cpp | 0 .../rtaudio-4.0.11/tests/duplex.cpp | 0 .../rtaudio-4.0.11/tests/playraw.cpp | 0 .../rtaudio-4.0.11/tests/playsaw.cpp | 0 .../rtaudio-4.0.11/tests/record.cpp | 0 .../rtaudio-4.0.11/tests/testall.cpp | 0 .../rtaudio-4.0.11/tests/teststops.cpp | 0 .../rtmidi-2.0.1/Makefile.in | 0 .../rtmidi-2.0.1/RtError.h | 0 .../rtmidi-2.0.1/RtMidi.cpp | 0 .../rtmidi-2.0.1/RtMidi.h | 0 .../rtmidi-2.0.1/config/config.guess | 0 .../rtmidi-2.0.1/config/config.sub | 0 .../rtmidi-2.0.1/config/install.sh | 0 .../rtmidi-2.0.1/configure | 0 .../rtmidi-2.0.1/configure.ac | 0 .../rtmidi-2.0.1/doc/doxygen/Doxyfile | 0 .../rtmidi-2.0.1/doc/doxygen/footer.html | 0 .../rtmidi-2.0.1/doc/doxygen/header.html | 0 .../rtmidi-2.0.1/doc/doxygen/tutorial.txt | 0 .../doc/html/RtError_8h-source.html | 0 .../doc/html/RtError_8h_source.html | 0 .../doc/html/RtMidi_8h-source.html | 0 .../rtmidi-2.0.1/doc/html/RtMidi_8h.html | 0 .../doc/html/RtMidi_8h_source.html | 0 .../rtmidi-2.0.1/doc/html/annotated.html | 0 .../doc/html/classMidiInAlsa-members.html | 0 .../doc/html/classMidiInAlsa.html | 0 .../rtmidi-2.0.1/doc/html/classMidiInAlsa.png | Bin .../doc/html/classMidiInApi-members.html | 0 .../rtmidi-2.0.1/doc/html/classMidiInApi.html | 0 .../rtmidi-2.0.1/doc/html/classMidiInApi.png | Bin .../doc/html/classMidiInCore-members.html | 0 .../doc/html/classMidiInCore.html | 0 .../rtmidi-2.0.1/doc/html/classMidiInCore.png | Bin .../doc/html/classMidiInDummy-members.html | 0 .../doc/html/classMidiInDummy.html | 0 .../doc/html/classMidiInDummy.png | Bin .../doc/html/classMidiInJack-members.html | 0 .../doc/html/classMidiInJack.html | 0 .../rtmidi-2.0.1/doc/html/classMidiInJack.png | Bin .../doc/html/classMidiInWinKS-members.html | 0 .../doc/html/classMidiInWinKS.html | 0 .../doc/html/classMidiInWinKS.png | Bin .../doc/html/classMidiInWinMM-members.html | 0 .../doc/html/classMidiInWinMM.html | 0 .../doc/html/classMidiInWinMM.png | Bin .../doc/html/classMidiOutAlsa-members.html | 0 .../doc/html/classMidiOutAlsa.html | 0 .../doc/html/classMidiOutAlsa.png | Bin .../doc/html/classMidiOutApi-members.html | 0 .../doc/html/classMidiOutApi.html | 0 .../rtmidi-2.0.1/doc/html/classMidiOutApi.png | Bin .../doc/html/classMidiOutCore-members.html | 0 .../doc/html/classMidiOutCore.html | 0 .../doc/html/classMidiOutCore.png | Bin .../doc/html/classMidiOutDummy-members.html | 0 .../doc/html/classMidiOutDummy.html | 0 .../doc/html/classMidiOutDummy.png | Bin .../doc/html/classMidiOutJack-members.html | 0 .../doc/html/classMidiOutJack.html | 0 .../doc/html/classMidiOutJack.png | Bin .../doc/html/classMidiOutWinKS-members.html | 0 .../doc/html/classMidiOutWinKS.html | 0 .../doc/html/classMidiOutWinKS.png | Bin .../doc/html/classMidiOutWinMM-members.html | 0 .../doc/html/classMidiOutWinMM.html | 0 .../doc/html/classMidiOutWinMM.png | Bin .../doc/html/classRtError-members.html | 0 .../rtmidi-2.0.1/doc/html/classRtError.html | 0 .../doc/html/classRtMidi-members.html | 0 .../rtmidi-2.0.1/doc/html/classRtMidi.gif | Bin .../rtmidi-2.0.1/doc/html/classRtMidi.html | 0 .../rtmidi-2.0.1/doc/html/classRtMidi.png | Bin .../doc/html/classRtMidiIn-members.html | 0 .../rtmidi-2.0.1/doc/html/classRtMidiIn.gif | Bin .../rtmidi-2.0.1/doc/html/classRtMidiIn.html | 0 .../rtmidi-2.0.1/doc/html/classRtMidiIn.png | Bin .../doc/html/classRtMidiOut-members.html | 0 .../rtmidi-2.0.1/doc/html/classRtMidiOut.gif | Bin .../rtmidi-2.0.1/doc/html/classRtMidiOut.html | 0 .../rtmidi-2.0.1/doc/html/classRtMidiOut.png | Bin .../rtmidi-2.0.1/doc/html/classes.html | 0 .../rtmidi-2.0.1/doc/html/doxygen.css | 0 .../rtmidi-2.0.1/doc/html/doxygen.png | Bin .../rtmidi-2.0.1/doc/html/files.html | 0 .../rtmidi-2.0.1/doc/html/functions.html | 0 .../rtmidi-2.0.1/doc/html/functions_enum.html | 0 .../rtmidi-2.0.1/doc/html/functions_eval.html | 0 .../rtmidi-2.0.1/doc/html/functions_func.html | 0 .../rtmidi-2.0.1/doc/html/functions_type.html | 0 .../rtmidi-2.0.1/doc/html/hierarchy.html | 0 .../rtmidi-2.0.1/doc/html/index.html | 0 ...tructMidiInApi_1_1MidiMessage-members.html | 0 .../html/structMidiInApi_1_1MidiMessage.html | 0 .../structMidiInApi_1_1MidiQueue-members.html | 0 .../html/structMidiInApi_1_1MidiQueue.html | 0 ...ructMidiInApi_1_1RtMidiInData-members.html | 0 .../html/structMidiInApi_1_1RtMidiInData.html | 0 ...structRtMidiIn_1_1MidiMessage-members.html | 0 .../html/structRtMidiIn_1_1MidiMessage.html | 0 .../structRtMidiIn_1_1MidiQueue-members.html | 0 .../doc/html/structRtMidiIn_1_1MidiQueue.html | 0 ...tructRtMidiIn_1_1RtMidiInData-members.html | 0 .../html/structRtMidiIn_1_1RtMidiInData.html | 0 .../rtmidi-2.0.1/doc/html/tab_b.gif | Bin .../rtmidi-2.0.1/doc/html/tab_l.gif | Bin .../rtmidi-2.0.1/doc/html/tab_r.gif | Bin .../rtmidi-2.0.1/doc/html/tabs.css | 0 .../rtmidi-2.0.1/doc/images/ccrma.gif | Bin .../rtmidi-2.0.1/doc/images/mcgill.gif | Bin .../rtmidi-2.0.1/doc/release.txt | 0 .../rtmidi-2.0.1/include/ks.h | 0 .../rtmidi-2.0.1/include/ksmedia.h | 0 .../rtmidi-2.0.1/msw/readme | 0 .../rtmidi-2.0.1/msw/rtmidilib.sln | 0 .../rtmidi-2.0.1/msw/rtmidilib.vcproj | 0 .../rtmidi-2.0.1/readme | 0 .../rtmidi-2.0.1/rtmidi-config.in | 0 .../rtmidi-2.0.1/tests/Makefile.in | 0 .../rtmidi-2.0.1/tests/RtMidi.dsw | 0 .../rtmidi-2.0.1/tests/cmidiin.cpp | 0 .../rtmidi-2.0.1/tests/cmidiin.dsp | 0 .../rtmidi-2.0.1/tests/midiout.cpp | 0 .../rtmidi-2.0.1/tests/midiout.dsp | 0 .../rtmidi-2.0.1/tests/midiprobe.cpp | 0 .../rtmidi-2.0.1/tests/midiprobe.dsp | 0 .../rtmidi-2.0.1/tests/qmidiin.cpp | 0 .../rtmidi-2.0.1/tests/qmidiin.dsp | 0 .../rtmidi-2.0.1/tests/sysextest.cpp | 0 .../rtmidi-2.0.1/tests/sysextest.dsp | 0 c++/carla-jackbridge/Makefile | 22 +-- c++/carla-jackbridge/carla_jackbridge.cpp | 11 +- c++/carla-jackbridge/carla_jackbridge.h | 2 +- c++/carla-lilv/Makefile | 51 ++++--- .../plugins => carla-native}/bypass.c | 0 .../plugins => carla-native}/carla_native.h | 2 +- .../carla_native.hpp} | 6 +- .../plugins => carla-native}/midi-split.cpp | 2 +- .../zynaddsubfx-src.cpp | 0 .../plugins => carla-native}/zynaddsubfx.cpp | 2 +- .../zynaddsubfx/CMakeLists.txt | 0 .../zynaddsubfx/DSP/AnalogFilter.cpp | 0 .../zynaddsubfx/DSP/AnalogFilter.h | 0 .../zynaddsubfx/DSP/CMakeLists.txt | 0 .../zynaddsubfx/DSP/FFTwrapper.cpp | 0 .../zynaddsubfx/DSP/FFTwrapper.h | 0 .../zynaddsubfx/DSP/Filter.cpp | 0 .../zynaddsubfx/DSP/Filter.h | 0 .../zynaddsubfx/DSP/FormantFilter.cpp | 0 .../zynaddsubfx/DSP/FormantFilter.h | 0 .../zynaddsubfx/DSP/SVFilter.cpp | 0 .../zynaddsubfx/DSP/SVFilter.h | 0 .../zynaddsubfx/DSP/Unison.cpp | 0 .../zynaddsubfx/DSP/Unison.h | 0 .../zynaddsubfx/Effects/Alienwah.cpp | 0 .../zynaddsubfx/Effects/Alienwah.h | 0 .../zynaddsubfx/Effects/CMakeLists.txt | 0 .../zynaddsubfx/Effects/Chorus.cpp | 0 .../zynaddsubfx/Effects/Chorus.h | 0 .../zynaddsubfx/Effects/Distorsion.cpp | 0 .../zynaddsubfx/Effects/Distorsion.h | 0 .../zynaddsubfx/Effects/DynamicFilter.cpp | 0 .../zynaddsubfx/Effects/DynamicFilter.h | 0 .../zynaddsubfx/Effects/EQ.cpp | 0 .../zynaddsubfx/Effects/EQ.h | 0 .../zynaddsubfx/Effects/Echo.cpp | 0 .../zynaddsubfx/Effects/Echo.h | 0 .../zynaddsubfx/Effects/Effect.cpp | 0 .../zynaddsubfx/Effects/Effect.h | 0 .../zynaddsubfx/Effects/EffectLFO.cpp | 0 .../zynaddsubfx/Effects/EffectLFO.h | 0 .../zynaddsubfx/Effects/EffectMgr.cpp | 0 .../zynaddsubfx/Effects/EffectMgr.h | 0 .../zynaddsubfx/Effects/Phaser.cpp | 0 .../zynaddsubfx/Effects/Phaser.h | 0 .../zynaddsubfx/Effects/Reverb.cpp | 0 .../zynaddsubfx/Effects/Reverb.h | 0 .../zynaddsubfx/Misc/Bank.cpp | 0 .../zynaddsubfx/Misc/Bank.h | 0 .../zynaddsubfx/Misc/CMakeLists.txt | 0 .../zynaddsubfx/Misc/Config.cpp | 0 .../zynaddsubfx/Misc/Config.h | 0 .../zynaddsubfx/Misc/Control.h | 0 .../zynaddsubfx/Misc/Dump.cpp | 0 .../zynaddsubfx/Misc/Dump.h | 0 .../zynaddsubfx/Misc/LASHClient.cpp | 0 .../zynaddsubfx/Misc/LASHClient.h | 0 .../zynaddsubfx/Misc/Master.cpp | 0 .../zynaddsubfx/Misc/Master.h | 0 .../zynaddsubfx/Misc/Microtonal.cpp | 0 .../zynaddsubfx/Misc/Microtonal.h | 0 .../zynaddsubfx/Misc/Part.cpp | 0 .../zynaddsubfx/Misc/Part.h | 0 .../zynaddsubfx/Misc/Recorder.cpp | 0 .../zynaddsubfx/Misc/Recorder.h | 0 .../zynaddsubfx/Misc/Stereo.cpp | 0 .../zynaddsubfx/Misc/Stereo.h | 0 .../zynaddsubfx/Misc/Util.cpp | 0 .../zynaddsubfx/Misc/Util.h | 0 .../zynaddsubfx/Misc/WavFile.cpp | 0 .../zynaddsubfx/Misc/WavFile.h | 0 .../zynaddsubfx/Misc/WaveShapeSmps.cpp | 0 .../zynaddsubfx/Misc/WaveShapeSmps.h | 0 .../zynaddsubfx/Misc/XMLwrapper.cpp | 0 .../zynaddsubfx/Misc/XMLwrapper.h | 0 .../zynaddsubfx/Nio/AlsaEngine.cpp | 0 .../zynaddsubfx/Nio/AlsaEngine.h | 0 .../zynaddsubfx/Nio/AudioOut.cpp | 0 .../zynaddsubfx/Nio/AudioOut.h | 0 .../zynaddsubfx/Nio/CMakeLists.txt | 0 .../zynaddsubfx/Nio/Engine.cpp | 0 .../zynaddsubfx/Nio/Engine.h | 0 .../zynaddsubfx/Nio/EngineMgr.cpp | 0 .../zynaddsubfx/Nio/EngineMgr.h | 0 .../zynaddsubfx/Nio/InMgr.cpp | 0 .../zynaddsubfx/Nio/InMgr.h | 0 .../zynaddsubfx/Nio/JackEngine.cpp | 0 .../zynaddsubfx/Nio/JackEngine.h | 0 .../zynaddsubfx/Nio/MidiIn.cpp | 0 .../zynaddsubfx/Nio/MidiIn.h | 0 .../zynaddsubfx/Nio/Nio.cpp | 0 .../zynaddsubfx/Nio/Nio.h | 0 .../zynaddsubfx/Nio/NulEngine.cpp | 0 .../zynaddsubfx/Nio/NulEngine.h | 0 .../zynaddsubfx/Nio/OssEngine.cpp | 0 .../zynaddsubfx/Nio/OssEngine.h | 0 .../zynaddsubfx/Nio/OutMgr.cpp | 0 .../zynaddsubfx/Nio/OutMgr.h | 0 .../zynaddsubfx/Nio/PaEngine.cpp | 0 .../zynaddsubfx/Nio/PaEngine.h | 0 .../zynaddsubfx/Nio/SafeQueue.cpp | 0 .../zynaddsubfx/Nio/SafeQueue.h | 0 .../zynaddsubfx/Nio/WavEngine.cpp | 0 .../zynaddsubfx/Nio/WavEngine.h | 0 .../zynaddsubfx/Output/DSSIaudiooutput.cpp | 0 .../zynaddsubfx/Output/DSSIaudiooutput.h | 0 .../zynaddsubfx/Params/ADnoteParameters.cpp | 0 .../zynaddsubfx/Params/ADnoteParameters.h | 0 .../zynaddsubfx/Params/CMakeLists.txt | 0 .../zynaddsubfx/Params/Controller.cpp | 0 .../zynaddsubfx/Params/Controller.h | 0 .../zynaddsubfx/Params/EnvelopeParams.cpp | 0 .../zynaddsubfx/Params/EnvelopeParams.h | 0 .../zynaddsubfx/Params/FilterParams.cpp | 0 .../zynaddsubfx/Params/FilterParams.h | 0 .../zynaddsubfx/Params/LFOParams.cpp | 0 .../zynaddsubfx/Params/LFOParams.h | 0 .../zynaddsubfx/Params/PADnoteParameters.cpp | 0 .../zynaddsubfx/Params/PADnoteParameters.h | 0 .../zynaddsubfx/Params/Presets.cpp | 0 .../zynaddsubfx/Params/Presets.h | 0 .../zynaddsubfx/Params/PresetsArray.cpp | 0 .../zynaddsubfx/Params/PresetsArray.h | 0 .../zynaddsubfx/Params/PresetsStore.cpp | 0 .../zynaddsubfx/Params/PresetsStore.h | 0 .../zynaddsubfx/Params/SUBnoteParameters.cpp | 0 .../zynaddsubfx/Params/SUBnoteParameters.h | 0 .../zynaddsubfx/Synth/ADnote.cpp | 0 .../zynaddsubfx/Synth/ADnote.h | 0 .../zynaddsubfx/Synth/CMakeLists.txt | 0 .../zynaddsubfx/Synth/Envelope.cpp | 0 .../zynaddsubfx/Synth/Envelope.h | 0 .../zynaddsubfx/Synth/LFO.cpp | 0 .../zynaddsubfx/Synth/LFO.h | 0 .../zynaddsubfx/Synth/OscilGen.cpp | 0 .../zynaddsubfx/Synth/OscilGen.h | 0 .../zynaddsubfx/Synth/PADnote.cpp | 0 .../zynaddsubfx/Synth/PADnote.h | 0 .../zynaddsubfx/Synth/Resonance.cpp | 0 .../zynaddsubfx/Synth/Resonance.h | 0 .../zynaddsubfx/Synth/SUBnote.cpp | 0 .../zynaddsubfx/Synth/SUBnote.h | 0 .../zynaddsubfx/Synth/SynthNote.cpp | 0 .../zynaddsubfx/Synth/SynthNote.h | 0 .../zynaddsubfx/Tests/AdNoteTest.h | 0 .../zynaddsubfx/Tests/CMakeLists.txt | 0 .../zynaddsubfx/Tests/ControllerTest.h | 0 .../zynaddsubfx/Tests/EchoTest.h | 0 .../zynaddsubfx/Tests/MicrotonalTest.h | 0 .../zynaddsubfx/Tests/OscilGenTest.h | 0 .../zynaddsubfx/Tests/RandTest.h | 0 .../zynaddsubfx/Tests/SubNoteTest.h | 0 .../zynaddsubfx/Tests/XMLwrapperTest.h | 0 .../zynaddsubfx/Tests/guitar-adnote.xmz | 0 .../zynaddsubfx/UI/ADnoteUI.fl | 0 .../zynaddsubfx/UI/BankUI.fl | 0 .../zynaddsubfx/UI/CMakeLists.txt | 0 .../zynaddsubfx/UI/ConfigUI.fl | 0 .../zynaddsubfx/UI/EffUI.fl | 0 .../zynaddsubfx/UI/EnvelopeUI.fl | 0 .../zynaddsubfx/UI/FilterUI.fl | 0 .../zynaddsubfx/UI/LFOUI.fl | 0 .../zynaddsubfx/UI/MasterUI.fl | 0 .../zynaddsubfx/UI/MicrotonalUI.fl | 0 .../zynaddsubfx/UI/NSM.C | 0 .../zynaddsubfx/UI/NSM.H | 0 .../zynaddsubfx/UI/NSM/Client.C | 0 .../zynaddsubfx/UI/NSM/Client.H | 0 .../zynaddsubfx/UI/NioUI.cpp | 0 .../zynaddsubfx/UI/NioUI.h | 0 .../zynaddsubfx/UI/OscilGenUI.fl | 0 .../zynaddsubfx/UI/PADnoteUI.fl | 0 .../zynaddsubfx/UI/PartUI.fl | 0 .../zynaddsubfx/UI/PresetsUI.fl | 0 .../zynaddsubfx/UI/ResonanceUI.fl | 0 .../zynaddsubfx/UI/SUBnoteUI.fl | 0 .../zynaddsubfx/UI/VirKeyboard.fl | 0 .../zynaddsubfx/UI/WidgetPDial.cpp | 0 .../zynaddsubfx/UI/WidgetPDial.h | 0 .../zynaddsubfx/UI/common.H | 0 .../zynaddsubfx/globals.h | 0 .../zynaddsubfx/main.cpp | 0 .../zynaddsubfx/zynaddsubfx_icon.svg | 0 .../carla_bridge.cpp | 0 .../carla_plugin.hpp | 2 +- c++/{carla-backend => carla-plugin}/dssi.cpp | 0 .../fluidsynth.cpp | 0 .../ladspa.cpp | 0 .../linuxsampler.cpp | 0 c++/{carla-backend => carla-plugin}/lv2.cpp | 0 .../native.cpp} | 0 c++/{carla-backend => carla-plugin}/vst.cpp | 0 c++/{jack_utils.h => jack_utils.hpp} | 0 c++/jackmeter/Makefile | 30 ++--- c++/jackmeter/Makefile.dbg | 41 ------ c++/jackmeter/jackmeter.cpp | 2 +- c++/{midi_queue.h => midi_queue.hpp} | 0 c++/{patchcanvas.h => patchcanvas.hpp} | 0 c++/xycontroller/Makefile | 26 ++-- c++/xycontroller/Makefile.dbg | 71 ---------- c++/xycontroller/xycontroller.cpp | 4 +- 492 files changed, 277 insertions(+), 405 deletions(-) create mode 100644 c++/Makefile.mk delete mode 100644 c++/carla-discovery/Makefile.dbg create mode 100644 c++/carla-discovery/carla-discovery.pro delete mode 100644 c++/carla-discovery/qtcreator/carla-discovery.pro rename c++/{carla-backend => carla-engine}/DistrhoPluginInfo.h (100%) rename c++/{carla-backend => carla-engine}/carla_engine.cpp (100%) rename c++/{carla-backend => carla-engine}/carla_engine.hpp (100%) rename c++/{carla-backend => carla-engine}/carla_engine_jack.cpp (100%) rename c++/{carla-backend => carla-engine}/carla_engine_rtaudio.cpp (100%) rename c++/{carla-backend => carla-engine}/carla_osc.cpp (100%) rename c++/{carla-backend => carla-engine}/carla_osc.hpp (100%) rename c++/{carla-backend => carla-engine}/carla_shared.cpp (100%) rename c++/{carla-backend => carla-engine}/carla_shared.hpp (100%) rename c++/{carla-backend => carla-engine}/carla_threads.cpp (100%) rename c++/{carla-backend => carla-engine}/carla_threads.hpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/DistrhoPlugin.h (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/DistrhoPluginMain.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/DistrhoUI.h (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/DistrhoUIMain.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/DistrhoUIOpenGL.h (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/DistrhoUIOpenGLExt.h (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/DistrhoUIQt4.h (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/DistrhoUtils.h (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/distrho.doxygen (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoDefines.h (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoPlugin.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoPluginInternal.h (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoPluginJACK.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoPluginLADSPA+DSSI.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoPluginLV2.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoPluginLV2export.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoPluginVST.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoUI.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoUIDSSI.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoUIInternal.h (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoUILV2.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoUIOpenGL.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoUIOpenGLExt.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/DistrhoUIQt4.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/dssi (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/ladspa (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/lv2-sdk (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/pugl/pugl.h (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/pugl/pugl_internal.h (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/pugl/pugl_osx.m (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/pugl/pugl_win.cpp (100%) rename c++/{carla-backend => carla-engine}/distrho-plugin-toolkit/src/pugl/pugl_x11.c (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/Makefile.in (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/RtAudio.cpp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/RtAudio.h (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/RtError.h (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/config/config.guess (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/config/config.sub (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/config/install.sh (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/configure (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/configure.ac (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/contrib/python/pyrtaudio/PyRtAudioTest.py (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/contrib/python/pyrtaudio/readme (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/contrib/python/pyrtaudio/rtaudiomodule.cpp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/contrib/python/pyrtaudio/setup.py (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/Doxyfile (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/acknowledge.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/apinotes.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/compiling.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/duplex.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/error.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/footer.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/header.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/license.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/multi.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/playback.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/probe.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/recording.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/settings.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/doxygen/tutorial.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/RtAudio_8h-source.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/RtAudio_8h.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/RtAudio_8h_source.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/RtError_8h-source.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/RtError_8h_source.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/acknowledge.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/annotated.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/apinotes.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/bugs.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/classRtAudio-members.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/classRtAudio.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/classRtError-members.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/classRtError.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/classes.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/compiling.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/doxygen.css (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/doxygen.png (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/duplex.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/errors.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/files.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/functions.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/functions_enum.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/functions_eval.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/functions_func.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/functions_vars.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/globals.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/globals_enum.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/globals_eval.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/globals_type.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/index.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/license.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/multi.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/pages.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/playback.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/probe.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/recording.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/settings.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/structRtAudioDeviceInfo-members.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/structRtAudioDeviceInfo.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/structRtAudioStreamParameters-members.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/structRtAudioStreamParameters.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/structRtAudio_1_1DeviceInfo-members.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/structRtAudio_1_1DeviceInfo.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamOptions-members.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamOptions.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamParameters-members.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamParameters.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/tab_b.gif (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/tab_l.gif (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/tab_r.gif (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/tabs.css (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/html/updates.html (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/images/ccrma.gif (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/images/mcgill.gif (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/doc/release.txt (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/asio.cpp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/asio.h (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/asiodrivers.cpp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/asiodrivers.h (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/asiodrvr.h (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/asiolist.cpp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/asiolist.h (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/asiosys.h (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/dsound.h (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/ginclude.h (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/iasiodrv.h (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/iasiothiscallresolver.cpp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/iasiothiscallresolver.h (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/include/soundcard.h (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/install (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/readme (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/rtaudio-config.in (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/Makefile.in (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/Windows/audioprobe.dsp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/Windows/duplex.dsp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/Windows/playraw.dsp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/Windows/playsaw.dsp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/Windows/record.dsp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/Windows/rtaudio.dsw (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/Windows/testall.dsp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/Windows/teststops.dsp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/audioprobe.cpp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/duplex.cpp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/playraw.cpp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/playsaw.cpp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/record.cpp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/testall.cpp (100%) rename c++/{carla-backend => carla-engine}/rtaudio-4.0.11/tests/teststops.cpp (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/Makefile.in (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/RtError.h (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/RtMidi.cpp (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/RtMidi.h (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/config/config.guess (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/config/config.sub (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/config/install.sh (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/configure (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/configure.ac (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/doxygen/Doxyfile (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/doxygen/footer.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/doxygen/header.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/doxygen/tutorial.txt (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/RtError_8h-source.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/RtError_8h_source.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/RtMidi_8h-source.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/RtMidi_8h.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/RtMidi_8h_source.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/annotated.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInAlsa-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInAlsa.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInAlsa.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInApi-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInApi.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInApi.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInCore-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInCore.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInCore.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInDummy-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInDummy.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInDummy.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInJack-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInJack.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInJack.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInWinKS-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInWinKS.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInWinKS.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInWinMM-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInWinMM.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiInWinMM.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutAlsa-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutAlsa.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutAlsa.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutApi-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutApi.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutApi.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutCore-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutCore.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutCore.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutDummy-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutDummy.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutDummy.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutJack-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutJack.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutJack.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutWinKS-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutWinKS.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutWinKS.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutWinMM-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutWinMM.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classMidiOutWinMM.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtError-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtError.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtMidi-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtMidi.gif (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtMidi.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtMidi.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtMidiIn-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtMidiIn.gif (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtMidiIn.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtMidiIn.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtMidiOut-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtMidiOut.gif (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtMidiOut.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classRtMidiOut.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/classes.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/doxygen.css (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/doxygen.png (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/files.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/functions.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/functions_enum.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/functions_eval.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/functions_func.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/functions_type.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/hierarchy.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/index.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData-members.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData.html (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/tab_b.gif (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/tab_l.gif (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/tab_r.gif (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/html/tabs.css (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/images/ccrma.gif (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/images/mcgill.gif (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/doc/release.txt (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/include/ks.h (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/include/ksmedia.h (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/msw/readme (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/msw/rtmidilib.sln (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/msw/rtmidilib.vcproj (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/readme (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/rtmidi-config.in (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/tests/Makefile.in (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/tests/RtMidi.dsw (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/tests/cmidiin.cpp (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/tests/cmidiin.dsp (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/tests/midiout.cpp (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/tests/midiout.dsp (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/tests/midiprobe.cpp (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/tests/midiprobe.dsp (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/tests/qmidiin.cpp (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/tests/qmidiin.dsp (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/tests/sysextest.cpp (100%) rename c++/{carla-backend => carla-engine}/rtmidi-2.0.1/tests/sysextest.dsp (100%) rename c++/{carla-backend/plugins => carla-native}/bypass.c (100%) rename c++/{carla-backend/plugins => carla-native}/carla_native.h (99%) rename c++/{carla-backend/plugins/carla_nativemm.h => carla-native/carla_native.hpp} (99%) rename c++/{carla-backend/plugins => carla-native}/midi-split.cpp (99%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx-src.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx.cpp (99%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/CMakeLists.txt (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/AnalogFilter.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/AnalogFilter.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/CMakeLists.txt (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/FFTwrapper.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/FFTwrapper.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/Filter.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/Filter.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/FormantFilter.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/FormantFilter.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/SVFilter.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/SVFilter.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/Unison.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/DSP/Unison.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Alienwah.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Alienwah.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/CMakeLists.txt (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Chorus.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Chorus.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Distorsion.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Distorsion.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/DynamicFilter.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/DynamicFilter.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/EQ.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/EQ.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Echo.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Echo.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Effect.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Effect.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/EffectLFO.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/EffectLFO.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/EffectMgr.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/EffectMgr.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Phaser.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Phaser.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Reverb.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Effects/Reverb.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Bank.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Bank.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/CMakeLists.txt (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Config.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Config.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Control.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Dump.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Dump.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/LASHClient.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/LASHClient.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Master.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Master.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Microtonal.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Microtonal.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Part.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Part.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Recorder.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Recorder.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Stereo.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Stereo.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Util.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/Util.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/WavFile.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/WavFile.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/WaveShapeSmps.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/WaveShapeSmps.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/XMLwrapper.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Misc/XMLwrapper.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/AlsaEngine.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/AlsaEngine.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/AudioOut.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/AudioOut.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/CMakeLists.txt (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/Engine.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/Engine.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/EngineMgr.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/EngineMgr.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/InMgr.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/InMgr.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/JackEngine.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/JackEngine.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/MidiIn.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/MidiIn.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/Nio.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/Nio.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/NulEngine.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/NulEngine.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/OssEngine.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/OssEngine.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/OutMgr.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/OutMgr.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/PaEngine.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/PaEngine.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/SafeQueue.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/SafeQueue.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/WavEngine.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Nio/WavEngine.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Output/DSSIaudiooutput.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Output/DSSIaudiooutput.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/ADnoteParameters.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/ADnoteParameters.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/CMakeLists.txt (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/Controller.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/Controller.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/EnvelopeParams.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/EnvelopeParams.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/FilterParams.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/FilterParams.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/LFOParams.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/LFOParams.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/PADnoteParameters.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/PADnoteParameters.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/Presets.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/Presets.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/PresetsArray.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/PresetsArray.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/PresetsStore.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/PresetsStore.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/SUBnoteParameters.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Params/SUBnoteParameters.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/ADnote.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/ADnote.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/CMakeLists.txt (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/Envelope.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/Envelope.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/LFO.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/LFO.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/OscilGen.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/OscilGen.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/PADnote.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/PADnote.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/Resonance.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/Resonance.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/SUBnote.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/SUBnote.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/SynthNote.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Synth/SynthNote.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Tests/AdNoteTest.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Tests/CMakeLists.txt (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Tests/ControllerTest.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Tests/EchoTest.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Tests/MicrotonalTest.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Tests/OscilGenTest.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Tests/RandTest.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Tests/SubNoteTest.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Tests/XMLwrapperTest.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/Tests/guitar-adnote.xmz (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/ADnoteUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/BankUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/CMakeLists.txt (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/ConfigUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/EffUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/EnvelopeUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/FilterUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/LFOUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/MasterUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/MicrotonalUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/NSM.C (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/NSM.H (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/NSM/Client.C (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/NSM/Client.H (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/NioUI.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/NioUI.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/OscilGenUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/PADnoteUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/PartUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/PresetsUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/ResonanceUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/SUBnoteUI.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/VirKeyboard.fl (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/WidgetPDial.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/WidgetPDial.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/UI/common.H (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/globals.h (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/main.cpp (100%) rename c++/{carla-backend/plugins => carla-native}/zynaddsubfx/zynaddsubfx_icon.svg (100%) rename c++/{carla-backend => carla-plugin}/carla_bridge.cpp (100%) rename c++/{carla-backend => carla-plugin}/carla_plugin.hpp (99%) rename c++/{carla-backend => carla-plugin}/dssi.cpp (100%) rename c++/{carla-backend => carla-plugin}/fluidsynth.cpp (100%) rename c++/{carla-backend => carla-plugin}/ladspa.cpp (100%) rename c++/{carla-backend => carla-plugin}/linuxsampler.cpp (100%) rename c++/{carla-backend => carla-plugin}/lv2.cpp (100%) rename c++/{carla-backend/carla_native.cpp => carla-plugin/native.cpp} (100%) rename c++/{carla-backend => carla-plugin}/vst.cpp (100%) rename c++/{jack_utils.h => jack_utils.hpp} (100%) delete mode 100644 c++/jackmeter/Makefile.dbg rename c++/{midi_queue.h => midi_queue.hpp} (100%) rename c++/{patchcanvas.h => patchcanvas.hpp} (100%) delete mode 100644 c++/xycontroller/Makefile.dbg diff --git a/Makefile b/Makefile index 2958a45..614d595 100644 --- a/Makefile +++ b/Makefile @@ -173,7 +173,8 @@ src/resources_rc.py: resources/resources.qrc # ------------------------------------------------------------------------------------------------------------------------------------------------------ -CPP: carla-backend carla-bridge carla-discovery jackmeter xycontroller +# CPP: carla-backend carla-bridge carla-discovery +CPP: carla-discovery jackmeter xycontroller carla-backend: carla-lilv carla-rtmempool $(MAKE) -C c++/carla-backend @@ -199,11 +200,7 @@ xycontroller: # ------------------------------------------------------------------------------------------------------------------------------------------------------ debug: - $(MAKE) -f Makefile.dbg -C c++/carla-backend - $(MAKE) -f Makefile.dbg -C c++/carla-bridge - $(MAKE) -f Makefile.dbg -C c++/carla-discovery NATIVE=1 - $(MAKE) -f Makefile.dbg -C c++/jackmeter - $(MAKE) -f Makefile.dbg -C c++/xycontroller + $(MAKE) DEBUG=true doc: $(MAKE) doc -C c++/carla-backend diff --git a/c++/Makefile.mk b/c++/Makefile.mk new file mode 100644 index 0000000..e8962a4 --- /dev/null +++ b/c++/Makefile.mk @@ -0,0 +1,44 @@ +#!/usr/bin/make -f +# Makefile for Cadence C++ code # +# ------------------------------------ # +# Created by falkTX +# + +AR ?= ar +CC ?= gcc +CXX ?= g++ +MOC ?= moc +RCC ?= rcc +UIC ?= uic +STRIP ?= strip +WINDRES ?= windres + +DEBUG ?= false + +ifeq ($(DEBUG),true) +BASE_FLAGS = -O0 -g -Wall +BASE_FLAGS += -DDEBUG +STRIP = true # FIXME +else +BASE_FLAGS = -O2 -ffast-math -mtune=generic -msse -mfpmath=sse -Wall +BASE_FLAGS += -DNDEBUG +endif + +32BIT_FLAGS = -m32 +64BIT_FLAGS = -m64 + +BUILD_C_FLAGS = $(BASE_FLAGS) -std=c99 $(CFLAGS) +BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS) +LINK_FLAGS = $(LDFLAGS) + +ifneq ($(DEBUG),true) +BUILD_CXX_FLAGS += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT +endif + +# Comment this line to not use vestige header in Carla +BUILD_CXX_FLAGS += -DVESTIGE_HEADER + +# Modify to enable/disable features +CARLA_PLUGIN_SUPPORT = true +CARLA_SAMPLERS_SUPPORT = true +CARLA_RTAUDIO_SUPPORT = false diff --git a/c++/carla-backend/carla_backend.hpp b/c++/carla-backend/carla_backend.hpp index 70c69ff..cd07374 100644 --- a/c++/carla-backend/carla_backend.hpp +++ b/c++/carla-backend/carla_backend.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the COPYING file */ -#ifndef CARLA_BACKEND_H -#define CARLA_BACKEND_H +#ifndef CARLA_BACKEND_HPP +#define CARLA_BACKEND_HPP #include @@ -166,7 +166,7 @@ enum InternalParametersIndex { /*! * Custom Data types.\n * The type defines how the value in CustomData is stored.\n - * Binary chunks are stored in base64 format. + * Binary/chunks are stored in a base64 format string. */ enum CustomDataType { CUSTOM_DATA_INVALID = 0, //!< Null/Invalid data. @@ -586,10 +586,6 @@ struct CustomData { /**@}*/ -class CarlaEngine; -class CarlaPlugin; -class CarlaOsc; - CARLA_BACKEND_END_NAMESPACE -#endif // CARLA_BACKEND_H +#endif // CARLA_BACKEND_HPP diff --git a/c++/carla-discovery/Makefile b/c++/carla-discovery/Makefile index 8fe8bdf..9a58256 100644 --- a/c++/carla-discovery/Makefile +++ b/c++/carla-discovery/Makefile @@ -4,41 +4,36 @@ # Created by falkTX # -CXX ?= g++ -STRIP ?= strip +include ../Makefile.mk -BASE_FLAGS = -O2 -ffast-math -fomit-frame-pointer -mtune=generic -msse -mfpmath=sse -Wall -BASE_FLAGS += -I../carla-backend -I../carla-includes +BUILD_CXX_FLAGS += -I../carla-backend -I../carla-includes -I../carla-utils +BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore) +LINK_FLAGS += $(shell pkg-config --libs QtCore) -BUILD_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS) -BUILD_FLAGS += $(shell pkg-config --cflags QtCore) -BUILD_FLAGS += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT # -DNDEBUG -BUILD_FLAGS += -DVESTIGE_HEADER # Comment this line to not use vestige header - -32BIT_FLAGS = -m32 -64BIT_FLAGS = -m64 -LINK_FLAGS = $(shell pkg-config --libs QtCore) $(LDFLAGS) +ifeq ($(CARLA_PLUGIN_SUPPORT),true) +BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST +endif +ifeq ($(CARLA_SAMPLERS_SUPPORT),true) ifneq ($(NATIVE),) -BUILD_FLAGS += -DBUILD_NATIVE - ifeq ($(shell pkg-config --exists fluidsynth && echo true),true) -BUILD_FLAGS += $(shell pkg-config --cflags fluidsynth) -DWANT_FLUIDSYNTH -LINK_FLAGS += $(shell pkg-config --libs fluidsynth) +BUILD_CXX_FLAGS += $(shell pkg-config --cflags fluidsynth) -DWANT_FLUIDSYNTH +LINK_FLAGS += $(shell pkg-config --libs fluidsynth) endif ifeq ($(shell pkg-config --exists linuxsampler && echo true),true) -BUILD_FLAGS += $(shell pkg-config --cflags linuxsampler) -DWANT_LINUXSAMPLER -LINK_FLAGS += $(shell pkg-config --libs linuxsampler) -endif +BUILD_CXX_FLAGS += $(shell pkg-config --cflags linuxsampler) -DWANT_LINUXSAMPLER +LINK_FLAGS += $(shell pkg-config --libs linuxsampler) endif +endif # NATIVE +endif # CARLA_SAMPLERS_SUPPORT -POSIX_BUILD_FLAGS = $(BUILD_FLAGS) +POSIX_BUILD_FLAGS = $(BUILD_CXX_FLAGS) POSIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu POSIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu POSIX_LINK_FLAGS = $(LINK_FLAGS) -ldl -lpthread -WIN_BUILD_FLAGS = $(BUILD_FLAGS) +WIN_BUILD_FLAGS = $(BUILD_CXX_FLAGS) WIN_32BIT_FLAGS = $(32BIT_FLAGS) WIN_64BIT_FLAGS = $(64BIT_FLAGS) WIN_LINK_FLAGS = $(LINK_FLAGS) -static -mwindows diff --git a/c++/carla-discovery/Makefile.dbg b/c++/carla-discovery/Makefile.dbg deleted file mode 100644 index 3eead4a..0000000 --- a/c++/carla-discovery/Makefile.dbg +++ /dev/null @@ -1,91 +0,0 @@ -#!/usr/bin/make -f -# Makefile for carla-discovery # -# ----------------------------------------- # -# Created by falkTX -# - -CXX ?= g++ - -BASE_FLAGS = -O0 -g -Wall -BASE_FLAGS += -I../carla-backend -I../carla-includes - -BUILD_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS) -BUILD_FLAGS += $(shell pkg-config --cflags QtCore) -BUILD_FLAGS += -DDEBUG -BUILD_FLAGS += -DVESTIGE_HEADER # Comment this line to not use vestige header - -32BIT_FLAGS = -m32 -64BIT_FLAGS = -m64 -LINK_FLAGS = $(shell pkg-config --libs QtCore) $(LDFLAGS) - -ifneq ($(NATIVE),) -BUILD_FLAGS += -DBUILD_NATIVE - -ifeq ($(shell pkg-config --exists fluidsynth && echo true),true) -BUILD_FLAGS += $(shell pkg-config --cflags fluidsynth) -DWANT_FLUIDSYNTH -LINK_FLAGS += $(shell pkg-config --libs fluidsynth) -endif - -ifeq ($(shell pkg-config --exists linuxsampler && echo true),true) -BUILD_FLAGS += $(shell pkg-config --cflags linuxsampler) -DWANT_LINUXSAMPLER -LINK_FLAGS += $(shell pkg-config --libs linuxsampler) -endif -endif - -POSIX_BUILD_FLAGS = $(BUILD_FLAGS) -POSIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu -POSIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -POSIX_LINK_FLAGS = $(LINK_FLAGS) -ldl - -WIN_BUILD_FLAGS = $(BUILD_FLAGS) -WIN_32BIT_FLAGS = $(32BIT_FLAGS) -WIN_64BIT_FLAGS = $(64BIT_FLAGS) -WIN_LINK_FLAGS = $(LINK_FLAGS) -static -mwindows - -# -------------------------------------------------------------- - -all: carla-discovery-native - -posix32: carla-discovery-posix32 -posix64: carla-discovery-posix64 -win32: carla-discovery-win32.exe -win64: carla-discovery-win64.exe - -# -------------------------------------------------------------- - -OBJS = carla-discovery.cpp - -carla-discovery-native: carla-discovery.cpp ../carla-lilv/carla_lilv.a - $(CXX) $^ $(BUILD_FLAGS) $(LINK_FLAGS) -o $@ - -carla-discovery-posix32: $(OBJS) ../carla-lilv/carla_lilv_posix32.a - $(CXX) $^ $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@ - -carla-discovery-posix64: $(OBJS) ../carla-lilv/carla_lilv_posix64.a - $(CXX) $^ $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@ - -carla-discovery-win32.exe: $(OBJS) ../carla-lilv/carla_lilv_win32.a - $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@ - -carla-discovery-win64.exe: $(OBJS) ../carla-lilv/carla_lilv_win64.a - $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@ - -../carla-lilv/carla_lilv.a: - $(MAKE) -C ../carla-lilv - -../carla-lilv/carla_lilv_posix32.a: - $(MAKE) -C ../carla-lilv posix32 - -../carla-lilv/carla_lilv_posix64.a: - $(MAKE) -C ../carla-lilv posix64 - -../carla-lilv/carla_lilv_win32.a: - $(MAKE) -C ../carla-lilv win32 - -../carla-lilv/carla_lilv_win64.a: - $(MAKE) -C ../carla-lilv win64 - -# -------------------------------------------------------------- - -clean: - rm -f carla-discovery-* diff --git a/c++/carla-discovery/carla-discovery.cpp b/c++/carla-discovery/carla-discovery.cpp index 5e08d7e..3bea935 100644 --- a/c++/carla-discovery/carla-discovery.cpp +++ b/c++/carla-discovery/carla-discovery.cpp @@ -15,37 +15,37 @@ * For a full copy of the GNU General Public License see the COPYING file */ -#include "carla_includes.h" -#include "carla_lib_includes.h" - -#include -#include -#include #include - #include #include #include -#include "carla_backend.h" - -#include "carla_ladspa.h" -#include "carla_dssi.h" -#include "carla_lv2.h" -#include "carla_vst.h" +#include "carla_backend.hpp" +#include "carla_lib_utils.hpp" -#ifdef BUILD_NATIVE - #ifdef WANT_FLUIDSYNTH - #include "carla_fluidsynth.h" - #endif - #ifdef WANT_LINUXSAMPLER - #include "carla_linuxsampler.h" - #endif +#ifdef WANT_LADSPA +# include "carla_ladspa_utils.hpp" +#endif +#ifdef WANT_DSSI +# include "carla_ladspa_utils.hpp" +# include "dssi/dssi.h" +#endif +#ifdef WANT_LV2 +# include "carla_lv2_utils.hpp" +#endif +#ifdef WANT_VST +# include "carla_vst_utils.hpp" +#endif +#ifdef WANT_FLUIDSYNTH +# include +#endif +#ifdef WANT_LINUXSAMPLER +# include "linuxsampler/EngineFactory.h" #endif #define DISCOVERY_OUT(x, y) std::cout << "\ncarla-discovery::" << x << "::" << y << std::endl; -// fake values to test plugins with +// Fake values to test plugins with const uint32_t bufferSize = 512; const double sampleRate = 44100.0; @@ -61,6 +61,7 @@ using namespace CarlaBackend; // ------------------------------ VST Stuff ------------------------------ +#ifdef WANT_VST intptr_t vstCurrentUniqueId = 0; intptr_t vstHostCanDo(const char* const feature) @@ -202,11 +203,13 @@ intptr_t VSTCALLBACK vstHostCallback(AEffect* const effect, const int32_t opcode return ret; } +#endif // ------------------------------ Plugin Checks ----------------------------- void do_ladspa_check(void* const libHandle, const bool init) { +#ifdef WANT_LADSPA const LADSPA_Descriptor_Function descFn = (LADSPA_Descriptor_Function)lib_symbol(libHandle, "ladspa_descriptor"); if (! descFn) @@ -367,10 +370,16 @@ void do_ladspa_check(void* const libHandle, const bool init) DISCOVERY_OUT("build", BINARY_NATIVE); DISCOVERY_OUT("end", "------------"); } +#else + DISCOVERY_OUT("error", "LADSPA support not available"); + Q_UNUSED(libHandle); + Q_UNUSED(init); +#endif } void do_dssi_check(void* const libHandle, const bool init) { +#ifdef WANT_DSSI const DSSI_Descriptor_Function descFn = (DSSI_Descriptor_Function)lib_symbol(libHandle, "dssi_descriptor"); if (! descFn) @@ -579,21 +588,27 @@ void do_dssi_check(void* const libHandle, const bool init) DISCOVERY_OUT("build", BINARY_NATIVE); DISCOVERY_OUT("end", "------------"); } +#else + DISCOVERY_OUT("error", "DSSI support not available"); + Q_UNUSED(libHandle); + Q_UNUSED(init); +#endif } void do_lv2_check(const char* const bundle, const bool init) { +#ifdef WANT_LV2 // Convert bundle filename to URI QString qBundle(QUrl::fromLocalFile(bundle).toString()); if (! qBundle.endsWith(QDir::separator())) qBundle += QDir::separator(); // Load bundle - Lilv::Node lilvBundle(Lv2World.new_uri(qBundle.toUtf8().constData())); - Lv2World.load_bundle(lilvBundle); + Lilv::Node lilvBundle(lv2World.new_uri(qBundle.toUtf8().constData())); + lv2World.load_bundle(lilvBundle); // Load plugins in this bundle - const Lilv::Plugins lilvPlugins = Lv2World.get_all_plugins(); + const Lilv::Plugins lilvPlugins = lv2World.get_all_plugins(); // Get all plugin URIs in this bundle QStringList URIs; @@ -732,10 +747,16 @@ void do_lv2_check(const char* const bundle, const bool init) DISCOVERY_OUT("build", BINARY_NATIVE); DISCOVERY_OUT("end", "------------"); } +#else + DISCOVERY_OUT("error", "LV2 support not available"); + Q_UNUSED(bundle); + Q_UNUSED(init); +#endif } void do_vst_check(void* const libHandle, const bool init) { +#ifdef WANT_VST VST_Function vstFn = (VST_Function)lib_symbol(libHandle, "VSTPluginMain"); if (! vstFn) @@ -920,6 +941,11 @@ void do_vst_check(void* const libHandle, const bool init) free((void*)cName); free((void*)cProduct); free((void*)cVendor); +#else + DISCOVERY_OUT("error", "VST support not available"); + Q_UNUSED(libHandle); + Q_UNUSED(init); +#endif } void do_fluidsynth_check(const char* const filename, const bool init) @@ -1095,7 +1121,6 @@ void do_linuxsampler_check(const char* const filename, const char* const stype, const LinuxSamplerScopedEngine engine(filename, stype); else LinuxSamplerScopedEngine::outputInfo(nullptr, 0, file.baseName().toUtf8().constData()); - #else DISCOVERY_OUT("error", stype << " support not available"); Q_UNUSED(filename); @@ -1107,6 +1132,57 @@ void do_linuxsampler_check(const char* const filename, const char* const stype, int main(int argc, char* argv[]) { + if (argc == 2 && strcmp(argv[1], "-formats") == 0) + { + printf("Available plugin formats:\n"); + printf("LADSPA: "); +#ifdef WANT_LADSPA + printf("yes\n"); +#else + printf("no\n"); +#endif + printf("DSSI: "); +#ifdef WANT_DSSI + printf("yes\n"); +#else + printf("no\n"); +#endif + printf("LV2: "); +#ifdef WANT_LV2 + printf("yes\n"); +#else + printf("no\n"); +#endif + printf("VST: "); +#ifdef WANT_VST + printf("yes\n"); +#else + printf("no\n"); +#endif + printf("\n"); + + printf("Available sampler formats:\n"); + printf("GIG (LinuxSampler): "); +#ifdef WANT_LINUXSAMPLER + printf("yes\n"); +#else + printf("no\n"); +#endif + printf("SF2 (FluidSynth): "); +#ifdef WANT_FLUIDSYNTH + printf("yes\n"); +#else + printf("no\n"); +#endif + printf("SFZ (LinuxSampler): "); +#ifdef WANT_LINUXSAMPLER + printf("yes\n"); +#else + printf("no\n"); +#endif + return 0; + } + if (argc != 3) { qWarning("usage: %s ", argv[0]); diff --git a/c++/carla-discovery/carla-discovery.pro b/c++/carla-discovery/carla-discovery.pro new file mode 100644 index 0000000..aece640 --- /dev/null +++ b/c++/carla-discovery/carla-discovery.pro @@ -0,0 +1,45 @@ +# QtCreator project file + +QT = core + +CONFIG = debug +CONFIG += link_pkgconfig qt warn_on + +DEFINES = DEBUG +DEFINES += BUILD_NATIVE +DEFINES += WANT_LADSPA WANT_DSSI WANT_LV2 WANT_VST +DEFINES += WANT_FLUIDSYNTH WANT_LINUXSAMPLER +PKGCONFIG = fluidsynth linuxsampler + +TARGET = carla-discovery-qtcreator +TEMPLATE = app +VERSION = 0.5.0 + +SOURCES = \ + carla-discovery.cpp + +HEADERS = \ + ../carla-includes/carla_defines.hpp \ + ../carla-includes/ladspa_rdf.hpp \ + ../carla-includes/lv2_rdf.hpp \ + ../carla-utils/carla_lib_utils.hpp \ + ../carla-utils/carla_ladspa_utils.hpp \ + ../carla-utils/carla_lv2_utils.hpp \ + ../carla-utils/carla_vst_utils.hpp + +INCLUDEPATH = .. \ + ../carla-backend \ + ../carla-includes \ + ../carla-utils + +LIBS = \ + ../carla-lilv/carla_lilv.a + +unix { +LIBS += -ldl -lpthread +} +win { +LIBS += -static -mwindows +} + +QMAKE_CXXFLAGS *= -std=c++0x diff --git a/c++/carla-discovery/qtcreator/carla-discovery.pro b/c++/carla-discovery/qtcreator/carla-discovery.pro deleted file mode 100644 index bdbda27..0000000 --- a/c++/carla-discovery/qtcreator/carla-discovery.pro +++ /dev/null @@ -1,44 +0,0 @@ -# QtCreator project file - -QT = core - -CONFIG = debug -CONFIG = release static -CONFIG += link_pkgconfig qt warn_on - -DEFINES = DEBUG BUILD_NATIVE -DEFINES += WANT_FLUIDSYNTH WANT_LINUXSAMPLER -PKGCONFIG = fluidsynth linuxsampler - -TARGET = carla-discovery-qtcreator -TEMPLATE = app -VERSION = 0.5.0 - -SOURCES = \ - ../carla-discovery.cpp - -HEADERS = \ - ../../carla-includes/carla_includes.h \ - ../../carla-includes/carla_lib_includes.h \ - ../../carla-includes/carla_ladspa.h \ - ../../carla-includes/carla_dssi.h \ - ../../carla-includes/carla_lv2.h \ - ../../carla-includes/carla_vst.h \ - ../../carla-includes/carla_fluidsynth.h \ - ../../carla-includes/carla_linuxsampler.h \ - ../../carla-includes/ladspa_rdf.h \ - ../../carla-includes/lv2_rdf.h - -INCLUDEPATH = .. \ - ../../carla-backend \ - ../../carla-includes - -LIBS = \ - ../../carla-lilv/carla_lilv.a - -QMAKE_CXXFLAGS *= -std=c++0x - -win { - LIBS += -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32 -lqtmain - QMAKE_LFLAGS *= -static -static-libgcc -} diff --git a/c++/carla-backend/DistrhoPluginInfo.h b/c++/carla-engine/DistrhoPluginInfo.h similarity index 100% rename from c++/carla-backend/DistrhoPluginInfo.h rename to c++/carla-engine/DistrhoPluginInfo.h diff --git a/c++/carla-backend/carla_engine.cpp b/c++/carla-engine/carla_engine.cpp similarity index 100% rename from c++/carla-backend/carla_engine.cpp rename to c++/carla-engine/carla_engine.cpp diff --git a/c++/carla-backend/carla_engine.hpp b/c++/carla-engine/carla_engine.hpp similarity index 100% rename from c++/carla-backend/carla_engine.hpp rename to c++/carla-engine/carla_engine.hpp diff --git a/c++/carla-backend/carla_engine_jack.cpp b/c++/carla-engine/carla_engine_jack.cpp similarity index 100% rename from c++/carla-backend/carla_engine_jack.cpp rename to c++/carla-engine/carla_engine_jack.cpp diff --git a/c++/carla-backend/carla_engine_rtaudio.cpp b/c++/carla-engine/carla_engine_rtaudio.cpp similarity index 100% rename from c++/carla-backend/carla_engine_rtaudio.cpp rename to c++/carla-engine/carla_engine_rtaudio.cpp diff --git a/c++/carla-backend/carla_osc.cpp b/c++/carla-engine/carla_osc.cpp similarity index 100% rename from c++/carla-backend/carla_osc.cpp rename to c++/carla-engine/carla_osc.cpp diff --git a/c++/carla-backend/carla_osc.hpp b/c++/carla-engine/carla_osc.hpp similarity index 100% rename from c++/carla-backend/carla_osc.hpp rename to c++/carla-engine/carla_osc.hpp diff --git a/c++/carla-backend/carla_shared.cpp b/c++/carla-engine/carla_shared.cpp similarity index 100% rename from c++/carla-backend/carla_shared.cpp rename to c++/carla-engine/carla_shared.cpp diff --git a/c++/carla-backend/carla_shared.hpp b/c++/carla-engine/carla_shared.hpp similarity index 100% rename from c++/carla-backend/carla_shared.hpp rename to c++/carla-engine/carla_shared.hpp diff --git a/c++/carla-backend/carla_threads.cpp b/c++/carla-engine/carla_threads.cpp similarity index 100% rename from c++/carla-backend/carla_threads.cpp rename to c++/carla-engine/carla_threads.cpp diff --git a/c++/carla-backend/carla_threads.hpp b/c++/carla-engine/carla_threads.hpp similarity index 100% rename from c++/carla-backend/carla_threads.hpp rename to c++/carla-engine/carla_threads.hpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/DistrhoPlugin.h b/c++/carla-engine/distrho-plugin-toolkit/DistrhoPlugin.h similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/DistrhoPlugin.h rename to c++/carla-engine/distrho-plugin-toolkit/DistrhoPlugin.h diff --git a/c++/carla-backend/distrho-plugin-toolkit/DistrhoPluginMain.cpp b/c++/carla-engine/distrho-plugin-toolkit/DistrhoPluginMain.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/DistrhoPluginMain.cpp rename to c++/carla-engine/distrho-plugin-toolkit/DistrhoPluginMain.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/DistrhoUI.h b/c++/carla-engine/distrho-plugin-toolkit/DistrhoUI.h similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/DistrhoUI.h rename to c++/carla-engine/distrho-plugin-toolkit/DistrhoUI.h diff --git a/c++/carla-backend/distrho-plugin-toolkit/DistrhoUIMain.cpp b/c++/carla-engine/distrho-plugin-toolkit/DistrhoUIMain.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/DistrhoUIMain.cpp rename to c++/carla-engine/distrho-plugin-toolkit/DistrhoUIMain.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/DistrhoUIOpenGL.h b/c++/carla-engine/distrho-plugin-toolkit/DistrhoUIOpenGL.h similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/DistrhoUIOpenGL.h rename to c++/carla-engine/distrho-plugin-toolkit/DistrhoUIOpenGL.h diff --git a/c++/carla-backend/distrho-plugin-toolkit/DistrhoUIOpenGLExt.h b/c++/carla-engine/distrho-plugin-toolkit/DistrhoUIOpenGLExt.h similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/DistrhoUIOpenGLExt.h rename to c++/carla-engine/distrho-plugin-toolkit/DistrhoUIOpenGLExt.h diff --git a/c++/carla-backend/distrho-plugin-toolkit/DistrhoUIQt4.h b/c++/carla-engine/distrho-plugin-toolkit/DistrhoUIQt4.h similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/DistrhoUIQt4.h rename to c++/carla-engine/distrho-plugin-toolkit/DistrhoUIQt4.h diff --git a/c++/carla-backend/distrho-plugin-toolkit/DistrhoUtils.h b/c++/carla-engine/distrho-plugin-toolkit/DistrhoUtils.h similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/DistrhoUtils.h rename to c++/carla-engine/distrho-plugin-toolkit/DistrhoUtils.h diff --git a/c++/carla-backend/distrho-plugin-toolkit/distrho.doxygen b/c++/carla-engine/distrho-plugin-toolkit/distrho.doxygen similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/distrho.doxygen rename to c++/carla-engine/distrho-plugin-toolkit/distrho.doxygen diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoDefines.h b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoDefines.h similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoDefines.h rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoDefines.h diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPlugin.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPlugin.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPlugin.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPlugin.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPluginInternal.h b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginInternal.h similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPluginInternal.h rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginInternal.h diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPluginJACK.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginJACK.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPluginJACK.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginJACK.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPluginLADSPA+DSSI.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginLADSPA+DSSI.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPluginLADSPA+DSSI.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginLADSPA+DSSI.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPluginLV2.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginLV2.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPluginLV2.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginLV2.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPluginLV2export.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginLV2export.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPluginLV2export.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginLV2export.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPluginVST.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginVST.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoPluginVST.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginVST.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUI.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUI.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUI.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUI.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUIDSSI.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIDSSI.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUIDSSI.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIDSSI.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUIInternal.h b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIInternal.h similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUIInternal.h rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIInternal.h diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUILV2.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUILV2.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUILV2.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUILV2.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUIOpenGL.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIOpenGL.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUIOpenGL.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIOpenGL.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUIOpenGLExt.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIOpenGLExt.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUIOpenGLExt.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIOpenGLExt.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUIQt4.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIQt4.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/DistrhoUIQt4.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIQt4.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/dssi b/c++/carla-engine/distrho-plugin-toolkit/src/dssi similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/dssi rename to c++/carla-engine/distrho-plugin-toolkit/src/dssi diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/ladspa b/c++/carla-engine/distrho-plugin-toolkit/src/ladspa similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/ladspa rename to c++/carla-engine/distrho-plugin-toolkit/src/ladspa diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/lv2-sdk b/c++/carla-engine/distrho-plugin-toolkit/src/lv2-sdk similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/lv2-sdk rename to c++/carla-engine/distrho-plugin-toolkit/src/lv2-sdk diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/pugl/pugl.h b/c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl.h similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/pugl/pugl.h rename to c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl.h diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/pugl/pugl_internal.h b/c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_internal.h similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/pugl/pugl_internal.h rename to c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_internal.h diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/pugl/pugl_osx.m b/c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_osx.m similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/pugl/pugl_osx.m rename to c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_osx.m diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/pugl/pugl_win.cpp b/c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_win.cpp similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/pugl/pugl_win.cpp rename to c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_win.cpp diff --git a/c++/carla-backend/distrho-plugin-toolkit/src/pugl/pugl_x11.c b/c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_x11.c similarity index 100% rename from c++/carla-backend/distrho-plugin-toolkit/src/pugl/pugl_x11.c rename to c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_x11.c diff --git a/c++/carla-backend/rtaudio-4.0.11/Makefile.in b/c++/carla-engine/rtaudio-4.0.11/Makefile.in similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/Makefile.in rename to c++/carla-engine/rtaudio-4.0.11/Makefile.in diff --git a/c++/carla-backend/rtaudio-4.0.11/RtAudio.cpp b/c++/carla-engine/rtaudio-4.0.11/RtAudio.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/RtAudio.cpp rename to c++/carla-engine/rtaudio-4.0.11/RtAudio.cpp diff --git a/c++/carla-backend/rtaudio-4.0.11/RtAudio.h b/c++/carla-engine/rtaudio-4.0.11/RtAudio.h similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/RtAudio.h rename to c++/carla-engine/rtaudio-4.0.11/RtAudio.h diff --git a/c++/carla-backend/rtaudio-4.0.11/RtError.h b/c++/carla-engine/rtaudio-4.0.11/RtError.h similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/RtError.h rename to c++/carla-engine/rtaudio-4.0.11/RtError.h diff --git a/c++/carla-backend/rtaudio-4.0.11/config/config.guess b/c++/carla-engine/rtaudio-4.0.11/config/config.guess similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/config/config.guess rename to c++/carla-engine/rtaudio-4.0.11/config/config.guess diff --git a/c++/carla-backend/rtaudio-4.0.11/config/config.sub b/c++/carla-engine/rtaudio-4.0.11/config/config.sub similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/config/config.sub rename to c++/carla-engine/rtaudio-4.0.11/config/config.sub diff --git a/c++/carla-backend/rtaudio-4.0.11/config/install.sh b/c++/carla-engine/rtaudio-4.0.11/config/install.sh similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/config/install.sh rename to c++/carla-engine/rtaudio-4.0.11/config/install.sh diff --git a/c++/carla-backend/rtaudio-4.0.11/configure b/c++/carla-engine/rtaudio-4.0.11/configure similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/configure rename to c++/carla-engine/rtaudio-4.0.11/configure diff --git a/c++/carla-backend/rtaudio-4.0.11/configure.ac b/c++/carla-engine/rtaudio-4.0.11/configure.ac similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/configure.ac rename to c++/carla-engine/rtaudio-4.0.11/configure.ac diff --git a/c++/carla-backend/rtaudio-4.0.11/contrib/python/pyrtaudio/PyRtAudioTest.py b/c++/carla-engine/rtaudio-4.0.11/contrib/python/pyrtaudio/PyRtAudioTest.py similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/contrib/python/pyrtaudio/PyRtAudioTest.py rename to c++/carla-engine/rtaudio-4.0.11/contrib/python/pyrtaudio/PyRtAudioTest.py diff --git a/c++/carla-backend/rtaudio-4.0.11/contrib/python/pyrtaudio/readme b/c++/carla-engine/rtaudio-4.0.11/contrib/python/pyrtaudio/readme similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/contrib/python/pyrtaudio/readme rename to c++/carla-engine/rtaudio-4.0.11/contrib/python/pyrtaudio/readme diff --git a/c++/carla-backend/rtaudio-4.0.11/contrib/python/pyrtaudio/rtaudiomodule.cpp b/c++/carla-engine/rtaudio-4.0.11/contrib/python/pyrtaudio/rtaudiomodule.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/contrib/python/pyrtaudio/rtaudiomodule.cpp rename to c++/carla-engine/rtaudio-4.0.11/contrib/python/pyrtaudio/rtaudiomodule.cpp diff --git a/c++/carla-backend/rtaudio-4.0.11/contrib/python/pyrtaudio/setup.py b/c++/carla-engine/rtaudio-4.0.11/contrib/python/pyrtaudio/setup.py similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/contrib/python/pyrtaudio/setup.py rename to c++/carla-engine/rtaudio-4.0.11/contrib/python/pyrtaudio/setup.py diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/Doxyfile b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/Doxyfile similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/Doxyfile rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/Doxyfile diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/acknowledge.txt b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/acknowledge.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/acknowledge.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/acknowledge.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/apinotes.txt b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/apinotes.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/apinotes.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/apinotes.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/compiling.txt b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/compiling.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/compiling.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/compiling.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/duplex.txt b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/duplex.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/duplex.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/duplex.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/error.txt b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/error.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/error.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/error.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/footer.html b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/footer.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/footer.html rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/footer.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/header.html b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/header.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/header.html rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/header.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/license.txt b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/license.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/license.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/license.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/multi.txt b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/multi.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/multi.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/multi.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/playback.txt b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/playback.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/playback.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/playback.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/probe.txt b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/probe.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/probe.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/probe.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/recording.txt b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/recording.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/recording.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/recording.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/settings.txt b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/settings.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/settings.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/settings.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/doxygen/tutorial.txt b/c++/carla-engine/rtaudio-4.0.11/doc/doxygen/tutorial.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/doxygen/tutorial.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/doxygen/tutorial.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/RtAudio_8h-source.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/RtAudio_8h-source.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/RtAudio_8h-source.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/RtAudio_8h-source.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/RtAudio_8h.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/RtAudio_8h.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/RtAudio_8h.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/RtAudio_8h.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/RtAudio_8h_source.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/RtAudio_8h_source.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/RtAudio_8h_source.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/RtAudio_8h_source.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/RtError_8h-source.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/RtError_8h-source.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/RtError_8h-source.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/RtError_8h-source.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/RtError_8h_source.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/RtError_8h_source.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/RtError_8h_source.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/RtError_8h_source.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/acknowledge.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/acknowledge.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/acknowledge.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/acknowledge.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/annotated.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/annotated.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/annotated.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/annotated.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/apinotes.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/apinotes.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/apinotes.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/apinotes.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/bugs.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/bugs.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/bugs.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/bugs.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/classRtAudio-members.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/classRtAudio-members.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/classRtAudio-members.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/classRtAudio-members.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/classRtAudio.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/classRtAudio.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/classRtAudio.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/classRtAudio.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/classRtError-members.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/classRtError-members.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/classRtError-members.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/classRtError-members.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/classRtError.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/classRtError.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/classRtError.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/classRtError.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/classes.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/classes.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/classes.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/classes.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/compiling.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/compiling.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/compiling.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/compiling.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/doxygen.css b/c++/carla-engine/rtaudio-4.0.11/doc/html/doxygen.css similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/doxygen.css rename to c++/carla-engine/rtaudio-4.0.11/doc/html/doxygen.css diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/doxygen.png b/c++/carla-engine/rtaudio-4.0.11/doc/html/doxygen.png similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/doxygen.png rename to c++/carla-engine/rtaudio-4.0.11/doc/html/doxygen.png diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/duplex.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/duplex.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/duplex.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/duplex.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/errors.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/errors.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/errors.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/errors.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/files.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/files.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/files.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/files.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/functions.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/functions.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/functions.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/functions.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/functions_enum.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/functions_enum.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/functions_enum.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/functions_enum.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/functions_eval.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/functions_eval.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/functions_eval.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/functions_eval.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/functions_func.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/functions_func.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/functions_func.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/functions_func.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/functions_vars.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/functions_vars.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/functions_vars.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/functions_vars.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/globals.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/globals.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/globals.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/globals.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/globals_enum.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/globals_enum.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/globals_enum.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/globals_enum.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/globals_eval.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/globals_eval.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/globals_eval.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/globals_eval.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/globals_type.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/globals_type.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/globals_type.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/globals_type.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/index.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/index.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/index.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/index.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/license.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/license.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/license.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/license.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/multi.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/multi.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/multi.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/multi.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/pages.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/pages.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/pages.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/pages.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/playback.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/playback.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/playback.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/playback.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/probe.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/probe.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/probe.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/probe.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/recording.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/recording.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/recording.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/recording.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/settings.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/settings.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/settings.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/settings.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudioDeviceInfo-members.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudioDeviceInfo-members.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudioDeviceInfo-members.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudioDeviceInfo-members.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudioDeviceInfo.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudioDeviceInfo.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudioDeviceInfo.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudioDeviceInfo.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudioStreamParameters-members.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudioStreamParameters-members.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudioStreamParameters-members.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudioStreamParameters-members.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudioStreamParameters.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudioStreamParameters.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudioStreamParameters.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudioStreamParameters.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudio_1_1DeviceInfo-members.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudio_1_1DeviceInfo-members.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudio_1_1DeviceInfo-members.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudio_1_1DeviceInfo-members.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudio_1_1DeviceInfo.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudio_1_1DeviceInfo.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudio_1_1DeviceInfo.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudio_1_1DeviceInfo.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamOptions-members.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamOptions-members.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamOptions-members.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamOptions-members.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamOptions.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamOptions.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamOptions.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamOptions.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamParameters-members.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamParameters-members.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamParameters-members.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamParameters-members.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamParameters.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamParameters.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamParameters.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/structRtAudio_1_1StreamParameters.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/tab_b.gif b/c++/carla-engine/rtaudio-4.0.11/doc/html/tab_b.gif similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/tab_b.gif rename to c++/carla-engine/rtaudio-4.0.11/doc/html/tab_b.gif diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/tab_l.gif b/c++/carla-engine/rtaudio-4.0.11/doc/html/tab_l.gif similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/tab_l.gif rename to c++/carla-engine/rtaudio-4.0.11/doc/html/tab_l.gif diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/tab_r.gif b/c++/carla-engine/rtaudio-4.0.11/doc/html/tab_r.gif similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/tab_r.gif rename to c++/carla-engine/rtaudio-4.0.11/doc/html/tab_r.gif diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/tabs.css b/c++/carla-engine/rtaudio-4.0.11/doc/html/tabs.css similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/tabs.css rename to c++/carla-engine/rtaudio-4.0.11/doc/html/tabs.css diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/html/updates.html b/c++/carla-engine/rtaudio-4.0.11/doc/html/updates.html similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/html/updates.html rename to c++/carla-engine/rtaudio-4.0.11/doc/html/updates.html diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/images/ccrma.gif b/c++/carla-engine/rtaudio-4.0.11/doc/images/ccrma.gif similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/images/ccrma.gif rename to c++/carla-engine/rtaudio-4.0.11/doc/images/ccrma.gif diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/images/mcgill.gif b/c++/carla-engine/rtaudio-4.0.11/doc/images/mcgill.gif similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/images/mcgill.gif rename to c++/carla-engine/rtaudio-4.0.11/doc/images/mcgill.gif diff --git a/c++/carla-backend/rtaudio-4.0.11/doc/release.txt b/c++/carla-engine/rtaudio-4.0.11/doc/release.txt similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/doc/release.txt rename to c++/carla-engine/rtaudio-4.0.11/doc/release.txt diff --git a/c++/carla-backend/rtaudio-4.0.11/include/asio.cpp b/c++/carla-engine/rtaudio-4.0.11/include/asio.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/asio.cpp rename to c++/carla-engine/rtaudio-4.0.11/include/asio.cpp diff --git a/c++/carla-backend/rtaudio-4.0.11/include/asio.h b/c++/carla-engine/rtaudio-4.0.11/include/asio.h similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/asio.h rename to c++/carla-engine/rtaudio-4.0.11/include/asio.h diff --git a/c++/carla-backend/rtaudio-4.0.11/include/asiodrivers.cpp b/c++/carla-engine/rtaudio-4.0.11/include/asiodrivers.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/asiodrivers.cpp rename to c++/carla-engine/rtaudio-4.0.11/include/asiodrivers.cpp diff --git a/c++/carla-backend/rtaudio-4.0.11/include/asiodrivers.h b/c++/carla-engine/rtaudio-4.0.11/include/asiodrivers.h similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/asiodrivers.h rename to c++/carla-engine/rtaudio-4.0.11/include/asiodrivers.h diff --git a/c++/carla-backend/rtaudio-4.0.11/include/asiodrvr.h b/c++/carla-engine/rtaudio-4.0.11/include/asiodrvr.h similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/asiodrvr.h rename to c++/carla-engine/rtaudio-4.0.11/include/asiodrvr.h diff --git a/c++/carla-backend/rtaudio-4.0.11/include/asiolist.cpp b/c++/carla-engine/rtaudio-4.0.11/include/asiolist.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/asiolist.cpp rename to c++/carla-engine/rtaudio-4.0.11/include/asiolist.cpp diff --git a/c++/carla-backend/rtaudio-4.0.11/include/asiolist.h b/c++/carla-engine/rtaudio-4.0.11/include/asiolist.h similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/asiolist.h rename to c++/carla-engine/rtaudio-4.0.11/include/asiolist.h diff --git a/c++/carla-backend/rtaudio-4.0.11/include/asiosys.h b/c++/carla-engine/rtaudio-4.0.11/include/asiosys.h similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/asiosys.h rename to c++/carla-engine/rtaudio-4.0.11/include/asiosys.h diff --git a/c++/carla-backend/rtaudio-4.0.11/include/dsound.h b/c++/carla-engine/rtaudio-4.0.11/include/dsound.h similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/dsound.h rename to c++/carla-engine/rtaudio-4.0.11/include/dsound.h diff --git a/c++/carla-backend/rtaudio-4.0.11/include/ginclude.h b/c++/carla-engine/rtaudio-4.0.11/include/ginclude.h similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/ginclude.h rename to c++/carla-engine/rtaudio-4.0.11/include/ginclude.h diff --git a/c++/carla-backend/rtaudio-4.0.11/include/iasiodrv.h b/c++/carla-engine/rtaudio-4.0.11/include/iasiodrv.h similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/iasiodrv.h rename to c++/carla-engine/rtaudio-4.0.11/include/iasiodrv.h diff --git a/c++/carla-backend/rtaudio-4.0.11/include/iasiothiscallresolver.cpp b/c++/carla-engine/rtaudio-4.0.11/include/iasiothiscallresolver.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/iasiothiscallresolver.cpp rename to c++/carla-engine/rtaudio-4.0.11/include/iasiothiscallresolver.cpp diff --git a/c++/carla-backend/rtaudio-4.0.11/include/iasiothiscallresolver.h b/c++/carla-engine/rtaudio-4.0.11/include/iasiothiscallresolver.h similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/iasiothiscallresolver.h rename to c++/carla-engine/rtaudio-4.0.11/include/iasiothiscallresolver.h diff --git a/c++/carla-backend/rtaudio-4.0.11/include/soundcard.h b/c++/carla-engine/rtaudio-4.0.11/include/soundcard.h similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/include/soundcard.h rename to c++/carla-engine/rtaudio-4.0.11/include/soundcard.h diff --git a/c++/carla-backend/rtaudio-4.0.11/install b/c++/carla-engine/rtaudio-4.0.11/install similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/install rename to c++/carla-engine/rtaudio-4.0.11/install diff --git a/c++/carla-backend/rtaudio-4.0.11/readme b/c++/carla-engine/rtaudio-4.0.11/readme similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/readme rename to c++/carla-engine/rtaudio-4.0.11/readme diff --git a/c++/carla-backend/rtaudio-4.0.11/rtaudio-config.in b/c++/carla-engine/rtaudio-4.0.11/rtaudio-config.in similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/rtaudio-config.in rename to c++/carla-engine/rtaudio-4.0.11/rtaudio-config.in diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/Makefile.in b/c++/carla-engine/rtaudio-4.0.11/tests/Makefile.in similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/Makefile.in rename to c++/carla-engine/rtaudio-4.0.11/tests/Makefile.in diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/Windows/audioprobe.dsp b/c++/carla-engine/rtaudio-4.0.11/tests/Windows/audioprobe.dsp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/Windows/audioprobe.dsp rename to c++/carla-engine/rtaudio-4.0.11/tests/Windows/audioprobe.dsp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/Windows/duplex.dsp b/c++/carla-engine/rtaudio-4.0.11/tests/Windows/duplex.dsp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/Windows/duplex.dsp rename to c++/carla-engine/rtaudio-4.0.11/tests/Windows/duplex.dsp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/Windows/playraw.dsp b/c++/carla-engine/rtaudio-4.0.11/tests/Windows/playraw.dsp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/Windows/playraw.dsp rename to c++/carla-engine/rtaudio-4.0.11/tests/Windows/playraw.dsp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/Windows/playsaw.dsp b/c++/carla-engine/rtaudio-4.0.11/tests/Windows/playsaw.dsp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/Windows/playsaw.dsp rename to c++/carla-engine/rtaudio-4.0.11/tests/Windows/playsaw.dsp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/Windows/record.dsp b/c++/carla-engine/rtaudio-4.0.11/tests/Windows/record.dsp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/Windows/record.dsp rename to c++/carla-engine/rtaudio-4.0.11/tests/Windows/record.dsp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/Windows/rtaudio.dsw b/c++/carla-engine/rtaudio-4.0.11/tests/Windows/rtaudio.dsw similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/Windows/rtaudio.dsw rename to c++/carla-engine/rtaudio-4.0.11/tests/Windows/rtaudio.dsw diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/Windows/testall.dsp b/c++/carla-engine/rtaudio-4.0.11/tests/Windows/testall.dsp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/Windows/testall.dsp rename to c++/carla-engine/rtaudio-4.0.11/tests/Windows/testall.dsp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/Windows/teststops.dsp b/c++/carla-engine/rtaudio-4.0.11/tests/Windows/teststops.dsp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/Windows/teststops.dsp rename to c++/carla-engine/rtaudio-4.0.11/tests/Windows/teststops.dsp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/audioprobe.cpp b/c++/carla-engine/rtaudio-4.0.11/tests/audioprobe.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/audioprobe.cpp rename to c++/carla-engine/rtaudio-4.0.11/tests/audioprobe.cpp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/duplex.cpp b/c++/carla-engine/rtaudio-4.0.11/tests/duplex.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/duplex.cpp rename to c++/carla-engine/rtaudio-4.0.11/tests/duplex.cpp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/playraw.cpp b/c++/carla-engine/rtaudio-4.0.11/tests/playraw.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/playraw.cpp rename to c++/carla-engine/rtaudio-4.0.11/tests/playraw.cpp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/playsaw.cpp b/c++/carla-engine/rtaudio-4.0.11/tests/playsaw.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/playsaw.cpp rename to c++/carla-engine/rtaudio-4.0.11/tests/playsaw.cpp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/record.cpp b/c++/carla-engine/rtaudio-4.0.11/tests/record.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/record.cpp rename to c++/carla-engine/rtaudio-4.0.11/tests/record.cpp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/testall.cpp b/c++/carla-engine/rtaudio-4.0.11/tests/testall.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/testall.cpp rename to c++/carla-engine/rtaudio-4.0.11/tests/testall.cpp diff --git a/c++/carla-backend/rtaudio-4.0.11/tests/teststops.cpp b/c++/carla-engine/rtaudio-4.0.11/tests/teststops.cpp similarity index 100% rename from c++/carla-backend/rtaudio-4.0.11/tests/teststops.cpp rename to c++/carla-engine/rtaudio-4.0.11/tests/teststops.cpp diff --git a/c++/carla-backend/rtmidi-2.0.1/Makefile.in b/c++/carla-engine/rtmidi-2.0.1/Makefile.in similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/Makefile.in rename to c++/carla-engine/rtmidi-2.0.1/Makefile.in diff --git a/c++/carla-backend/rtmidi-2.0.1/RtError.h b/c++/carla-engine/rtmidi-2.0.1/RtError.h similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/RtError.h rename to c++/carla-engine/rtmidi-2.0.1/RtError.h diff --git a/c++/carla-backend/rtmidi-2.0.1/RtMidi.cpp b/c++/carla-engine/rtmidi-2.0.1/RtMidi.cpp similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/RtMidi.cpp rename to c++/carla-engine/rtmidi-2.0.1/RtMidi.cpp diff --git a/c++/carla-backend/rtmidi-2.0.1/RtMidi.h b/c++/carla-engine/rtmidi-2.0.1/RtMidi.h similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/RtMidi.h rename to c++/carla-engine/rtmidi-2.0.1/RtMidi.h diff --git a/c++/carla-backend/rtmidi-2.0.1/config/config.guess b/c++/carla-engine/rtmidi-2.0.1/config/config.guess similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/config/config.guess rename to c++/carla-engine/rtmidi-2.0.1/config/config.guess diff --git a/c++/carla-backend/rtmidi-2.0.1/config/config.sub b/c++/carla-engine/rtmidi-2.0.1/config/config.sub similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/config/config.sub rename to c++/carla-engine/rtmidi-2.0.1/config/config.sub diff --git a/c++/carla-backend/rtmidi-2.0.1/config/install.sh b/c++/carla-engine/rtmidi-2.0.1/config/install.sh similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/config/install.sh rename to c++/carla-engine/rtmidi-2.0.1/config/install.sh diff --git a/c++/carla-backend/rtmidi-2.0.1/configure b/c++/carla-engine/rtmidi-2.0.1/configure similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/configure rename to c++/carla-engine/rtmidi-2.0.1/configure diff --git a/c++/carla-backend/rtmidi-2.0.1/configure.ac b/c++/carla-engine/rtmidi-2.0.1/configure.ac similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/configure.ac rename to c++/carla-engine/rtmidi-2.0.1/configure.ac diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/doxygen/Doxyfile b/c++/carla-engine/rtmidi-2.0.1/doc/doxygen/Doxyfile similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/doxygen/Doxyfile rename to c++/carla-engine/rtmidi-2.0.1/doc/doxygen/Doxyfile diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/doxygen/footer.html b/c++/carla-engine/rtmidi-2.0.1/doc/doxygen/footer.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/doxygen/footer.html rename to c++/carla-engine/rtmidi-2.0.1/doc/doxygen/footer.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/doxygen/header.html b/c++/carla-engine/rtmidi-2.0.1/doc/doxygen/header.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/doxygen/header.html rename to c++/carla-engine/rtmidi-2.0.1/doc/doxygen/header.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/doxygen/tutorial.txt b/c++/carla-engine/rtmidi-2.0.1/doc/doxygen/tutorial.txt similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/doxygen/tutorial.txt rename to c++/carla-engine/rtmidi-2.0.1/doc/doxygen/tutorial.txt diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/RtError_8h-source.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/RtError_8h-source.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/RtError_8h-source.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/RtError_8h-source.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/RtError_8h_source.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/RtError_8h_source.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/RtError_8h_source.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/RtError_8h_source.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/RtMidi_8h-source.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/RtMidi_8h-source.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/RtMidi_8h-source.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/RtMidi_8h-source.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/RtMidi_8h.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/RtMidi_8h.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/RtMidi_8h.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/RtMidi_8h.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/RtMidi_8h_source.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/RtMidi_8h_source.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/RtMidi_8h_source.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/RtMidi_8h_source.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/annotated.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/annotated.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/annotated.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/annotated.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInAlsa-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInAlsa-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInAlsa-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInAlsa-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInAlsa.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInAlsa.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInAlsa.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInAlsa.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInAlsa.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInAlsa.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInAlsa.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInAlsa.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInApi-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInApi-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInApi-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInApi-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInApi.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInApi.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInApi.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInApi.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInApi.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInApi.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInApi.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInApi.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInCore-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInCore-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInCore-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInCore-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInCore.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInCore.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInCore.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInCore.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInCore.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInCore.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInCore.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInCore.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInDummy-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInDummy-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInDummy-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInDummy-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInDummy.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInDummy.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInDummy.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInDummy.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInDummy.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInDummy.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInDummy.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInDummy.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInJack-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInJack-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInJack-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInJack-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInJack.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInJack.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInJack.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInJack.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInJack.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInJack.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInJack.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInJack.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInWinKS-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInWinKS-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInWinKS-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInWinKS-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInWinKS.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInWinKS.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInWinKS.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInWinKS.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInWinKS.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInWinKS.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInWinKS.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInWinKS.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInWinMM-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInWinMM-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInWinMM-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInWinMM-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInWinMM.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInWinMM.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInWinMM.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInWinMM.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInWinMM.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInWinMM.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiInWinMM.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiInWinMM.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutAlsa-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutAlsa-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutAlsa-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutAlsa-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutAlsa.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutAlsa.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutAlsa.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutAlsa.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutAlsa.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutAlsa.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutAlsa.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutAlsa.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutApi-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutApi-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutApi-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutApi-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutApi.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutApi.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutApi.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutApi.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutApi.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutApi.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutApi.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutApi.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutCore-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutCore-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutCore-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutCore-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutCore.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutCore.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutCore.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutCore.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutCore.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutCore.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutCore.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutCore.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutDummy-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutDummy-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutDummy-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutDummy-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutDummy.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutDummy.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutDummy.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutDummy.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutDummy.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutDummy.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutDummy.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutDummy.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutJack-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutJack-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutJack-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutJack-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutJack.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutJack.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutJack.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutJack.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutJack.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutJack.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutJack.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutJack.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutWinKS-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutWinKS-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutWinKS-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutWinKS-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutWinKS.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutWinKS.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutWinKS.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutWinKS.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutWinKS.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutWinKS.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutWinKS.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutWinKS.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutWinMM-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutWinMM-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutWinMM-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutWinMM-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutWinMM.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutWinMM.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutWinMM.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutWinMM.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutWinMM.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutWinMM.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classMidiOutWinMM.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classMidiOutWinMM.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtError-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtError-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtError-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtError-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtError.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtError.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtError.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtError.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidi-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidi-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidi-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidi-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidi.gif b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidi.gif similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidi.gif rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidi.gif diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidi.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidi.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidi.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidi.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidi.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidi.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidi.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidi.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiIn-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiIn-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiIn-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiIn-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiIn.gif b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiIn.gif similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiIn.gif rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiIn.gif diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiIn.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiIn.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiIn.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiIn.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiIn.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiIn.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiIn.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiIn.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiOut-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiOut-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiOut-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiOut-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiOut.gif b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiOut.gif similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiOut.gif rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiOut.gif diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiOut.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiOut.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiOut.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiOut.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiOut.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiOut.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classRtMidiOut.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classRtMidiOut.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/classes.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/classes.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/classes.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/classes.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/doxygen.css b/c++/carla-engine/rtmidi-2.0.1/doc/html/doxygen.css similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/doxygen.css rename to c++/carla-engine/rtmidi-2.0.1/doc/html/doxygen.css diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/doxygen.png b/c++/carla-engine/rtmidi-2.0.1/doc/html/doxygen.png similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/doxygen.png rename to c++/carla-engine/rtmidi-2.0.1/doc/html/doxygen.png diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/files.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/files.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/files.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/files.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/functions.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/functions.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/functions.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/functions.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/functions_enum.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/functions_enum.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/functions_enum.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/functions_enum.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/functions_eval.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/functions_eval.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/functions_eval.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/functions_eval.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/functions_func.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/functions_func.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/functions_func.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/functions_func.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/functions_type.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/functions_type.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/functions_type.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/functions_type.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/hierarchy.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/hierarchy.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/hierarchy.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/hierarchy.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/index.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/index.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/index.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/index.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData-members.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData-members.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData-members.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData-members.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData.html b/c++/carla-engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData.html similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData.html rename to c++/carla-engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData.html diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/tab_b.gif b/c++/carla-engine/rtmidi-2.0.1/doc/html/tab_b.gif similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/tab_b.gif rename to c++/carla-engine/rtmidi-2.0.1/doc/html/tab_b.gif diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/tab_l.gif b/c++/carla-engine/rtmidi-2.0.1/doc/html/tab_l.gif similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/tab_l.gif rename to c++/carla-engine/rtmidi-2.0.1/doc/html/tab_l.gif diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/tab_r.gif b/c++/carla-engine/rtmidi-2.0.1/doc/html/tab_r.gif similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/tab_r.gif rename to c++/carla-engine/rtmidi-2.0.1/doc/html/tab_r.gif diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/html/tabs.css b/c++/carla-engine/rtmidi-2.0.1/doc/html/tabs.css similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/html/tabs.css rename to c++/carla-engine/rtmidi-2.0.1/doc/html/tabs.css diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/images/ccrma.gif b/c++/carla-engine/rtmidi-2.0.1/doc/images/ccrma.gif similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/images/ccrma.gif rename to c++/carla-engine/rtmidi-2.0.1/doc/images/ccrma.gif diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/images/mcgill.gif b/c++/carla-engine/rtmidi-2.0.1/doc/images/mcgill.gif similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/images/mcgill.gif rename to c++/carla-engine/rtmidi-2.0.1/doc/images/mcgill.gif diff --git a/c++/carla-backend/rtmidi-2.0.1/doc/release.txt b/c++/carla-engine/rtmidi-2.0.1/doc/release.txt similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/doc/release.txt rename to c++/carla-engine/rtmidi-2.0.1/doc/release.txt diff --git a/c++/carla-backend/rtmidi-2.0.1/include/ks.h b/c++/carla-engine/rtmidi-2.0.1/include/ks.h similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/include/ks.h rename to c++/carla-engine/rtmidi-2.0.1/include/ks.h diff --git a/c++/carla-backend/rtmidi-2.0.1/include/ksmedia.h b/c++/carla-engine/rtmidi-2.0.1/include/ksmedia.h similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/include/ksmedia.h rename to c++/carla-engine/rtmidi-2.0.1/include/ksmedia.h diff --git a/c++/carla-backend/rtmidi-2.0.1/msw/readme b/c++/carla-engine/rtmidi-2.0.1/msw/readme similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/msw/readme rename to c++/carla-engine/rtmidi-2.0.1/msw/readme diff --git a/c++/carla-backend/rtmidi-2.0.1/msw/rtmidilib.sln b/c++/carla-engine/rtmidi-2.0.1/msw/rtmidilib.sln similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/msw/rtmidilib.sln rename to c++/carla-engine/rtmidi-2.0.1/msw/rtmidilib.sln diff --git a/c++/carla-backend/rtmidi-2.0.1/msw/rtmidilib.vcproj b/c++/carla-engine/rtmidi-2.0.1/msw/rtmidilib.vcproj similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/msw/rtmidilib.vcproj rename to c++/carla-engine/rtmidi-2.0.1/msw/rtmidilib.vcproj diff --git a/c++/carla-backend/rtmidi-2.0.1/readme b/c++/carla-engine/rtmidi-2.0.1/readme similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/readme rename to c++/carla-engine/rtmidi-2.0.1/readme diff --git a/c++/carla-backend/rtmidi-2.0.1/rtmidi-config.in b/c++/carla-engine/rtmidi-2.0.1/rtmidi-config.in similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/rtmidi-config.in rename to c++/carla-engine/rtmidi-2.0.1/rtmidi-config.in diff --git a/c++/carla-backend/rtmidi-2.0.1/tests/Makefile.in b/c++/carla-engine/rtmidi-2.0.1/tests/Makefile.in similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/tests/Makefile.in rename to c++/carla-engine/rtmidi-2.0.1/tests/Makefile.in diff --git a/c++/carla-backend/rtmidi-2.0.1/tests/RtMidi.dsw b/c++/carla-engine/rtmidi-2.0.1/tests/RtMidi.dsw similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/tests/RtMidi.dsw rename to c++/carla-engine/rtmidi-2.0.1/tests/RtMidi.dsw diff --git a/c++/carla-backend/rtmidi-2.0.1/tests/cmidiin.cpp b/c++/carla-engine/rtmidi-2.0.1/tests/cmidiin.cpp similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/tests/cmidiin.cpp rename to c++/carla-engine/rtmidi-2.0.1/tests/cmidiin.cpp diff --git a/c++/carla-backend/rtmidi-2.0.1/tests/cmidiin.dsp b/c++/carla-engine/rtmidi-2.0.1/tests/cmidiin.dsp similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/tests/cmidiin.dsp rename to c++/carla-engine/rtmidi-2.0.1/tests/cmidiin.dsp diff --git a/c++/carla-backend/rtmidi-2.0.1/tests/midiout.cpp b/c++/carla-engine/rtmidi-2.0.1/tests/midiout.cpp similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/tests/midiout.cpp rename to c++/carla-engine/rtmidi-2.0.1/tests/midiout.cpp diff --git a/c++/carla-backend/rtmidi-2.0.1/tests/midiout.dsp b/c++/carla-engine/rtmidi-2.0.1/tests/midiout.dsp similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/tests/midiout.dsp rename to c++/carla-engine/rtmidi-2.0.1/tests/midiout.dsp diff --git a/c++/carla-backend/rtmidi-2.0.1/tests/midiprobe.cpp b/c++/carla-engine/rtmidi-2.0.1/tests/midiprobe.cpp similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/tests/midiprobe.cpp rename to c++/carla-engine/rtmidi-2.0.1/tests/midiprobe.cpp diff --git a/c++/carla-backend/rtmidi-2.0.1/tests/midiprobe.dsp b/c++/carla-engine/rtmidi-2.0.1/tests/midiprobe.dsp similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/tests/midiprobe.dsp rename to c++/carla-engine/rtmidi-2.0.1/tests/midiprobe.dsp diff --git a/c++/carla-backend/rtmidi-2.0.1/tests/qmidiin.cpp b/c++/carla-engine/rtmidi-2.0.1/tests/qmidiin.cpp similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/tests/qmidiin.cpp rename to c++/carla-engine/rtmidi-2.0.1/tests/qmidiin.cpp diff --git a/c++/carla-backend/rtmidi-2.0.1/tests/qmidiin.dsp b/c++/carla-engine/rtmidi-2.0.1/tests/qmidiin.dsp similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/tests/qmidiin.dsp rename to c++/carla-engine/rtmidi-2.0.1/tests/qmidiin.dsp diff --git a/c++/carla-backend/rtmidi-2.0.1/tests/sysextest.cpp b/c++/carla-engine/rtmidi-2.0.1/tests/sysextest.cpp similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/tests/sysextest.cpp rename to c++/carla-engine/rtmidi-2.0.1/tests/sysextest.cpp diff --git a/c++/carla-backend/rtmidi-2.0.1/tests/sysextest.dsp b/c++/carla-engine/rtmidi-2.0.1/tests/sysextest.dsp similarity index 100% rename from c++/carla-backend/rtmidi-2.0.1/tests/sysextest.dsp rename to c++/carla-engine/rtmidi-2.0.1/tests/sysextest.dsp diff --git a/c++/carla-jackbridge/Makefile b/c++/carla-jackbridge/Makefile index 9a4c9c8..8cdbedb 100644 --- a/c++/carla-jackbridge/Makefile +++ b/c++/carla-jackbridge/Makefile @@ -4,28 +4,20 @@ # Created by falkTX # -CXX ?= g++ -WINECXX ?= wineg++ -STRIP ?= strip - -BASE_FLAGS = -O2 -ffast-math -fomit-frame-pointer -fPIC -mtune=generic -msse -mfpmath=sse -Wall -BASE_FLAGS += -I../carla-includes - -BUILD_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS) -BUILD_FLAGS += $(shell pkg-config --cflags jack QtCore) -BUILD_FLAGS += -DBUILD_BRIDGE -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT # -DNDEBUG +include ../Makefile.mk +WINECXX ?= wineg++ -32BIT_FLAGS = -m32 -64BIT_FLAGS = -m64 -LINK_FLAGS = -shared $(LDFLAGS) +BUILD_CXX_FLAGS += -I../carla-includes +BUILD_CXX_FLAGS += $(shell pkg-config --cflags jack QtCore) +LINK_FLAGS += -shared -WIN_BUILD_FLAGS = $(BUILD_FLAGS) -DJACKBRIDGE_DUMMY -I. +WIN_BUILD_FLAGS = $(BUILD_CXX_FLAGS) -DJACKBRIDGE_DUMMY -I. WIN_32BIT_FLAGS = $(32BIT_FLAGS) WIN_64BIT_FLAGS = $(64BIT_FLAGS) WIN_LINK_FLAGS = $(LINK_FLAGS) -WINE_BUILD_FLAGS = $(BUILD_FLAGS) +WINE_BUILD_FLAGS = $(BUILD_CXX_FLAGS) -fPIC WINE_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32/wine -L/usr/lib/i386-linux-gnu/wine WINE_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64/wine -L/usr/lib/x86_64-linux-gnu/wine WINE_LINK_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs jack) -ldl diff --git a/c++/carla-jackbridge/carla_jackbridge.cpp b/c++/carla-jackbridge/carla_jackbridge.cpp index b817ec7..4a0978f 100644 --- a/c++/carla-jackbridge/carla_jackbridge.cpp +++ b/c++/carla-jackbridge/carla_jackbridge.cpp @@ -17,7 +17,7 @@ #include "carla_jackbridge.h" -jack_client_t* jackbridge_client_open(const char* client_name, jack_options_t options, jack_status_t* status) +jack_client_t* jackbridge_client_open(const char* client_name, jack_options_t options, jack_status_t* status, ...) { #ifndef JACKBRIDGE_DUMMY return jack_client_open(client_name, options, status); @@ -103,15 +103,6 @@ int jackbridge_deactivate(jack_client_t* client) #endif } -int jackbridge_set_process_thread(jack_client_t* client, JackThreadCallback thread_callback, void *arg) -{ -#ifndef JACKBRIDGE_DUMMY - return jack_set_process_thread(client, thread_callback, arg); -#else - return 0; -#endif -} - void jackbridge_on_shutdown(jack_client_t* client, JackShutdownCallback shutdown_callback, void* arg) { #ifndef JACKBRIDGE_DUMMY diff --git a/c++/carla-jackbridge/carla_jackbridge.h b/c++/carla-jackbridge/carla_jackbridge.h index 0c5ab1d..92cb49d 100644 --- a/c++/carla-jackbridge/carla_jackbridge.h +++ b/c++/carla-jackbridge/carla_jackbridge.h @@ -34,7 +34,7 @@ struct jackbridge_midi_event_t { jackbridge_midi_data_t* buffer; }; -CARLA_EXPORT jack_client_t* jackbridge_client_open(const char* client_name, jack_options_t options, jack_status_t* status); +CARLA_EXPORT jack_client_t* jackbridge_client_open(const char* client_name, jack_options_t options, jack_status_t* status, ...); CARLA_EXPORT int jackbridge_client_close(jack_client_t* client); CARLA_EXPORT int jackbridge_client_name_size(); CARLA_EXPORT char* jackbridge_get_client_name(jack_client_t* client); diff --git a/c++/carla-lilv/Makefile b/c++/carla-lilv/Makefile index 2c09d27..e6fcad7 100644 --- a/c++/carla-lilv/Makefile +++ b/c++/carla-lilv/Makefile @@ -4,19 +4,15 @@ # Created by falkTX # -CC ?= gcc -AR ?= ar +include ../Makefile.mk SERD_VERSION = 0.18.0 SORD_VERSION = 0.10.4 SRATOM_VERSION = 0.4.0 LILV_VERSION = 0.14.4 -BUILD_FLAGS = -O2 -ffast-math -fomit-frame-pointer -fvisibility=hidden -fPIC -mtune=generic -msse -mfpmath=sse -std=c99 -Wall $(CFLAGS) -BUILD_FLAGS += -Iconfig -I../carla-includes - -32BIT_FLAGS = -m32 -64BIT_FLAGS = -m64 +BUILD_C_FLAGS += -fvisibility=hidden -fPIC +BUILD_C_FLAGS += -Iconfig -I../carla-includes OBJS = serd.o sord.o sratom.o lilv.o OBJS_posix32 = serd_posix32.o sord_posix32.o sratom_posix32.o lilv_posix32.o @@ -32,16 +28,16 @@ carla_lilv.a: $(OBJS) $(AR) rs $@ $^ serd.o: serd.c - $(CC) $< $(BUILD_FLAGS) -Iserd-$(SERD_VERSION) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) -c -o $@ sord.o: sord.c - $(CC) $< $(BUILD_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src -c -o $@ sratom.o: sratom.c - $(CC) $< $(BUILD_FLAGS) -Isratom-$(SRATOM_VERSION) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) -c -o $@ lilv.o: lilv.c - $(CC) $< $(BUILD_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src -c -o $@ # -------------------------------------------------------------- @@ -51,16 +47,16 @@ carla_lilv_posix32.a: $(OBJS_posix32) $(AR) rs $@ $^ serd_posix32.o: serd.c - $(CC) $< $(BUILD_FLAGS) -Iserd-$(SERD_VERSION) $(32BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(32BIT_FLAGS) -c -o $@ sord_posix32.o: sord.c - $(CC) $< $(BUILD_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(32BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(32BIT_FLAGS) -c -o $@ sratom_posix32.o: sratom.c - $(CC) $< $(BUILD_FLAGS) -Isratom-$(SRATOM_VERSION) $(32BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(32BIT_FLAGS) -c -o $@ lilv_posix32.o: lilv.c - $(CC) $< $(BUILD_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(32BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(32BIT_FLAGS) -c -o $@ # -------------------------------------------------------------- @@ -70,16 +66,16 @@ carla_lilv_posix64.a: $(OBJS_posix64) $(AR) rs $@ $^ serd_posix64.o: serd.c - $(CC) $< $(BUILD_FLAGS) -Iserd-$(SERD_VERSION) $(64BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(64BIT_FLAGS) -c -o $@ sord_posix64.o: sord.c - $(CC) $< $(BUILD_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(64BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(64BIT_FLAGS) -c -o $@ sratom_posix64.o: sratom.c - $(CC) $< $(BUILD_FLAGS) -Isratom-$(SRATOM_VERSION) $(64BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(64BIT_FLAGS) -c -o $@ lilv_posix64.o: lilv.c - $(CC) $< $(BUILD_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(64BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(64BIT_FLAGS) -c -o $@ # -------------------------------------------------------------- @@ -89,16 +85,16 @@ carla_lilv_win32.a: $(OBJS_win32) $(AR) rs $@ $^ serd_win32.o: serd.c - $(CC) $< $(BUILD_FLAGS) -Iserd-$(SERD_VERSION) $(32BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(32BIT_FLAGS) -c -o $@ sord_win32.o: sord.c - $(CC) $< $(BUILD_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(32BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(32BIT_FLAGS) -c -o $@ sratom_win32.o: sratom.c - $(CC) $< $(BUILD_FLAGS) -Isratom-$(SRATOM_VERSION) $(32BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(32BIT_FLAGS) -c -o $@ lilv_win32.o: lilv.c - $(CC) $< $(BUILD_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(32BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(32BIT_FLAGS) -c -o $@ # -------------------------------------------------------------- @@ -108,19 +104,18 @@ carla_lilv_win64.a: $(OBJS_win64) $(AR) rs $@ $^ serd_win64.o: serd.c - $(CC) $< $(BUILD_FLAGS) -Iserd-$(SERD_VERSION) $(64BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(64BIT_FLAGS) -c -o $@ sord_win64.o: sord.c - $(CC) $< $(BUILD_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(64BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(64BIT_FLAGS) -c -o $@ sratom_win64.o: sratom.c - $(CC) $< $(BUILD_FLAGS) -Isratom-$(SRATOM_VERSION) $(64BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(64BIT_FLAGS) -c -o $@ lilv_win64.o: lilv.c - $(CC) $< $(BUILD_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(64BIT_FLAGS) -c -o $@ + $(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(64BIT_FLAGS) -c -o $@ # -------------------------------------------------------------- clean: rm -f *.a *.o - diff --git a/c++/carla-backend/plugins/bypass.c b/c++/carla-native/bypass.c similarity index 100% rename from c++/carla-backend/plugins/bypass.c rename to c++/carla-native/bypass.c diff --git a/c++/carla-backend/plugins/carla_native.h b/c++/carla-native/carla_native.h similarity index 99% rename from c++/carla-backend/plugins/carla_native.h rename to c++/carla-native/carla_native.h index 55f9f33..e8e81ea 100644 --- a/c++/carla-backend/plugins/carla_native.h +++ b/c++/carla-native/carla_native.h @@ -21,7 +21,7 @@ #ifdef __cplusplus extern "C" { #else -#include +# include #endif #include diff --git a/c++/carla-backend/plugins/carla_nativemm.h b/c++/carla-native/carla_native.hpp similarity index 99% rename from c++/carla-backend/plugins/carla_nativemm.h rename to c++/carla-native/carla_native.hpp index dc051b2..fa1c7ec 100644 --- a/c++/carla-backend/plugins/carla_nativemm.h +++ b/c++/carla-native/carla_native.hpp @@ -15,8 +15,8 @@ * For a full copy of the GNU General Public License see the COPYING file */ -#ifndef CARLA_NATIVE_MM_H -#define CARLA_NATIVE_MM_H +#ifndef CARLA_NATIVE_HPP +#define CARLA_NATIVE_HPP #include "carla_native.h" #include "carla_utils.hpp" @@ -432,4 +432,4 @@ private: #define CARLA_REGISTER_NATIVE_PLUGIN_MM(label, descMM) \ void carla_register_native_plugin_##label () { carla_register_native_plugin(descMM.descriptorInit()); } -#endif // CARLA_NATIVE_MM_H +#endif // CARLA_NATIVE_HPP diff --git a/c++/carla-backend/plugins/midi-split.cpp b/c++/carla-native/midi-split.cpp similarity index 99% rename from c++/carla-backend/plugins/midi-split.cpp rename to c++/carla-native/midi-split.cpp index 04f695d..6e367b3 100644 --- a/c++/carla-backend/plugins/midi-split.cpp +++ b/c++/carla-native/midi-split.cpp @@ -15,7 +15,7 @@ * For a full copy of the GNU General Public License see the COPYING file */ -#include "carla_nativemm.h" +#include "carla_native.hpp" #include diff --git a/c++/carla-backend/plugins/zynaddsubfx-src.cpp b/c++/carla-native/zynaddsubfx-src.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx-src.cpp rename to c++/carla-native/zynaddsubfx-src.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx.cpp b/c++/carla-native/zynaddsubfx.cpp similarity index 99% rename from c++/carla-backend/plugins/zynaddsubfx.cpp rename to c++/carla-native/zynaddsubfx.cpp index d08537d..3d77717 100644 --- a/c++/carla-backend/plugins/zynaddsubfx.cpp +++ b/c++/carla-native/zynaddsubfx.cpp @@ -16,7 +16,7 @@ */ #include "carla_midi.hpp" -#include "carla_nativemm.h" +#include "carla_native.hpp" #include "zynaddsubfx/Misc/Master.h" #include "zynaddsubfx/Misc/Util.h" diff --git a/c++/carla-backend/plugins/zynaddsubfx/CMakeLists.txt b/c++/carla-native/zynaddsubfx/CMakeLists.txt similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/CMakeLists.txt rename to c++/carla-native/zynaddsubfx/CMakeLists.txt diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/AnalogFilter.cpp b/c++/carla-native/zynaddsubfx/DSP/AnalogFilter.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/AnalogFilter.cpp rename to c++/carla-native/zynaddsubfx/DSP/AnalogFilter.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/AnalogFilter.h b/c++/carla-native/zynaddsubfx/DSP/AnalogFilter.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/AnalogFilter.h rename to c++/carla-native/zynaddsubfx/DSP/AnalogFilter.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/CMakeLists.txt b/c++/carla-native/zynaddsubfx/DSP/CMakeLists.txt similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/CMakeLists.txt rename to c++/carla-native/zynaddsubfx/DSP/CMakeLists.txt diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/FFTwrapper.cpp b/c++/carla-native/zynaddsubfx/DSP/FFTwrapper.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/FFTwrapper.cpp rename to c++/carla-native/zynaddsubfx/DSP/FFTwrapper.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/FFTwrapper.h b/c++/carla-native/zynaddsubfx/DSP/FFTwrapper.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/FFTwrapper.h rename to c++/carla-native/zynaddsubfx/DSP/FFTwrapper.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/Filter.cpp b/c++/carla-native/zynaddsubfx/DSP/Filter.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/Filter.cpp rename to c++/carla-native/zynaddsubfx/DSP/Filter.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/Filter.h b/c++/carla-native/zynaddsubfx/DSP/Filter.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/Filter.h rename to c++/carla-native/zynaddsubfx/DSP/Filter.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/FormantFilter.cpp b/c++/carla-native/zynaddsubfx/DSP/FormantFilter.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/FormantFilter.cpp rename to c++/carla-native/zynaddsubfx/DSP/FormantFilter.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/FormantFilter.h b/c++/carla-native/zynaddsubfx/DSP/FormantFilter.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/FormantFilter.h rename to c++/carla-native/zynaddsubfx/DSP/FormantFilter.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/SVFilter.cpp b/c++/carla-native/zynaddsubfx/DSP/SVFilter.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/SVFilter.cpp rename to c++/carla-native/zynaddsubfx/DSP/SVFilter.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/SVFilter.h b/c++/carla-native/zynaddsubfx/DSP/SVFilter.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/SVFilter.h rename to c++/carla-native/zynaddsubfx/DSP/SVFilter.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/Unison.cpp b/c++/carla-native/zynaddsubfx/DSP/Unison.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/Unison.cpp rename to c++/carla-native/zynaddsubfx/DSP/Unison.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/DSP/Unison.h b/c++/carla-native/zynaddsubfx/DSP/Unison.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/DSP/Unison.h rename to c++/carla-native/zynaddsubfx/DSP/Unison.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Alienwah.cpp b/c++/carla-native/zynaddsubfx/Effects/Alienwah.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Alienwah.cpp rename to c++/carla-native/zynaddsubfx/Effects/Alienwah.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Alienwah.h b/c++/carla-native/zynaddsubfx/Effects/Alienwah.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Alienwah.h rename to c++/carla-native/zynaddsubfx/Effects/Alienwah.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/CMakeLists.txt b/c++/carla-native/zynaddsubfx/Effects/CMakeLists.txt similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/CMakeLists.txt rename to c++/carla-native/zynaddsubfx/Effects/CMakeLists.txt diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Chorus.cpp b/c++/carla-native/zynaddsubfx/Effects/Chorus.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Chorus.cpp rename to c++/carla-native/zynaddsubfx/Effects/Chorus.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Chorus.h b/c++/carla-native/zynaddsubfx/Effects/Chorus.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Chorus.h rename to c++/carla-native/zynaddsubfx/Effects/Chorus.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Distorsion.cpp b/c++/carla-native/zynaddsubfx/Effects/Distorsion.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Distorsion.cpp rename to c++/carla-native/zynaddsubfx/Effects/Distorsion.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Distorsion.h b/c++/carla-native/zynaddsubfx/Effects/Distorsion.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Distorsion.h rename to c++/carla-native/zynaddsubfx/Effects/Distorsion.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/DynamicFilter.cpp b/c++/carla-native/zynaddsubfx/Effects/DynamicFilter.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/DynamicFilter.cpp rename to c++/carla-native/zynaddsubfx/Effects/DynamicFilter.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/DynamicFilter.h b/c++/carla-native/zynaddsubfx/Effects/DynamicFilter.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/DynamicFilter.h rename to c++/carla-native/zynaddsubfx/Effects/DynamicFilter.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/EQ.cpp b/c++/carla-native/zynaddsubfx/Effects/EQ.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/EQ.cpp rename to c++/carla-native/zynaddsubfx/Effects/EQ.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/EQ.h b/c++/carla-native/zynaddsubfx/Effects/EQ.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/EQ.h rename to c++/carla-native/zynaddsubfx/Effects/EQ.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Echo.cpp b/c++/carla-native/zynaddsubfx/Effects/Echo.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Echo.cpp rename to c++/carla-native/zynaddsubfx/Effects/Echo.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Echo.h b/c++/carla-native/zynaddsubfx/Effects/Echo.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Echo.h rename to c++/carla-native/zynaddsubfx/Effects/Echo.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Effect.cpp b/c++/carla-native/zynaddsubfx/Effects/Effect.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Effect.cpp rename to c++/carla-native/zynaddsubfx/Effects/Effect.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Effect.h b/c++/carla-native/zynaddsubfx/Effects/Effect.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Effect.h rename to c++/carla-native/zynaddsubfx/Effects/Effect.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/EffectLFO.cpp b/c++/carla-native/zynaddsubfx/Effects/EffectLFO.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/EffectLFO.cpp rename to c++/carla-native/zynaddsubfx/Effects/EffectLFO.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/EffectLFO.h b/c++/carla-native/zynaddsubfx/Effects/EffectLFO.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/EffectLFO.h rename to c++/carla-native/zynaddsubfx/Effects/EffectLFO.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/EffectMgr.cpp b/c++/carla-native/zynaddsubfx/Effects/EffectMgr.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/EffectMgr.cpp rename to c++/carla-native/zynaddsubfx/Effects/EffectMgr.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/EffectMgr.h b/c++/carla-native/zynaddsubfx/Effects/EffectMgr.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/EffectMgr.h rename to c++/carla-native/zynaddsubfx/Effects/EffectMgr.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Phaser.cpp b/c++/carla-native/zynaddsubfx/Effects/Phaser.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Phaser.cpp rename to c++/carla-native/zynaddsubfx/Effects/Phaser.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Phaser.h b/c++/carla-native/zynaddsubfx/Effects/Phaser.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Phaser.h rename to c++/carla-native/zynaddsubfx/Effects/Phaser.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Reverb.cpp b/c++/carla-native/zynaddsubfx/Effects/Reverb.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Reverb.cpp rename to c++/carla-native/zynaddsubfx/Effects/Reverb.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Effects/Reverb.h b/c++/carla-native/zynaddsubfx/Effects/Reverb.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Effects/Reverb.h rename to c++/carla-native/zynaddsubfx/Effects/Reverb.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Bank.cpp b/c++/carla-native/zynaddsubfx/Misc/Bank.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Bank.cpp rename to c++/carla-native/zynaddsubfx/Misc/Bank.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Bank.h b/c++/carla-native/zynaddsubfx/Misc/Bank.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Bank.h rename to c++/carla-native/zynaddsubfx/Misc/Bank.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/CMakeLists.txt b/c++/carla-native/zynaddsubfx/Misc/CMakeLists.txt similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/CMakeLists.txt rename to c++/carla-native/zynaddsubfx/Misc/CMakeLists.txt diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Config.cpp b/c++/carla-native/zynaddsubfx/Misc/Config.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Config.cpp rename to c++/carla-native/zynaddsubfx/Misc/Config.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Config.h b/c++/carla-native/zynaddsubfx/Misc/Config.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Config.h rename to c++/carla-native/zynaddsubfx/Misc/Config.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Control.h b/c++/carla-native/zynaddsubfx/Misc/Control.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Control.h rename to c++/carla-native/zynaddsubfx/Misc/Control.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Dump.cpp b/c++/carla-native/zynaddsubfx/Misc/Dump.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Dump.cpp rename to c++/carla-native/zynaddsubfx/Misc/Dump.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Dump.h b/c++/carla-native/zynaddsubfx/Misc/Dump.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Dump.h rename to c++/carla-native/zynaddsubfx/Misc/Dump.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/LASHClient.cpp b/c++/carla-native/zynaddsubfx/Misc/LASHClient.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/LASHClient.cpp rename to c++/carla-native/zynaddsubfx/Misc/LASHClient.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/LASHClient.h b/c++/carla-native/zynaddsubfx/Misc/LASHClient.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/LASHClient.h rename to c++/carla-native/zynaddsubfx/Misc/LASHClient.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Master.cpp b/c++/carla-native/zynaddsubfx/Misc/Master.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Master.cpp rename to c++/carla-native/zynaddsubfx/Misc/Master.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Master.h b/c++/carla-native/zynaddsubfx/Misc/Master.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Master.h rename to c++/carla-native/zynaddsubfx/Misc/Master.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Microtonal.cpp b/c++/carla-native/zynaddsubfx/Misc/Microtonal.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Microtonal.cpp rename to c++/carla-native/zynaddsubfx/Misc/Microtonal.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Microtonal.h b/c++/carla-native/zynaddsubfx/Misc/Microtonal.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Microtonal.h rename to c++/carla-native/zynaddsubfx/Misc/Microtonal.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Part.cpp b/c++/carla-native/zynaddsubfx/Misc/Part.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Part.cpp rename to c++/carla-native/zynaddsubfx/Misc/Part.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Part.h b/c++/carla-native/zynaddsubfx/Misc/Part.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Part.h rename to c++/carla-native/zynaddsubfx/Misc/Part.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Recorder.cpp b/c++/carla-native/zynaddsubfx/Misc/Recorder.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Recorder.cpp rename to c++/carla-native/zynaddsubfx/Misc/Recorder.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Recorder.h b/c++/carla-native/zynaddsubfx/Misc/Recorder.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Recorder.h rename to c++/carla-native/zynaddsubfx/Misc/Recorder.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Stereo.cpp b/c++/carla-native/zynaddsubfx/Misc/Stereo.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Stereo.cpp rename to c++/carla-native/zynaddsubfx/Misc/Stereo.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Stereo.h b/c++/carla-native/zynaddsubfx/Misc/Stereo.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Stereo.h rename to c++/carla-native/zynaddsubfx/Misc/Stereo.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Util.cpp b/c++/carla-native/zynaddsubfx/Misc/Util.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Util.cpp rename to c++/carla-native/zynaddsubfx/Misc/Util.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/Util.h b/c++/carla-native/zynaddsubfx/Misc/Util.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/Util.h rename to c++/carla-native/zynaddsubfx/Misc/Util.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/WavFile.cpp b/c++/carla-native/zynaddsubfx/Misc/WavFile.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/WavFile.cpp rename to c++/carla-native/zynaddsubfx/Misc/WavFile.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/WavFile.h b/c++/carla-native/zynaddsubfx/Misc/WavFile.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/WavFile.h rename to c++/carla-native/zynaddsubfx/Misc/WavFile.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/WaveShapeSmps.cpp b/c++/carla-native/zynaddsubfx/Misc/WaveShapeSmps.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/WaveShapeSmps.cpp rename to c++/carla-native/zynaddsubfx/Misc/WaveShapeSmps.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/WaveShapeSmps.h b/c++/carla-native/zynaddsubfx/Misc/WaveShapeSmps.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/WaveShapeSmps.h rename to c++/carla-native/zynaddsubfx/Misc/WaveShapeSmps.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/XMLwrapper.cpp b/c++/carla-native/zynaddsubfx/Misc/XMLwrapper.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/XMLwrapper.cpp rename to c++/carla-native/zynaddsubfx/Misc/XMLwrapper.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Misc/XMLwrapper.h b/c++/carla-native/zynaddsubfx/Misc/XMLwrapper.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Misc/XMLwrapper.h rename to c++/carla-native/zynaddsubfx/Misc/XMLwrapper.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/AlsaEngine.cpp b/c++/carla-native/zynaddsubfx/Nio/AlsaEngine.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/AlsaEngine.cpp rename to c++/carla-native/zynaddsubfx/Nio/AlsaEngine.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/AlsaEngine.h b/c++/carla-native/zynaddsubfx/Nio/AlsaEngine.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/AlsaEngine.h rename to c++/carla-native/zynaddsubfx/Nio/AlsaEngine.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/AudioOut.cpp b/c++/carla-native/zynaddsubfx/Nio/AudioOut.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/AudioOut.cpp rename to c++/carla-native/zynaddsubfx/Nio/AudioOut.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/AudioOut.h b/c++/carla-native/zynaddsubfx/Nio/AudioOut.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/AudioOut.h rename to c++/carla-native/zynaddsubfx/Nio/AudioOut.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/CMakeLists.txt b/c++/carla-native/zynaddsubfx/Nio/CMakeLists.txt similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/CMakeLists.txt rename to c++/carla-native/zynaddsubfx/Nio/CMakeLists.txt diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/Engine.cpp b/c++/carla-native/zynaddsubfx/Nio/Engine.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/Engine.cpp rename to c++/carla-native/zynaddsubfx/Nio/Engine.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/Engine.h b/c++/carla-native/zynaddsubfx/Nio/Engine.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/Engine.h rename to c++/carla-native/zynaddsubfx/Nio/Engine.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/EngineMgr.cpp b/c++/carla-native/zynaddsubfx/Nio/EngineMgr.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/EngineMgr.cpp rename to c++/carla-native/zynaddsubfx/Nio/EngineMgr.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/EngineMgr.h b/c++/carla-native/zynaddsubfx/Nio/EngineMgr.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/EngineMgr.h rename to c++/carla-native/zynaddsubfx/Nio/EngineMgr.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/InMgr.cpp b/c++/carla-native/zynaddsubfx/Nio/InMgr.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/InMgr.cpp rename to c++/carla-native/zynaddsubfx/Nio/InMgr.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/InMgr.h b/c++/carla-native/zynaddsubfx/Nio/InMgr.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/InMgr.h rename to c++/carla-native/zynaddsubfx/Nio/InMgr.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/JackEngine.cpp b/c++/carla-native/zynaddsubfx/Nio/JackEngine.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/JackEngine.cpp rename to c++/carla-native/zynaddsubfx/Nio/JackEngine.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/JackEngine.h b/c++/carla-native/zynaddsubfx/Nio/JackEngine.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/JackEngine.h rename to c++/carla-native/zynaddsubfx/Nio/JackEngine.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/MidiIn.cpp b/c++/carla-native/zynaddsubfx/Nio/MidiIn.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/MidiIn.cpp rename to c++/carla-native/zynaddsubfx/Nio/MidiIn.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/MidiIn.h b/c++/carla-native/zynaddsubfx/Nio/MidiIn.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/MidiIn.h rename to c++/carla-native/zynaddsubfx/Nio/MidiIn.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/Nio.cpp b/c++/carla-native/zynaddsubfx/Nio/Nio.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/Nio.cpp rename to c++/carla-native/zynaddsubfx/Nio/Nio.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/Nio.h b/c++/carla-native/zynaddsubfx/Nio/Nio.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/Nio.h rename to c++/carla-native/zynaddsubfx/Nio/Nio.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/NulEngine.cpp b/c++/carla-native/zynaddsubfx/Nio/NulEngine.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/NulEngine.cpp rename to c++/carla-native/zynaddsubfx/Nio/NulEngine.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/NulEngine.h b/c++/carla-native/zynaddsubfx/Nio/NulEngine.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/NulEngine.h rename to c++/carla-native/zynaddsubfx/Nio/NulEngine.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/OssEngine.cpp b/c++/carla-native/zynaddsubfx/Nio/OssEngine.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/OssEngine.cpp rename to c++/carla-native/zynaddsubfx/Nio/OssEngine.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/OssEngine.h b/c++/carla-native/zynaddsubfx/Nio/OssEngine.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/OssEngine.h rename to c++/carla-native/zynaddsubfx/Nio/OssEngine.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/OutMgr.cpp b/c++/carla-native/zynaddsubfx/Nio/OutMgr.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/OutMgr.cpp rename to c++/carla-native/zynaddsubfx/Nio/OutMgr.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/OutMgr.h b/c++/carla-native/zynaddsubfx/Nio/OutMgr.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/OutMgr.h rename to c++/carla-native/zynaddsubfx/Nio/OutMgr.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/PaEngine.cpp b/c++/carla-native/zynaddsubfx/Nio/PaEngine.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/PaEngine.cpp rename to c++/carla-native/zynaddsubfx/Nio/PaEngine.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/PaEngine.h b/c++/carla-native/zynaddsubfx/Nio/PaEngine.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/PaEngine.h rename to c++/carla-native/zynaddsubfx/Nio/PaEngine.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/SafeQueue.cpp b/c++/carla-native/zynaddsubfx/Nio/SafeQueue.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/SafeQueue.cpp rename to c++/carla-native/zynaddsubfx/Nio/SafeQueue.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/SafeQueue.h b/c++/carla-native/zynaddsubfx/Nio/SafeQueue.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/SafeQueue.h rename to c++/carla-native/zynaddsubfx/Nio/SafeQueue.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/WavEngine.cpp b/c++/carla-native/zynaddsubfx/Nio/WavEngine.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/WavEngine.cpp rename to c++/carla-native/zynaddsubfx/Nio/WavEngine.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Nio/WavEngine.h b/c++/carla-native/zynaddsubfx/Nio/WavEngine.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Nio/WavEngine.h rename to c++/carla-native/zynaddsubfx/Nio/WavEngine.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Output/DSSIaudiooutput.cpp b/c++/carla-native/zynaddsubfx/Output/DSSIaudiooutput.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Output/DSSIaudiooutput.cpp rename to c++/carla-native/zynaddsubfx/Output/DSSIaudiooutput.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Output/DSSIaudiooutput.h b/c++/carla-native/zynaddsubfx/Output/DSSIaudiooutput.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Output/DSSIaudiooutput.h rename to c++/carla-native/zynaddsubfx/Output/DSSIaudiooutput.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/ADnoteParameters.cpp b/c++/carla-native/zynaddsubfx/Params/ADnoteParameters.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/ADnoteParameters.cpp rename to c++/carla-native/zynaddsubfx/Params/ADnoteParameters.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/ADnoteParameters.h b/c++/carla-native/zynaddsubfx/Params/ADnoteParameters.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/ADnoteParameters.h rename to c++/carla-native/zynaddsubfx/Params/ADnoteParameters.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/CMakeLists.txt b/c++/carla-native/zynaddsubfx/Params/CMakeLists.txt similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/CMakeLists.txt rename to c++/carla-native/zynaddsubfx/Params/CMakeLists.txt diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/Controller.cpp b/c++/carla-native/zynaddsubfx/Params/Controller.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/Controller.cpp rename to c++/carla-native/zynaddsubfx/Params/Controller.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/Controller.h b/c++/carla-native/zynaddsubfx/Params/Controller.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/Controller.h rename to c++/carla-native/zynaddsubfx/Params/Controller.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/EnvelopeParams.cpp b/c++/carla-native/zynaddsubfx/Params/EnvelopeParams.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/EnvelopeParams.cpp rename to c++/carla-native/zynaddsubfx/Params/EnvelopeParams.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/EnvelopeParams.h b/c++/carla-native/zynaddsubfx/Params/EnvelopeParams.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/EnvelopeParams.h rename to c++/carla-native/zynaddsubfx/Params/EnvelopeParams.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/FilterParams.cpp b/c++/carla-native/zynaddsubfx/Params/FilterParams.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/FilterParams.cpp rename to c++/carla-native/zynaddsubfx/Params/FilterParams.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/FilterParams.h b/c++/carla-native/zynaddsubfx/Params/FilterParams.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/FilterParams.h rename to c++/carla-native/zynaddsubfx/Params/FilterParams.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/LFOParams.cpp b/c++/carla-native/zynaddsubfx/Params/LFOParams.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/LFOParams.cpp rename to c++/carla-native/zynaddsubfx/Params/LFOParams.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/LFOParams.h b/c++/carla-native/zynaddsubfx/Params/LFOParams.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/LFOParams.h rename to c++/carla-native/zynaddsubfx/Params/LFOParams.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/PADnoteParameters.cpp b/c++/carla-native/zynaddsubfx/Params/PADnoteParameters.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/PADnoteParameters.cpp rename to c++/carla-native/zynaddsubfx/Params/PADnoteParameters.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/PADnoteParameters.h b/c++/carla-native/zynaddsubfx/Params/PADnoteParameters.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/PADnoteParameters.h rename to c++/carla-native/zynaddsubfx/Params/PADnoteParameters.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/Presets.cpp b/c++/carla-native/zynaddsubfx/Params/Presets.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/Presets.cpp rename to c++/carla-native/zynaddsubfx/Params/Presets.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/Presets.h b/c++/carla-native/zynaddsubfx/Params/Presets.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/Presets.h rename to c++/carla-native/zynaddsubfx/Params/Presets.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/PresetsArray.cpp b/c++/carla-native/zynaddsubfx/Params/PresetsArray.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/PresetsArray.cpp rename to c++/carla-native/zynaddsubfx/Params/PresetsArray.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/PresetsArray.h b/c++/carla-native/zynaddsubfx/Params/PresetsArray.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/PresetsArray.h rename to c++/carla-native/zynaddsubfx/Params/PresetsArray.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/PresetsStore.cpp b/c++/carla-native/zynaddsubfx/Params/PresetsStore.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/PresetsStore.cpp rename to c++/carla-native/zynaddsubfx/Params/PresetsStore.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/PresetsStore.h b/c++/carla-native/zynaddsubfx/Params/PresetsStore.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/PresetsStore.h rename to c++/carla-native/zynaddsubfx/Params/PresetsStore.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/SUBnoteParameters.cpp b/c++/carla-native/zynaddsubfx/Params/SUBnoteParameters.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/SUBnoteParameters.cpp rename to c++/carla-native/zynaddsubfx/Params/SUBnoteParameters.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Params/SUBnoteParameters.h b/c++/carla-native/zynaddsubfx/Params/SUBnoteParameters.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Params/SUBnoteParameters.h rename to c++/carla-native/zynaddsubfx/Params/SUBnoteParameters.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/ADnote.cpp b/c++/carla-native/zynaddsubfx/Synth/ADnote.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/ADnote.cpp rename to c++/carla-native/zynaddsubfx/Synth/ADnote.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/ADnote.h b/c++/carla-native/zynaddsubfx/Synth/ADnote.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/ADnote.h rename to c++/carla-native/zynaddsubfx/Synth/ADnote.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/CMakeLists.txt b/c++/carla-native/zynaddsubfx/Synth/CMakeLists.txt similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/CMakeLists.txt rename to c++/carla-native/zynaddsubfx/Synth/CMakeLists.txt diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/Envelope.cpp b/c++/carla-native/zynaddsubfx/Synth/Envelope.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/Envelope.cpp rename to c++/carla-native/zynaddsubfx/Synth/Envelope.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/Envelope.h b/c++/carla-native/zynaddsubfx/Synth/Envelope.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/Envelope.h rename to c++/carla-native/zynaddsubfx/Synth/Envelope.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/LFO.cpp b/c++/carla-native/zynaddsubfx/Synth/LFO.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/LFO.cpp rename to c++/carla-native/zynaddsubfx/Synth/LFO.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/LFO.h b/c++/carla-native/zynaddsubfx/Synth/LFO.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/LFO.h rename to c++/carla-native/zynaddsubfx/Synth/LFO.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/OscilGen.cpp b/c++/carla-native/zynaddsubfx/Synth/OscilGen.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/OscilGen.cpp rename to c++/carla-native/zynaddsubfx/Synth/OscilGen.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/OscilGen.h b/c++/carla-native/zynaddsubfx/Synth/OscilGen.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/OscilGen.h rename to c++/carla-native/zynaddsubfx/Synth/OscilGen.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/PADnote.cpp b/c++/carla-native/zynaddsubfx/Synth/PADnote.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/PADnote.cpp rename to c++/carla-native/zynaddsubfx/Synth/PADnote.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/PADnote.h b/c++/carla-native/zynaddsubfx/Synth/PADnote.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/PADnote.h rename to c++/carla-native/zynaddsubfx/Synth/PADnote.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/Resonance.cpp b/c++/carla-native/zynaddsubfx/Synth/Resonance.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/Resonance.cpp rename to c++/carla-native/zynaddsubfx/Synth/Resonance.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/Resonance.h b/c++/carla-native/zynaddsubfx/Synth/Resonance.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/Resonance.h rename to c++/carla-native/zynaddsubfx/Synth/Resonance.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/SUBnote.cpp b/c++/carla-native/zynaddsubfx/Synth/SUBnote.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/SUBnote.cpp rename to c++/carla-native/zynaddsubfx/Synth/SUBnote.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/SUBnote.h b/c++/carla-native/zynaddsubfx/Synth/SUBnote.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/SUBnote.h rename to c++/carla-native/zynaddsubfx/Synth/SUBnote.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/SynthNote.cpp b/c++/carla-native/zynaddsubfx/Synth/SynthNote.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/SynthNote.cpp rename to c++/carla-native/zynaddsubfx/Synth/SynthNote.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/Synth/SynthNote.h b/c++/carla-native/zynaddsubfx/Synth/SynthNote.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Synth/SynthNote.h rename to c++/carla-native/zynaddsubfx/Synth/SynthNote.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Tests/AdNoteTest.h b/c++/carla-native/zynaddsubfx/Tests/AdNoteTest.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Tests/AdNoteTest.h rename to c++/carla-native/zynaddsubfx/Tests/AdNoteTest.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Tests/CMakeLists.txt b/c++/carla-native/zynaddsubfx/Tests/CMakeLists.txt similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Tests/CMakeLists.txt rename to c++/carla-native/zynaddsubfx/Tests/CMakeLists.txt diff --git a/c++/carla-backend/plugins/zynaddsubfx/Tests/ControllerTest.h b/c++/carla-native/zynaddsubfx/Tests/ControllerTest.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Tests/ControllerTest.h rename to c++/carla-native/zynaddsubfx/Tests/ControllerTest.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Tests/EchoTest.h b/c++/carla-native/zynaddsubfx/Tests/EchoTest.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Tests/EchoTest.h rename to c++/carla-native/zynaddsubfx/Tests/EchoTest.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Tests/MicrotonalTest.h b/c++/carla-native/zynaddsubfx/Tests/MicrotonalTest.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Tests/MicrotonalTest.h rename to c++/carla-native/zynaddsubfx/Tests/MicrotonalTest.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Tests/OscilGenTest.h b/c++/carla-native/zynaddsubfx/Tests/OscilGenTest.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Tests/OscilGenTest.h rename to c++/carla-native/zynaddsubfx/Tests/OscilGenTest.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Tests/RandTest.h b/c++/carla-native/zynaddsubfx/Tests/RandTest.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Tests/RandTest.h rename to c++/carla-native/zynaddsubfx/Tests/RandTest.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Tests/SubNoteTest.h b/c++/carla-native/zynaddsubfx/Tests/SubNoteTest.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Tests/SubNoteTest.h rename to c++/carla-native/zynaddsubfx/Tests/SubNoteTest.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Tests/XMLwrapperTest.h b/c++/carla-native/zynaddsubfx/Tests/XMLwrapperTest.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Tests/XMLwrapperTest.h rename to c++/carla-native/zynaddsubfx/Tests/XMLwrapperTest.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/Tests/guitar-adnote.xmz b/c++/carla-native/zynaddsubfx/Tests/guitar-adnote.xmz similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/Tests/guitar-adnote.xmz rename to c++/carla-native/zynaddsubfx/Tests/guitar-adnote.xmz diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/ADnoteUI.fl b/c++/carla-native/zynaddsubfx/UI/ADnoteUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/ADnoteUI.fl rename to c++/carla-native/zynaddsubfx/UI/ADnoteUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/BankUI.fl b/c++/carla-native/zynaddsubfx/UI/BankUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/BankUI.fl rename to c++/carla-native/zynaddsubfx/UI/BankUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/CMakeLists.txt b/c++/carla-native/zynaddsubfx/UI/CMakeLists.txt similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/CMakeLists.txt rename to c++/carla-native/zynaddsubfx/UI/CMakeLists.txt diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/ConfigUI.fl b/c++/carla-native/zynaddsubfx/UI/ConfigUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/ConfigUI.fl rename to c++/carla-native/zynaddsubfx/UI/ConfigUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/EffUI.fl b/c++/carla-native/zynaddsubfx/UI/EffUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/EffUI.fl rename to c++/carla-native/zynaddsubfx/UI/EffUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/EnvelopeUI.fl b/c++/carla-native/zynaddsubfx/UI/EnvelopeUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/EnvelopeUI.fl rename to c++/carla-native/zynaddsubfx/UI/EnvelopeUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/FilterUI.fl b/c++/carla-native/zynaddsubfx/UI/FilterUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/FilterUI.fl rename to c++/carla-native/zynaddsubfx/UI/FilterUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/LFOUI.fl b/c++/carla-native/zynaddsubfx/UI/LFOUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/LFOUI.fl rename to c++/carla-native/zynaddsubfx/UI/LFOUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/MasterUI.fl b/c++/carla-native/zynaddsubfx/UI/MasterUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/MasterUI.fl rename to c++/carla-native/zynaddsubfx/UI/MasterUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/MicrotonalUI.fl b/c++/carla-native/zynaddsubfx/UI/MicrotonalUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/MicrotonalUI.fl rename to c++/carla-native/zynaddsubfx/UI/MicrotonalUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/NSM.C b/c++/carla-native/zynaddsubfx/UI/NSM.C similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/NSM.C rename to c++/carla-native/zynaddsubfx/UI/NSM.C diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/NSM.H b/c++/carla-native/zynaddsubfx/UI/NSM.H similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/NSM.H rename to c++/carla-native/zynaddsubfx/UI/NSM.H diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/NSM/Client.C b/c++/carla-native/zynaddsubfx/UI/NSM/Client.C similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/NSM/Client.C rename to c++/carla-native/zynaddsubfx/UI/NSM/Client.C diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/NSM/Client.H b/c++/carla-native/zynaddsubfx/UI/NSM/Client.H similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/NSM/Client.H rename to c++/carla-native/zynaddsubfx/UI/NSM/Client.H diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/NioUI.cpp b/c++/carla-native/zynaddsubfx/UI/NioUI.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/NioUI.cpp rename to c++/carla-native/zynaddsubfx/UI/NioUI.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/NioUI.h b/c++/carla-native/zynaddsubfx/UI/NioUI.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/NioUI.h rename to c++/carla-native/zynaddsubfx/UI/NioUI.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/OscilGenUI.fl b/c++/carla-native/zynaddsubfx/UI/OscilGenUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/OscilGenUI.fl rename to c++/carla-native/zynaddsubfx/UI/OscilGenUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/PADnoteUI.fl b/c++/carla-native/zynaddsubfx/UI/PADnoteUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/PADnoteUI.fl rename to c++/carla-native/zynaddsubfx/UI/PADnoteUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/PartUI.fl b/c++/carla-native/zynaddsubfx/UI/PartUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/PartUI.fl rename to c++/carla-native/zynaddsubfx/UI/PartUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/PresetsUI.fl b/c++/carla-native/zynaddsubfx/UI/PresetsUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/PresetsUI.fl rename to c++/carla-native/zynaddsubfx/UI/PresetsUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/ResonanceUI.fl b/c++/carla-native/zynaddsubfx/UI/ResonanceUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/ResonanceUI.fl rename to c++/carla-native/zynaddsubfx/UI/ResonanceUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/SUBnoteUI.fl b/c++/carla-native/zynaddsubfx/UI/SUBnoteUI.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/SUBnoteUI.fl rename to c++/carla-native/zynaddsubfx/UI/SUBnoteUI.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/VirKeyboard.fl b/c++/carla-native/zynaddsubfx/UI/VirKeyboard.fl similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/VirKeyboard.fl rename to c++/carla-native/zynaddsubfx/UI/VirKeyboard.fl diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/WidgetPDial.cpp b/c++/carla-native/zynaddsubfx/UI/WidgetPDial.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/WidgetPDial.cpp rename to c++/carla-native/zynaddsubfx/UI/WidgetPDial.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/WidgetPDial.h b/c++/carla-native/zynaddsubfx/UI/WidgetPDial.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/WidgetPDial.h rename to c++/carla-native/zynaddsubfx/UI/WidgetPDial.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/UI/common.H b/c++/carla-native/zynaddsubfx/UI/common.H similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/UI/common.H rename to c++/carla-native/zynaddsubfx/UI/common.H diff --git a/c++/carla-backend/plugins/zynaddsubfx/globals.h b/c++/carla-native/zynaddsubfx/globals.h similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/globals.h rename to c++/carla-native/zynaddsubfx/globals.h diff --git a/c++/carla-backend/plugins/zynaddsubfx/main.cpp b/c++/carla-native/zynaddsubfx/main.cpp similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/main.cpp rename to c++/carla-native/zynaddsubfx/main.cpp diff --git a/c++/carla-backend/plugins/zynaddsubfx/zynaddsubfx_icon.svg b/c++/carla-native/zynaddsubfx/zynaddsubfx_icon.svg similarity index 100% rename from c++/carla-backend/plugins/zynaddsubfx/zynaddsubfx_icon.svg rename to c++/carla-native/zynaddsubfx/zynaddsubfx_icon.svg diff --git a/c++/carla-backend/carla_bridge.cpp b/c++/carla-plugin/carla_bridge.cpp similarity index 100% rename from c++/carla-backend/carla_bridge.cpp rename to c++/carla-plugin/carla_bridge.cpp diff --git a/c++/carla-backend/carla_plugin.hpp b/c++/carla-plugin/carla_plugin.hpp similarity index 99% rename from c++/carla-backend/carla_plugin.hpp rename to c++/carla-plugin/carla_plugin.hpp index f65c14f..95fd8ba 100644 --- a/c++/carla-backend/carla_plugin.hpp +++ b/c++/carla-plugin/carla_plugin.hpp @@ -25,7 +25,7 @@ #include "carla_lib_utils.hpp" #ifdef BUILD_BRIDGE -# include "carla_bridge_osc.h" +# include "carla_bridge_osc.h" #endif // common includes diff --git a/c++/carla-backend/dssi.cpp b/c++/carla-plugin/dssi.cpp similarity index 100% rename from c++/carla-backend/dssi.cpp rename to c++/carla-plugin/dssi.cpp diff --git a/c++/carla-backend/fluidsynth.cpp b/c++/carla-plugin/fluidsynth.cpp similarity index 100% rename from c++/carla-backend/fluidsynth.cpp rename to c++/carla-plugin/fluidsynth.cpp diff --git a/c++/carla-backend/ladspa.cpp b/c++/carla-plugin/ladspa.cpp similarity index 100% rename from c++/carla-backend/ladspa.cpp rename to c++/carla-plugin/ladspa.cpp diff --git a/c++/carla-backend/linuxsampler.cpp b/c++/carla-plugin/linuxsampler.cpp similarity index 100% rename from c++/carla-backend/linuxsampler.cpp rename to c++/carla-plugin/linuxsampler.cpp diff --git a/c++/carla-backend/lv2.cpp b/c++/carla-plugin/lv2.cpp similarity index 100% rename from c++/carla-backend/lv2.cpp rename to c++/carla-plugin/lv2.cpp diff --git a/c++/carla-backend/carla_native.cpp b/c++/carla-plugin/native.cpp similarity index 100% rename from c++/carla-backend/carla_native.cpp rename to c++/carla-plugin/native.cpp diff --git a/c++/carla-backend/vst.cpp b/c++/carla-plugin/vst.cpp similarity index 100% rename from c++/carla-backend/vst.cpp rename to c++/carla-plugin/vst.cpp diff --git a/c++/jack_utils.h b/c++/jack_utils.hpp similarity index 100% rename from c++/jack_utils.h rename to c++/jack_utils.hpp diff --git a/c++/jackmeter/Makefile b/c++/jackmeter/Makefile index f75ed02..5eeaaf1 100644 --- a/c++/jackmeter/Makefile +++ b/c++/jackmeter/Makefile @@ -4,23 +4,18 @@ # Created by falkTX # -CXX ?= g++ -STRIP ?= strip +include ../Makefile.mk -BASE_FLAGS = -O2 -ffast-math -fomit-frame-pointer -mtune=generic -msse -mfpmath=sse -Wall - -BUILD_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS) -BUILD_FLAGS += $(shell pkg-config --cflags QtCore QtGui jack) -BUILD_FLAGS += -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT - -LINK_FLAGS = $(LDFLAGS) -LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui jack) +BUILD_CXX_FLAGS += -I../widgets +BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui jack) +LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui jack) ifeq ($(shell pkg-config --atleast-version=0.121.0 jack && echo true),true) -BUILD_FLAGS += -DHAVE_JACKSESSION +BUILD_CXX_FLAGS += -DHAVE_JACKSESSION endif -OBJS = jackmeter.o \ +OBJS = \ + jackmeter.o \ ../widgets/digitalpeakmeter.o # -------------------------------------------------------------- @@ -28,15 +23,18 @@ OBJS = jackmeter.o \ all: cadence-jackmeter cadence-jackmeter: $(OBJS) - $(CXX) $^ $(LINK_FLAGS) -o $@ && strip $@ + $(CXX) $(OBJS) $(LINK_FLAGS) -o $@ && $(STRIP) $@ + +cadence-jackmeter.exe: $(OBJS) icon.o + $(CXX) $(OBJS) icon.o $(LINK_FLAGS) -static -mwindows -o $@ && $(STRIP) $@ -cadence-jackmeter.exe: $(OBJS) - $(CXX) $^ -static -mwindows $(LINK_FLAGS) -o $@ && strip $@ +icon.o: ../../resources/ico/cadence.rc + $(WINDRES) -i $< -o $@ -O coff # -------------------------------------------------------------- .cpp.o: - $(CXX) -c $< $(BUILD_FLAGS) -o $@ + $(CXX) -c $< $(BUILD_CXX_FLAGS) -o $@ clean: rm -f $(OBJS) cadence-jackmeter* diff --git a/c++/jackmeter/Makefile.dbg b/c++/jackmeter/Makefile.dbg deleted file mode 100644 index 482b98b..0000000 --- a/c++/jackmeter/Makefile.dbg +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/make -f -# Makefile for jackmeter # -# -------------------------------- # -# Created by falkTX -# - -CXX ?= g++ - -BASE_FLAGS = -O0 -g -Wall - -BUILD_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS) -BUILD_FLAGS += $(shell pkg-config --cflags QtCore QtGui jack) -BUILD_FLAGS += -DDEBUG - -LINK_FLAGS = $(LDFLAGS) -LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui jack) - -ifeq ($(shell pkg-config --atleast-version=0.121.0 jack && echo true),true) -BUILD_FLAGS += -DHAVE_JACKSESSION -endif - -OBJS = jackmeter.o \ - ../widgets/digitalpeakmeter.o - -# -------------------------------------------------------------- - -all: cadence-jackmeter - -cadence-jackmeter: $(OBJS) - $(CXX) $^ $(LINK_FLAGS) -o $@ - -cadence-jackmeter.exe: $(OBJS) - $(CXX) $^ -static -mwindows $(LINK_FLAGS) -o $@ - -# -------------------------------------------------------------- - -.cpp.o: - $(CXX) -c $< $(BUILD_FLAGS) -o $@ - -clean: - rm -f $(OBJS) cadence-jackmeter* diff --git a/c++/jackmeter/jackmeter.cpp b/c++/jackmeter/jackmeter.cpp index 607ede9..4053490 100644 --- a/c++/jackmeter/jackmeter.cpp +++ b/c++/jackmeter/jackmeter.cpp @@ -21,7 +21,7 @@ # define nullptr (0) #endif -#include "../jack_utils.h" +#include "../jack_utils.hpp" #include "../widgets/digitalpeakmeter.h" #include diff --git a/c++/midi_queue.h b/c++/midi_queue.hpp similarity index 100% rename from c++/midi_queue.h rename to c++/midi_queue.hpp diff --git a/c++/patchcanvas.h b/c++/patchcanvas.hpp similarity index 100% rename from c++/patchcanvas.h rename to c++/patchcanvas.hpp diff --git a/c++/xycontroller/Makefile b/c++/xycontroller/Makefile index b3dc972..d4ef175 100644 --- a/c++/xycontroller/Makefile +++ b/c++/xycontroller/Makefile @@ -4,24 +4,14 @@ # Created by falkTX # -CXX ?= g++ -MOC ?= moc -RCC ?= rcc -UIC ?= uic -STRIP ?= strip -WINDRES ?= windres +include ../Makefile.mk -BASE_FLAGS = -O2 -ffast-math -fomit-frame-pointer -mtune=generic -msse -mfpmath=sse -Wall -I../widgets - -BUILD_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS) -BUILD_FLAGS += $(shell pkg-config --cflags QtCore QtGui jack) -BUILD_FLAGS += -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT - -LINK_FLAGS = $(LDFLAGS) -LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui jack) +BUILD_CXX_FLAGS += -I../widgets +BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui jack) +LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui jack) ifeq ($(shell pkg-config --atleast-version=0.121.0 jack && echo true),true) -BUILD_FLAGS += -DHAVE_JACKSESSION +BUILD_CXX_FLAGS += -DHAVE_JACKSESSION endif FILES = \ @@ -41,10 +31,10 @@ OBJS = xycontroller.o \ all: cadence-xycontroller cadence-xycontroller: $(FILES) $(OBJS) - $(CXX) $(OBJS) $(LINK_FLAGS) -o $@ && strip $@ + $(CXX) $(OBJS) $(LINK_FLAGS) -o $@ && $(STRIP) $@ cadence-xycontroller.exe: $(FILES) $(OBJS) icon.o - $(CXX) $(OBJS) icon.o -static -mwindows $(LINK_FLAGS) -o $@ && strip $@ + $(CXX) $(OBJS) icon.o -static -mwindows $(LINK_FLAGS) -o $@ && $(STRIP) $@ # -------------------------------------------------------------- @@ -66,7 +56,7 @@ icon.o: ../../resources/ico/cadence.rc # -------------------------------------------------------------- .cpp.o: - $(CXX) -c $< $(BUILD_FLAGS) -o $@ + $(CXX) -c $< $(BUILD_CXX_FLAGS) -o $@ clean: rm -f $(FILES) $(OBJS) icon.o cadence-xycontroller* diff --git a/c++/xycontroller/Makefile.dbg b/c++/xycontroller/Makefile.dbg deleted file mode 100644 index ced86c1..0000000 --- a/c++/xycontroller/Makefile.dbg +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/make -f -# Makefile for xycontroller # -# ------------------------------------ # -# Created by falkTX -# - -CXX ?= g++ -MOC ?= moc -RCC ?= rcc -UIC ?= uic -WINDRES ?= windres - -BASE_FLAGS = -O0 -g -Wall -I../widgets - -BUILD_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS) -BUILD_FLAGS += $(shell pkg-config --cflags QtCore QtGui jack) -BUILD_FLAGS += -DDEBUG - -LINK_FLAGS = $(LDFLAGS) -LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui jack) - -ifeq ($(shell pkg-config --atleast-version=0.121.0 jack && echo true),true) -BUILD_FLAGS += -DHAVE_JACKSESSION -endif - -FILES = \ - xycontroller.moc \ - ui_xycontroller.h \ - ../widgets/moc_pixmapkeyboard.cpp \ - ../../resources/qrc_resources.cpp - -OBJS = xycontroller.o \ - ../widgets/pixmapdial.o \ - ../widgets/pixmapkeyboard.o \ - ../widgets/moc_pixmapkeyboard.o \ - ../../resources/qrc_resources.o - -# -------------------------------------------------------------- - -all: cadence-xycontroller - -cadence-xycontroller: $(FILES) $(OBJS) - $(CXX) $(OBJS) $(LINK_FLAGS) -o $@ - -cadence-xycontroller.exe: $(FILES) $(OBJS) icon.o - $(CXX) $(OBJS) icon.o -static -mwindows $(LINK_FLAGS) -o $@ - -# -------------------------------------------------------------- - -xycontroller.moc: xycontroller.cpp - $(MOC) $< -o $@ - -ui_xycontroller.h: ../../src/ui/xycontroller.ui - $(UIC) $< -o $@ - -icon.o: ../../resources/ico/cadence.rc - $(WINDRES) -i $< -o $@ -O coff - -../widgets/moc_pixmapkeyboard.cpp: ../widgets/pixmapkeyboard.h - $(MOC) $< -o $@ - -../../resources/qrc_resources.cpp: ../../resources/resources.qrc - $(RCC) -name resources $< -o $@ - -# -------------------------------------------------------------- - -.cpp.o: - $(CXX) -c $< $(BUILD_FLAGS) -o $@ - -clean: - rm -f $(FILES) $(OBJS) icon.o cadence-xycontroller* diff --git a/c++/xycontroller/xycontroller.cpp b/c++/xycontroller/xycontroller.cpp index 441e09a..1f51803 100644 --- a/c++/xycontroller/xycontroller.cpp +++ b/c++/xycontroller/xycontroller.cpp @@ -23,8 +23,8 @@ #define VERSION "0.5.0" -#include "../jack_utils.h" -#include "../midi_queue.h" +#include "../jack_utils.hpp" +#include "../midi_queue.hpp" #include "ui_xycontroller.h" #include