From 55ad6c41a9460f3fda48182fc75c292119adcf3f Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 21 Oct 2013 03:16:01 +0100 Subject: [PATCH] Move rtaudio/midi to modules folder; Start some makefile rework --- source/Makefile.mk | 44 ++++-- source/backend/engine/Makefile | 8 -- source/modules/Makefile | 13 +- .../carla_native/resources/externalui.py | 1 + source/modules/jackbridge/JackBridge1.cpp | 6 +- source/modules/jackbridge/JackBridge2.cpp | 9 +- source/modules/jackbridge/Makefile | 134 +++++++++++++----- source/modules/rtaudio/Makefile | 83 +++++++++++ .../rtaudio}/Makefile.in | 0 .../rtaudio}/RtAudio.cpp | 50 +++---- .../rtaudio}/RtAudio.h | 1 + .../rtaudio}/RtError.h | 0 .../rtaudio}/config/config.guess | 0 .../rtaudio}/config/config.sub | 0 .../rtaudio}/config/install.sh | 0 .../rtaudio}/configure | 0 .../rtaudio}/configure.ac | 0 .../contrib/python/pyrtaudio/PyRtAudioTest.py | 0 .../rtaudio}/contrib/python/pyrtaudio/readme | 0 .../python/pyrtaudio/rtaudiomodule.cpp | 0 .../contrib/python/pyrtaudio/setup.py | 0 .../rtaudio}/doc/doxygen/Doxyfile | 0 .../rtaudio}/doc/doxygen/acknowledge.txt | 0 .../rtaudio}/doc/doxygen/apinotes.txt | 0 .../rtaudio}/doc/doxygen/compiling.txt | 0 .../rtaudio}/doc/doxygen/duplex.txt | 0 .../rtaudio}/doc/doxygen/error.txt | 0 .../rtaudio}/doc/doxygen/footer.html | 0 .../rtaudio}/doc/doxygen/header.html | 0 .../rtaudio}/doc/doxygen/license.txt | 0 .../rtaudio}/doc/doxygen/multi.txt | 0 .../rtaudio}/doc/doxygen/playback.txt | 0 .../rtaudio}/doc/doxygen/probe.txt | 0 .../rtaudio}/doc/doxygen/recording.txt | 0 .../rtaudio}/doc/doxygen/settings.txt | 0 .../rtaudio}/doc/doxygen/tutorial.txt | 0 .../rtaudio}/doc/html/RtAudio_8h-source.html | 0 .../rtaudio}/doc/html/RtAudio_8h.html | 0 .../rtaudio}/doc/html/RtAudio_8h_source.html | 0 .../rtaudio}/doc/html/RtError_8h-source.html | 0 .../rtaudio}/doc/html/RtError_8h_source.html | 0 .../rtaudio}/doc/html/acknowledge.html | 0 .../rtaudio}/doc/html/annotated.html | 0 .../rtaudio}/doc/html/apinotes.html | 0 .../rtaudio}/doc/html/bugs.html | 0 .../doc/html/classRtAudio-members.html | 0 .../rtaudio}/doc/html/classRtAudio.html | 0 .../doc/html/classRtError-members.html | 0 .../rtaudio}/doc/html/classRtError.html | 0 .../rtaudio}/doc/html/classes.html | 0 .../rtaudio}/doc/html/compiling.html | 0 .../rtaudio}/doc/html/doxygen.css | 0 .../rtaudio}/doc/html/doxygen.png | Bin .../rtaudio}/doc/html/duplex.html | 0 .../rtaudio}/doc/html/errors.html | 0 .../rtaudio}/doc/html/files.html | 0 .../rtaudio}/doc/html/functions.html | 0 .../rtaudio}/doc/html/functions_enum.html | 0 .../rtaudio}/doc/html/functions_eval.html | 0 .../rtaudio}/doc/html/functions_func.html | 0 .../rtaudio}/doc/html/functions_vars.html | 0 .../rtaudio}/doc/html/globals.html | 0 .../rtaudio}/doc/html/globals_enum.html | 0 .../rtaudio}/doc/html/globals_eval.html | 0 .../rtaudio}/doc/html/globals_type.html | 0 .../rtaudio}/doc/html/index.html | 0 .../rtaudio}/doc/html/license.html | 0 .../rtaudio}/doc/html/multi.html | 0 .../rtaudio}/doc/html/pages.html | 0 .../rtaudio}/doc/html/playback.html | 0 .../rtaudio}/doc/html/probe.html | 0 .../rtaudio}/doc/html/recording.html | 0 .../rtaudio}/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}/doc/html/tab_b.gif | Bin .../rtaudio}/doc/html/tab_l.gif | Bin .../rtaudio}/doc/html/tab_r.gif | Bin .../rtaudio}/doc/html/tabs.css | 0 .../rtaudio}/doc/html/updates.html | 0 .../rtaudio}/doc/images/ccrma.gif | Bin .../rtaudio}/doc/images/mcgill.gif | Bin .../rtaudio}/doc/release.txt | 0 .../rtaudio}/include/asio.cpp | 0 .../rtaudio}/include/asio.h | 0 .../rtaudio}/include/asiodrivers.cpp | 0 .../rtaudio}/include/asiodrivers.h | 0 .../rtaudio}/include/asiodrvr.h | 0 .../rtaudio}/include/asiolist.cpp | 0 .../rtaudio}/include/asiolist.h | 0 .../rtaudio}/include/asiosys.h | 0 .../rtaudio}/include/dsound.h | 0 .../rtaudio}/include/ginclude.h | 0 .../rtaudio}/include/iasiodrv.h | 0 .../include/iasiothiscallresolver.cpp | 0 .../rtaudio}/include/iasiothiscallresolver.h | 0 .../rtaudio}/include/soundcard.h | 0 .../rtaudio}/install | 0 .../rtaudio}/librtaudio.pc.in | 0 .../rtaudio-4.0.12 => modules/rtaudio}/readme | 0 .../rtaudio}/rtaudio-config.in | 0 .../rtaudio}/tests/Makefile.in | 0 .../rtaudio}/tests/Windows/audioprobe.dsp | 0 .../rtaudio}/tests/Windows/duplex.dsp | 0 .../rtaudio}/tests/Windows/playraw.dsp | 0 .../rtaudio}/tests/Windows/playsaw.dsp | 0 .../rtaudio}/tests/Windows/record.dsp | 0 .../rtaudio}/tests/Windows/rtaudio.dsw | 0 .../rtaudio}/tests/Windows/testall.dsp | 0 .../rtaudio}/tests/Windows/teststops.dsp | 0 .../rtaudio}/tests/audioprobe.cpp | 0 .../rtaudio}/tests/duplex.cpp | 0 .../rtaudio}/tests/playraw.cpp | 0 .../rtaudio}/tests/playsaw.cpp | 0 .../rtaudio}/tests/record.cpp | 0 .../rtaudio}/tests/testall.cpp | 0 .../rtaudio}/tests/teststops.cpp | 0 .../rtmidi}/Makefile.in | 0 .../rtmidi-2.0.1 => modules/rtmidi}/RtError.h | 0 .../rtmidi}/RtMidi.cpp | 0 .../rtmidi-2.0.1 => modules/rtmidi}/RtMidi.h | 0 .../rtmidi}/config/config.guess | 0 .../rtmidi}/config/config.sub | 0 .../rtmidi}/config/install.sh | 0 .../rtmidi-2.0.1 => modules/rtmidi}/configure | 0 .../rtmidi}/configure.ac | 0 .../rtmidi}/doc/doxygen/Doxyfile | 0 .../rtmidi}/doc/doxygen/footer.html | 0 .../rtmidi}/doc/doxygen/header.html | 0 .../rtmidi}/doc/doxygen/tutorial.txt | 0 .../rtmidi}/doc/html/RtError_8h-source.html | 0 .../rtmidi}/doc/html/RtError_8h_source.html | 0 .../rtmidi}/doc/html/RtMidi_8h-source.html | 0 .../rtmidi}/doc/html/RtMidi_8h.html | 0 .../rtmidi}/doc/html/RtMidi_8h_source.html | 0 .../rtmidi}/doc/html/annotated.html | 0 .../doc/html/classMidiInAlsa-members.html | 0 .../rtmidi}/doc/html/classMidiInAlsa.html | 0 .../rtmidi}/doc/html/classMidiInAlsa.png | Bin .../doc/html/classMidiInApi-members.html | 0 .../rtmidi}/doc/html/classMidiInApi.html | 0 .../rtmidi}/doc/html/classMidiInApi.png | Bin .../doc/html/classMidiInCore-members.html | 0 .../rtmidi}/doc/html/classMidiInCore.html | 0 .../rtmidi}/doc/html/classMidiInCore.png | Bin .../doc/html/classMidiInDummy-members.html | 0 .../rtmidi}/doc/html/classMidiInDummy.html | 0 .../rtmidi}/doc/html/classMidiInDummy.png | Bin .../doc/html/classMidiInJack-members.html | 0 .../rtmidi}/doc/html/classMidiInJack.html | 0 .../rtmidi}/doc/html/classMidiInJack.png | Bin .../doc/html/classMidiInWinKS-members.html | 0 .../rtmidi}/doc/html/classMidiInWinKS.html | 0 .../rtmidi}/doc/html/classMidiInWinKS.png | Bin .../doc/html/classMidiInWinMM-members.html | 0 .../rtmidi}/doc/html/classMidiInWinMM.html | 0 .../rtmidi}/doc/html/classMidiInWinMM.png | Bin .../doc/html/classMidiOutAlsa-members.html | 0 .../rtmidi}/doc/html/classMidiOutAlsa.html | 0 .../rtmidi}/doc/html/classMidiOutAlsa.png | Bin .../doc/html/classMidiOutApi-members.html | 0 .../rtmidi}/doc/html/classMidiOutApi.html | 0 .../rtmidi}/doc/html/classMidiOutApi.png | Bin .../doc/html/classMidiOutCore-members.html | 0 .../rtmidi}/doc/html/classMidiOutCore.html | 0 .../rtmidi}/doc/html/classMidiOutCore.png | Bin .../doc/html/classMidiOutDummy-members.html | 0 .../rtmidi}/doc/html/classMidiOutDummy.html | 0 .../rtmidi}/doc/html/classMidiOutDummy.png | Bin .../doc/html/classMidiOutJack-members.html | 0 .../rtmidi}/doc/html/classMidiOutJack.html | 0 .../rtmidi}/doc/html/classMidiOutJack.png | Bin .../doc/html/classMidiOutWinKS-members.html | 0 .../rtmidi}/doc/html/classMidiOutWinKS.html | 0 .../rtmidi}/doc/html/classMidiOutWinKS.png | Bin .../doc/html/classMidiOutWinMM-members.html | 0 .../rtmidi}/doc/html/classMidiOutWinMM.html | 0 .../rtmidi}/doc/html/classMidiOutWinMM.png | Bin .../doc/html/classRtError-members.html | 0 .../rtmidi}/doc/html/classRtError.html | 0 .../rtmidi}/doc/html/classRtMidi-members.html | 0 .../rtmidi}/doc/html/classRtMidi.gif | Bin .../rtmidi}/doc/html/classRtMidi.html | 0 .../rtmidi}/doc/html/classRtMidi.png | Bin .../doc/html/classRtMidiIn-members.html | 0 .../rtmidi}/doc/html/classRtMidiIn.gif | Bin .../rtmidi}/doc/html/classRtMidiIn.html | 0 .../rtmidi}/doc/html/classRtMidiIn.png | Bin .../doc/html/classRtMidiOut-members.html | 0 .../rtmidi}/doc/html/classRtMidiOut.gif | Bin .../rtmidi}/doc/html/classRtMidiOut.html | 0 .../rtmidi}/doc/html/classRtMidiOut.png | Bin .../rtmidi}/doc/html/classes.html | 0 .../rtmidi}/doc/html/doxygen.css | 0 .../rtmidi}/doc/html/doxygen.png | Bin .../rtmidi}/doc/html/files.html | 0 .../rtmidi}/doc/html/functions.html | 0 .../rtmidi}/doc/html/functions_enum.html | 0 .../rtmidi}/doc/html/functions_eval.html | 0 .../rtmidi}/doc/html/functions_func.html | 0 .../rtmidi}/doc/html/functions_type.html | 0 .../rtmidi}/doc/html/hierarchy.html | 0 .../rtmidi}/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}/doc/html/tab_b.gif | Bin .../rtmidi}/doc/html/tab_l.gif | Bin .../rtmidi}/doc/html/tab_r.gif | Bin .../rtmidi}/doc/html/tabs.css | 0 .../rtmidi}/doc/images/ccrma.gif | Bin .../rtmidi}/doc/images/mcgill.gif | Bin .../rtmidi}/doc/release.txt | 0 .../rtmidi}/include/ks.h | 0 .../rtmidi}/include/ksmedia.h | 0 .../rtmidi}/msw/readme | 0 .../rtmidi}/msw/rtmidilib.sln | 0 .../rtmidi}/msw/rtmidilib.vcproj | 0 .../rtmidi-2.0.1 => modules/rtmidi}/readme | 0 .../rtmidi}/rtmidi-config.in | 0 .../rtmidi}/tests/Makefile.in | 0 .../rtmidi}/tests/RtMidi.dsw | 0 .../rtmidi}/tests/cmidiin.cpp | 0 .../rtmidi}/tests/cmidiin.dsp | 0 .../rtmidi}/tests/midiout.cpp | 0 .../rtmidi}/tests/midiout.dsp | 0 .../rtmidi}/tests/midiprobe.cpp | 0 .../rtmidi}/tests/midiprobe.dsp | 0 .../rtmidi}/tests/qmidiin.cpp | 0 .../rtmidi}/tests/qmidiin.dsp | 0 .../rtmidi}/tests/sysextest.cpp | 0 .../rtmidi}/tests/sysextest.dsp | 0 249 files changed, 257 insertions(+), 92 deletions(-) create mode 120000 source/modules/carla_native/resources/externalui.py create mode 100644 source/modules/rtaudio/Makefile rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/Makefile.in (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/RtAudio.cpp (96%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/RtAudio.h (99%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/RtError.h (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/config/config.guess (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/config/config.sub (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/config/install.sh (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/configure (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/configure.ac (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/contrib/python/pyrtaudio/PyRtAudioTest.py (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/contrib/python/pyrtaudio/readme (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/contrib/python/pyrtaudio/rtaudiomodule.cpp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/contrib/python/pyrtaudio/setup.py (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/Doxyfile (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/acknowledge.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/apinotes.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/compiling.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/duplex.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/error.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/footer.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/header.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/license.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/multi.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/playback.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/probe.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/recording.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/settings.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/doxygen/tutorial.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/RtAudio_8h-source.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/RtAudio_8h.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/RtAudio_8h_source.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/RtError_8h-source.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/RtError_8h_source.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/acknowledge.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/annotated.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/apinotes.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/bugs.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/classRtAudio-members.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/classRtAudio.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/classRtError-members.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/classRtError.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/classes.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/compiling.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/doxygen.css (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/doxygen.png (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/duplex.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/errors.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/files.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/functions.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/functions_enum.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/functions_eval.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/functions_func.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/functions_vars.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/globals.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/globals_enum.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/globals_eval.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/globals_type.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/index.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/license.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/multi.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/pages.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/playback.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/probe.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/recording.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/settings.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/structRtAudioDeviceInfo-members.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/structRtAudioDeviceInfo.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/structRtAudioStreamParameters-members.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/structRtAudioStreamParameters.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/structRtAudio_1_1DeviceInfo-members.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/structRtAudio_1_1DeviceInfo.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/structRtAudio_1_1StreamOptions-members.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/structRtAudio_1_1StreamOptions.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/structRtAudio_1_1StreamParameters-members.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/structRtAudio_1_1StreamParameters.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/tab_b.gif (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/tab_l.gif (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/tab_r.gif (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/tabs.css (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/html/updates.html (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/images/ccrma.gif (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/images/mcgill.gif (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/doc/release.txt (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/asio.cpp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/asio.h (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/asiodrivers.cpp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/asiodrivers.h (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/asiodrvr.h (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/asiolist.cpp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/asiolist.h (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/asiosys.h (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/dsound.h (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/ginclude.h (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/iasiodrv.h (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/iasiothiscallresolver.cpp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/iasiothiscallresolver.h (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/include/soundcard.h (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/install (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/librtaudio.pc.in (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/readme (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/rtaudio-config.in (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/Makefile.in (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/Windows/audioprobe.dsp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/Windows/duplex.dsp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/Windows/playraw.dsp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/Windows/playsaw.dsp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/Windows/record.dsp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/Windows/rtaudio.dsw (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/Windows/testall.dsp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/Windows/teststops.dsp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/audioprobe.cpp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/duplex.cpp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/playraw.cpp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/playsaw.cpp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/record.cpp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/testall.cpp (100%) rename source/{backend/engine/rtaudio-4.0.12 => modules/rtaudio}/tests/teststops.cpp (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/Makefile.in (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/RtError.h (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/RtMidi.cpp (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/RtMidi.h (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/config/config.guess (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/config/config.sub (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/config/install.sh (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/configure (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/configure.ac (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/doxygen/Doxyfile (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/doxygen/footer.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/doxygen/header.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/doxygen/tutorial.txt (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/RtError_8h-source.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/RtError_8h_source.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/RtMidi_8h-source.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/RtMidi_8h.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/RtMidi_8h_source.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/annotated.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInAlsa-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInAlsa.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInAlsa.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInApi-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInApi.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInApi.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInCore-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInCore.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInCore.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInDummy-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInDummy.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInDummy.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInJack-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInJack.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInJack.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInWinKS-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInWinKS.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInWinKS.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInWinMM-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInWinMM.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiInWinMM.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutAlsa-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutAlsa.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutAlsa.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutApi-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutApi.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutApi.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutCore-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutCore.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutCore.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutDummy-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutDummy.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutDummy.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutJack-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutJack.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutJack.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutWinKS-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutWinKS.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutWinKS.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutWinMM-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutWinMM.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classMidiOutWinMM.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtError-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtError.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtMidi-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtMidi.gif (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtMidi.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtMidi.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtMidiIn-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtMidiIn.gif (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtMidiIn.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtMidiIn.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtMidiOut-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtMidiOut.gif (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtMidiOut.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classRtMidiOut.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/classes.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/doxygen.css (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/doxygen.png (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/files.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/functions.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/functions_enum.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/functions_eval.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/functions_func.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/functions_type.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/hierarchy.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/index.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/structMidiInApi_1_1MidiMessage-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/structMidiInApi_1_1MidiMessage.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/structMidiInApi_1_1MidiQueue-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/structMidiInApi_1_1MidiQueue.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/structMidiInApi_1_1RtMidiInData-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/structMidiInApi_1_1RtMidiInData.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/structRtMidiIn_1_1MidiMessage-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/structRtMidiIn_1_1MidiMessage.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/structRtMidiIn_1_1MidiQueue-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/structRtMidiIn_1_1MidiQueue.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/structRtMidiIn_1_1RtMidiInData-members.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/structRtMidiIn_1_1RtMidiInData.html (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/tab_b.gif (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/tab_l.gif (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/tab_r.gif (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/html/tabs.css (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/images/ccrma.gif (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/images/mcgill.gif (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/doc/release.txt (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/include/ks.h (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/include/ksmedia.h (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/msw/readme (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/msw/rtmidilib.sln (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/msw/rtmidilib.vcproj (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/readme (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/rtmidi-config.in (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/tests/Makefile.in (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/tests/RtMidi.dsw (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/tests/cmidiin.cpp (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/tests/cmidiin.dsp (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/tests/midiout.cpp (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/tests/midiout.dsp (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/tests/midiprobe.cpp (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/tests/midiprobe.dsp (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/tests/qmidiin.cpp (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/tests/qmidiin.dsp (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/tests/sysextest.cpp (100%) rename source/{backend/engine/rtmidi-2.0.1 => modules/rtmidi}/tests/sysextest.dsp (100%) diff --git a/source/Makefile.mk b/source/Makefile.mk index 56e22d4f8..adb413d5d 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -124,15 +124,22 @@ HAVE_LINUXSAMPLER = $(shell pkg-config --exists linuxsampler && echo true) endif # -------------------------------------------------------------- -# Check for optional libs (required by internal plugins) +# Check for optional libs (needed by internal plugins) -HAVE_AF_DEPS = $(shell pkg-config --exists sndfile && echo true) -HAVE_MF_DEPS = $(shell pkg-config --exists smf && echo true) -HAVE_ZYN_DEPS = $(shell pkg-config --exists fftw3 mxml zlib && echo true) -HAVE_ZYN_UI_DEPS = $(shell pkg-config --exists ntk ntk_images && echo true) +HAVE_AF_DEPS = $(shell pkg-config --exists sndfile && echo true) +HAVE_MF_DEPS = $(shell pkg-config --exists smf && echo true) +HAVE_ZYN_DEPS = $(shell pkg-config --exists fftw3 mxml zlib && echo true) +HAVE_ZYN_UI_DEPS = $(shell pkg-config --exists ntk ntk_images && echo true) # -------------------------------------------------------------- -# Set Juce flags +# Set libs stuff + +RTAUDIO_FLAGS = -DHAVE_GETTIMEOFDAY -D__UNIX_JACK__ + +ifeq ($(DEBUG),true) +RTAUDIO_FLAGS += -D__RTAUDIO_DEBUG__ +RTMIDI_FLAGS += -D__RTMIDI_DEBUG__ +endif ifeq ($(HAIKU),true) endif @@ -142,34 +149,53 @@ ifeq ($(HAVE_OPENGL),true) DGL_FLAGS = $(shell pkg-config --cflags gl x11) DGL_LIBS = $(shell pkg-config --libs gl x11) endif -LILV_LIBS = -lrt -ldl -JUCE_CORE_LIBS = -lrt -ldl -lpthread +JACKBRIDGE_LIBS = -ldl -lpthread -lrt +JUCE_CORE_LIBS = -ldl -lpthread -lrt JUCE_EVENTS_FLAGS = $(shell pkg-config --cflags x11) JUCE_EVENTS_LIBS = $(shell pkg-config --libs x11) JUCE_GRAPHICS_FLAGS = $(shell pkg-config --cflags x11 xinerama xext freetype2) JUCE_GRAPHICS_LIBS = $(shell pkg-config --libs x11 xinerama xext freetype2) JUCE_GUI_BASICS_FLAGS = $(shell pkg-config --cflags x11 xinerama xext xcursor) JUCE_GUI_BASICS_LIBS = $(shell pkg-config --libs x11 xinerama xext xcursor) -ldl +LILV_LIBS = -ldl -lrt +ifeq ($(HAVE_ALSA),true) +RTAUDIO_FLAGS += $(shell pkg-config --cflags alsa) -D__LINUX_ALSA__ +RTAUDIO_LIBS += $(shell pkg-config --libs alsa) -lpthread +RTMIDI_FLAGS += $(shell pkg-config --cflags alsa) -D__LINUX_ALSASEQ__ +RTMIDI_LIBS += $(shell pkg-config --libs alsa) +endif +ifeq ($(HAVE_PULSEAUDIO),true) +RTAUDIO_FLAGS += $(shell pkg-config --cflags libpulse-simple) -D__LINUX_PULSE__ +RTAUDIO_LIBS += $(shell pkg-config --libs libpulse-simple) +endif endif ifeq ($(MACOS),true) DGL_LIBS = -framework OpenGL -framework Cocoa -LILV_LIBS = -ldl +JACKBRIDGE_LIBS = -ldl -lpthread JUCE_AUDIO_BASICS_LIBS = -framework Accelerate JUCE_AUDIO_DEVICES_LIBS = -framework CoreAudio -framework CoreMIDI -framework DiscRecording JUCE_AUDIO_FORMATS_LIBS = -framework CoreAudio -framework CoreMIDI -framework QuartzCore -framework AudioToolbox JUCE_CORE_LIBS = -framework Cocoa -framework IOKit JUCE_GRAPHICS_LIBS = -framework Cocoa -framework QuartzCore JUCE_GUI_BASICS_LIBS = -framework Cocoa -framework Carbon -framework QuartzCore +LILV_LIBS = -ldl +RTAUDIO_FLAGS += -D__MACOSX_CORE__ +RTAUDIO_LIBS += -lpthread +RTMIDI_FLAGS += -D__MACOSX_CORE__ endif ifeq ($(WIN32),true) DGL_LIBS = -lopengl32 -lgdi32 +JACKBRIDGE_LIBS = -lpthread JUCE_AUDIO_DEVICES_LIBS = -lwinmm -lole32 JUCE_CORE_LIBS = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm JUCE_EVENTS_LIBS = -lole32 JUCE_GRAPHICS_LIBS = -lgdi32 JUCE_GUI_BASICS_LIBS = -lgdi32 -limm32 -lcomdlg32 -lole32 +RTAUDIO_FLAGS += -D__WINDOWS_ASIO__ -D__WINDOWS_DS__ +RTAUDIO_LIBS += -lpthread +RTMIDI_FLAGS += -D__WINDOWS_MM__ endif # -------------------------------------------------------------- diff --git a/source/backend/engine/Makefile b/source/backend/engine/Makefile index 40b56c74c..1cd0bb4be 100644 --- a/source/backend/engine/Makefile +++ b/source/backend/engine/Makefile @@ -50,14 +50,6 @@ OBJS += \ rtaudio-4.0.12/RtAudio.cpp.o \ rtmidi-2.0.1/RtMidi.cpp.o -# ifeq ($(WIN32),true) -# OBJS += \ -# rtaudio-4.0.12/include/asio.cpp.o \ -# rtaudio-4.0.12/include/asiodrivers.cpp.o \ -# rtaudio-4.0.12/include/asiolist.cpp.o \ -# rtaudio-4.0.12/include/iasiothiscallresolver.cpp.o -# endif - TARGET = ../libcarla_engine.a TARGETp = ../libcarla_engine_plugin.a diff --git a/source/modules/Makefile b/source/modules/Makefile index 641bc1840..0bb5bc4af 100644 --- a/source/modules/Makefile +++ b/source/modules/Makefile @@ -101,6 +101,11 @@ lilv_%: # -------------------------------------------------------------- +rtaudio: + $(MAKE) -C rtaudio + +# -------------------------------------------------------------- + rtmempool: $(MAKE) -C rtmempool @@ -117,6 +122,9 @@ theme_%: # -------------------------------------------------------------- +jackbridge: + $(MAKE) -C jackbridge + jackbridge-win32: $(MAKE) -C jackbridge win32 @@ -157,12 +165,15 @@ clean: $(MAKE) clean -C juce_graphics $(MAKE) clean -C juce_gui_basics $(MAKE) clean -C lilv + $(MAKE) clean -C rtaudio $(MAKE) clean -C rtmempool $(MAKE) clean -C theme $(MAKE) clean -C widgets # -------------------------------------------------------------- -.PHONY: carla_native juce_audio_basics juce_audio_devices juce_audio_formats juce_audio_processors juce_core juce_data_structures juce_events juce_graphics juce_gui_basics lilv rtmempool theme +.PHONY: \ + carla_native lilv rtaudio rtmidi rtmempool theme \ + juce_audio_basics juce_audio_devices juce_audio_formats juce_audio_processors juce_core juce_data_structures juce_events juce_graphics juce_gui_basics # -------------------------------------------------------------- diff --git a/source/modules/carla_native/resources/externalui.py b/source/modules/carla_native/resources/externalui.py new file mode 120000 index 000000000..2a1fa5d7d --- /dev/null +++ b/source/modules/carla_native/resources/externalui.py @@ -0,0 +1 @@ +/home/falktx/Personal/FOSS/GIT/Carla/source/externalui.py \ No newline at end of file diff --git a/source/modules/jackbridge/JackBridge1.cpp b/source/modules/jackbridge/JackBridge1.cpp index 85101e6a0..9a3cce25b 100644 --- a/source/modules/jackbridge/JackBridge1.cpp +++ b/source/modules/jackbridge/JackBridge1.cpp @@ -157,7 +157,7 @@ struct JackBridge { jacksym_set_buffer_size_callback set_buffer_size_callback_ptr; jacksym_set_sample_rate_callback set_sample_rate_callback_ptr; jacksym_set_client_registration_callback set_client_registration_callback_ptr; - jacksym_set_client_rename_callback set_client_rename_callback_ptr; + //jacksym_set_client_rename_callback set_client_rename_callback_ptr; jacksym_set_port_registration_callback set_port_registration_callback_ptr; jacksym_set_port_connect_callback set_port_connect_callback_ptr; jacksym_set_port_rename_callback set_port_rename_callback_ptr; @@ -259,7 +259,7 @@ struct JackBridge { set_buffer_size_callback_ptr(nullptr), set_sample_rate_callback_ptr(nullptr), set_client_registration_callback_ptr(nullptr), - set_client_rename_callback_ptr(nullptr), + //set_client_rename_callback_ptr(nullptr), set_port_registration_callback_ptr(nullptr), set_port_connect_callback_ptr(nullptr), set_port_rename_callback_ptr(nullptr), @@ -371,7 +371,7 @@ struct JackBridge { LIB_SYMBOL(set_buffer_size_callback) LIB_SYMBOL(set_sample_rate_callback) LIB_SYMBOL(set_client_registration_callback) - LIB_SYMBOL(set_client_rename_callback) + //LIB_SYMBOL(set_client_rename_callback) LIB_SYMBOL(set_port_registration_callback) LIB_SYMBOL(set_port_connect_callback) LIB_SYMBOL(set_port_rename_callback) diff --git a/source/modules/jackbridge/JackBridge2.cpp b/source/modules/jackbridge/JackBridge2.cpp index 0e832f08c..36163059d 100644 --- a/source/modules/jackbridge/JackBridge2.cpp +++ b/source/modules/jackbridge/JackBridge2.cpp @@ -46,11 +46,11 @@ bool jackbridge_sem_timedwait(void*, int) { return false; } -#else - +#else //JACKBRIDGE_DUMMY #include -#include #include +#include +#include bool jackbridge_sem_init(void* sem) { @@ -85,10 +85,9 @@ bool jackbridge_sem_timedwait(void* sem, int secs) # endif timeout.tv_sec += secs; - return (sem_timedwait((sem_t*)sem, &timeout) == 0); # endif } -#endif +#endif // JACKBRIDGE_DUMMY // ----------------------------------------------------------------------------- diff --git a/source/modules/jackbridge/Makefile b/source/modules/jackbridge/Makefile index deb2ac496..750ef8f0a 100644 --- a/source/modules/jackbridge/Makefile +++ b/source/modules/jackbridge/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile for jackbridge # -# ------------------------------------- # +# ----------------------- # # Created by falkTX # @@ -10,61 +10,119 @@ include ../../Makefile.mk WINECXX ?= wineg++ -BUILD_CXX_FLAGS += -DJACKBRIDGE_EXPORT -BUILD_CXX_FLAGS += -I. -I../../includes -I../../utils +BUILD_CXX_FLAGS += $(JACKBRIDGE_FLAGS) -I. -I../../includes -I../../utils +LINK_FLAGS += $(JACKBRIDGE_LIBS) +# linux: -ldl -lpthread -lrt +# mac: -ldl -lpthread +# win: -lpthread -ifeq ($(MACOS),true) -LINK_FLAGS += -dynamiclib -else -LINK_FLAGS += -shared -endif +OBJS = JackBridge1.cpp.o JackBridge2.cpp.o +OBJS_posix32 = JackBridge1.cpp.posix32.o JackBridge2.cpp.posix32.o +OBJS_posix64 = JackBridge1.cpp.posix64.o JackBridge2.cpp.posix64.o +OBJS_win32 = JackBridge1.cpp.win32.o JackBridge2.cpp.win32.o +OBJS_win64 = JackBridge1.cpp.win64.o JackBridge2.cpp.win64.o -WIN_BUILD_FLAGS = $(BUILD_CXX_FLAGS) -DJACKBRIDGE_DUMMY=1 -w -WIN_32BIT_FLAGS = $(32BIT_FLAGS) -WIN_64BIT_FLAGS = $(64BIT_FLAGS) -WIN_LINK_FLAGS = $(LINK_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) -ldl -lrt -lpthread +all: ../jackbridge.a -OBJS = JackBridge1.cpp JackBridge2.cpp -OBJSw32 = JackBridge1.w32.o JackBridge2.w32.o -OBJSw64 = JackBridge1.w64.o JackBridge2.w64.o +posix32: ../jackbridge.posix32.a +posix64: ../jackbridge.posix64.a +win32: ../jackbridge.win32.a +win64: ../jackbridge.win64.a # -------------------------------------------------------------- -all: +../jackbridge.a: $(OBJS) + rm -f $@ + $(AR) crs $@ $^ -win32: ../jackbridge-win32.dll -win64: ../jackbridge-win64.dll -wine32: ../jackbridge-win32.dll.so -wine64: ../jackbridge-win64.dll.so +../jackbridge.posix32.a: $(OBJS_posix32) + rm -f $@ + $(AR) crs $@ $^ -# -------------------------------------------------------------- +../jackbridge.posix64.a: $(OBJS_posix64) + rm -f $@ + $(AR) crs $@ $^ + +../jackbridge.win32.a: $(OBJS_win32) + rm -f $@ + $(AR) crs $@ $^ + +../jackbridge.win64.a: $(OBJS_win64) + rm -f $@ + $(AR) crs $@ $^ + +../libjackbridge.dll: $(OBJS) + $(CXX) $^ -shared $(LINK_FLAGS) -o $@ -JackBridge%.w32.o: JackBridge%.cpp - $(CXX) $^ $(WINE_BUILD_FLAGS) $(WINE_32BIT_FLAGS) -c -o $@ +../libjackbridge.dylib: $(OBJS) + $(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@ -JackBridge%.w64.o: JackBridge%.cpp - $(CXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) -c -o $@ +../libjackbridge.so: $(OBJS) + $(CXX) $^ -shared $(LINK_FLAGS) -o $@ # -------------------------------------------------------------- -../jackbridge-win32.dll: $(OBJS) - $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@ +%.cpp.o: %.cpp + $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ -../jackbridge-win64.dll: $(OBJS) - $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@ +%.posix32.o: % + $(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@ -../jackbridge-win32.dll.so: $(OBJSw32) ../jackbridge-win32.dll.def - $(WINECXX) $^ $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@ +%.posix64.o: % + $(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -../jackbridge-win64.dll.so: $(OBJS) ../jackbridge-win64.dll.def - $(WINECXX) $^ $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@ +%.win32.o: % + $(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@ + +%.win64.o: % + $(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ # -------------------------------------------------------------- clean: - rm -f *.o ../jackbridge-*.* + rm -f *.o ../jackbridge*.a ../libjackbridge.* + +debug: + $(MAKE) DEBUG=true + +# -------------------------------------------------------------- + +# win32: ../jackbridge-win32.dll +# win64: ../jackbridge-win64.dll +# wine32: ../jackbridge-win32.dll.so +# wine64: ../jackbridge-win64.dll.so + +# BUILD_CXX_FLAGS += -DJACKBRIDGE_EXPORT + +# WIN_BUILD_FLAGS = $(BUILD_CXX_FLAGS) -DJACKBRIDGE_DUMMY=1 +# WIN_32BIT_FLAGS = $(32BIT_FLAGS) +# WIN_64BIT_FLAGS = $(64BIT_FLAGS) +# WIN_LINK_FLAGS = $(LINK_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) -ldl -lrt -lpthread + +# OBJSw32 = JackBridge1.w32.o JackBridge2.w32.o +# OBJSw64 = JackBridge1.w64.o JackBridge2.w64.o + +# JackBridge%.w32.o: JackBridge%.cpp +# $(CXX) $^ $(WINE_BUILD_FLAGS) $(WINE_32BIT_FLAGS) -c -o $@ +# +# JackBridge%.w64.o: JackBridge%.cpp +# $(CXX) $^ $(WINE_BUILD_FLAGS) $(WINE_64BIT_FLAGS) -c -o $@ + +# ../jackbridge-win32.dll: $(OBJS) +# $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@ +# +# ../jackbridge-win64.dll: $(OBJS) +# $(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@ +# +# ../jackbridge-win32.dll.so: $(OBJSw32) ../jackbridge-win32.dll.def +# $(WINECXX) $^ $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@ +# +# ../jackbridge-win64.dll.so: $(OBJS) ../jackbridge-win64.dll.def +# $(WINECXX) $^ $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@ diff --git a/source/modules/rtaudio/Makefile b/source/modules/rtaudio/Makefile new file mode 100644 index 000000000..cbfe848f2 --- /dev/null +++ b/source/modules/rtaudio/Makefile @@ -0,0 +1,83 @@ +#!/usr/bin/make -f +# Makefile for rtaudio # +# -------------------- # +# Created by falkTX +# + +include ../../Makefile.mk + +# -------------------------------------------------------------- + +BUILD_CXX_FLAGS += $(RTAUDIO_FLAGS) -DHAVE_GETTIMEOFDAY -D__UNIX_JACK__ -I. -Iinclude -I.. -I../../includes +LINK_FLAGS += $(RTAUDIO_LIBS) -L.. -ljackbridge + +OBJS = RtAudio.cpp.o + +ifeq ($(WIN32),true) +OBJS += \ + include/asio.cpp.o \ + include/asiodrivers.cpp.o \ + include/asiolist.cpp.o \ + include/iasiothiscallresolver.cpp.o +endif + +# -------------------------------------------------------------- + +ifeq ($(DEBUG),true) +BUILD_CXX_FLAGS += -D__RTAUDIO_DEBUG__ +endif + +ifeq ($(HAVE_ALSA),true) +BUILD_CXX_FLAGS += $(shell pkg-config --cflags alsa) -D__LINUX_ALSA__ +endif + +ifeq ($(HAVE_PULSEAUDIO),true) +BUILD_CXX_FLAGS += $(shell pkg-config --cflags libpulse-simple) -D__LINUX_PULSE__ +endif + +ifeq ($(MACOS),true) +BUILD_CXX_FLAGS += -D__MACOSX_CORE__ +endif + +ifeq ($(WIN32),true) +BUILD_CXX_FLAGS += -D__WINDOWS_ASIO__ -D__WINDOWS_DS__ +endif + +# -------------------------------------------------------------- + +all: ../rtaudio.a + +posix32: ../rtaudio.posix32.a +posix64: ../rtaudio.posix64.a +win32: ../rtaudio.win32.a +win64: ../rtaudio.win64.a + +# -------------------------------------------------------------- + +../rtaudio.a: $(OBJS) + rm -f $@ + $(AR) crs $@ $^ + +../librtaudio.dll: $(OBJS) + $(CXX) $^ -shared $(LINK_FLAGS) -o $@ + +../librtaudio.dylib: $(OBJS) + $(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@ + +../librtaudio.so: $(OBJS) + $(CXX) $^ -shared $(LINK_FLAGS) -o $@ + +# -------------------------------------------------------------- + +%.cpp.o: %.cpp + $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ + +# -------------------------------------------------------------- + +clean: + rm -f *.o ../rtaudio*.a ../librtaudio.* + +debug: + $(MAKE) DEBUG=true + +# -------------------------------------------------------------- diff --git a/source/backend/engine/rtaudio-4.0.12/Makefile.in b/source/modules/rtaudio/Makefile.in similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/Makefile.in rename to source/modules/rtaudio/Makefile.in diff --git a/source/backend/engine/rtaudio-4.0.12/RtAudio.cpp b/source/modules/rtaudio/RtAudio.cpp similarity index 96% rename from source/backend/engine/rtaudio-4.0.12/RtAudio.cpp rename to source/modules/rtaudio/RtAudio.cpp index 34c8a66f2..398491d85 100644 --- a/source/backend/engine/rtaudio-4.0.12/RtAudio.cpp +++ b/source/modules/rtaudio/RtAudio.cpp @@ -381,7 +381,7 @@ double RtApi :: getStreamTime( void ) then = stream_.lastTickTimestamp; return stream_.streamTime + ((now.tv_sec + 0.000001 * now.tv_usec) - - (then.tv_sec + 0.000001 * then.tv_usec)); + (then.tv_sec + 0.000001 * then.tv_usec)); #else return stream_.streamTime; #endif @@ -1728,7 +1728,7 @@ bool RtApiCore :: callbackEvent( AudioDeviceID deviceId, channelsLeft -= streamChannels; } } - + if ( stream_.doConvertBuffer[1] ) { // convert from our internal "device" buffer convertBuffer( stream_.userBuffer[1], stream_.deviceBuffer, @@ -1840,15 +1840,9 @@ struct JackHandle { :client(0), drainCounter(0), internalDrain(false) { ports[0] = 0; ports[1] = 0; xrun[0] = false; xrun[1] = false; } }; -static void jackSilentError( const char * ) {}; - RtApiJack :: RtApiJack() { // Nothing to do here. -#if 0 - // Turn off Jack's internal error reporting. - jack_set_error_function( &jackSilentError ); -#endif } RtApiJack :: ~RtApiJack() @@ -2623,7 +2617,7 @@ RtApiAsio :: RtApiAsio() // CoInitialize beforehand, but it must be for appartment threading // (in which case, CoInitilialize will return S_FALSE here). coInitialized_ = false; - HRESULT hr = CoInitialize( NULL ); + HRESULT hr = CoInitialize( NULL ); if ( FAILED(hr) ) { errorText_ = "RtApiAsio::ASIO requires a single-threaded appartment. Call CoInitializeEx(0,COINIT_APARTMENTTHREADED)"; error( RtError::WARNING ); @@ -2982,7 +2976,7 @@ bool RtApiAsio :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne handle = new AsioHandle; } catch ( std::bad_alloc& ) { - //if ( handle == NULL ) { + //if ( handle == NULL ) { drivers.removeCurrentDriver(); errorText_ = "RtApiAsio::probeDeviceOpen: error allocating AsioHandle memory."; return FAILURE; @@ -3518,13 +3512,13 @@ static long asioMessages( long selector, long value, void* message, double* opt static const char* getAsioErrorString( ASIOError result ) { - struct Messages + struct Messages { ASIOError value; const char*message; }; - static const Messages m[] = + static const Messages m[] = { { ASE_NotPresent, "Hardware input or output is not present or available." }, { ASE_HWMalfunction, "Hardware is malfunctioning." }, @@ -3547,7 +3541,7 @@ static const char* getAsioErrorString( ASIOError result ) #if defined(__WINDOWS_DS__) // Windows DirectSound API // Modified by Robin Davies, October 2005 -// - Improvements to DirectX pointer chasing. +// - Improvements to DirectX pointer chasing. // - Bug fix for non-power-of-two Asio granularity used by Edirol PCR-A30. // - Auto-call CoInitialize for DSOUND and ASIO platforms. // Various revisions for RtAudio 4.0 by Gary Scavone, April 2007 @@ -3587,7 +3581,7 @@ struct DsHandle { void *id[2]; void *buffer[2]; bool xrun[2]; - UINT bufferPointer[2]; + UINT bufferPointer[2]; DWORD dsBufferSize[2]; DWORD dsPointerLeadTime[2]; // the number of bytes ahead of the safe pointer to lead by. HANDLE condition; @@ -4433,7 +4427,7 @@ void RtApiDs :: startStream() // Increase scheduler frequency on lesser windows (a side-effect of // increasing timer accuracy). On greater windows (Win2K or later), // this is already in effect. - timeBeginPeriod( 1 ); + timeBeginPeriod( 1 ); buffersRolling = false; duplexPrerollBytes = 0; @@ -4736,7 +4730,7 @@ void RtApiDs :: callbackEvent() } if ( stream_.mode == OUTPUT || stream_.mode == DUPLEX ) { - + LPDIRECTSOUNDBUFFER dsBuffer = (LPDIRECTSOUNDBUFFER) handle->buffer[0]; if ( handle->drainCounter > 1 ) { // write zeros to the output stream @@ -4802,7 +4796,7 @@ void RtApiDs :: callbackEvent() } if ( dsPointerBetween( nextWritePointer, safeWritePointer, currentWritePointer, dsBufferSize ) - || dsPointerBetween( endWrite, safeWritePointer, currentWritePointer, dsBufferSize ) ) { + || dsPointerBetween( endWrite, safeWritePointer, currentWritePointer, dsBufferSize ) ) { // We've strayed into the forbidden zone ... resync the read pointer. handle->xrun[0] = true; nextWritePointer = safeWritePointer + handle->dsPointerLeadTime[0] - bufferBytes; @@ -4872,14 +4866,14 @@ void RtApiDs :: callbackEvent() if ( safeReadPointer < (DWORD)nextReadPointer ) safeReadPointer += dsBufferSize; // unwrap offset DWORD endRead = nextReadPointer + bufferBytes; - // Handling depends on whether we are INPUT or DUPLEX. + // Handling depends on whether we are INPUT or DUPLEX. // If we're in INPUT mode then waiting is a good thing. If we're in DUPLEX mode, // then a wait here will drag the write pointers into the forbidden zone. - // - // In DUPLEX mode, rather than wait, we will back off the read pointer until - // it's in a safe position. This causes dropouts, but it seems to be the only - // practical way to sync up the read and write pointers reliably, given the - // the very complex relationship between phase and increment of the read and write + // + // In DUPLEX mode, rather than wait, we will back off the read pointer until + // it's in a safe position. This causes dropouts, but it seems to be the only + // practical way to sync up the read and write pointers reliably, given the + // the very complex relationship between phase and increment of the read and write // pointers. // // In order to minimize audible dropouts in DUPLEX mode, we will @@ -4929,7 +4923,7 @@ void RtApiDs :: callbackEvent() error( RtError::SYSTEM_ERROR ); return; } - + if ( safeReadPointer < (DWORD)nextReadPointer ) safeReadPointer += dsBufferSize; // unwrap offset } } @@ -6140,7 +6134,7 @@ void RtApiAlsa :: stopStream() AlsaHandle *apiInfo = (AlsaHandle *) stream_.apiHandle; snd_pcm_t **handle = (snd_pcm_t **) apiInfo->handles; if ( stream_.mode == OUTPUT || stream_.mode == DUPLEX ) { - if ( apiInfo->synchronized ) + if ( apiInfo->synchronized ) result = snd_pcm_drop( handle[0] ); else result = snd_pcm_drain( handle[0] ); @@ -6461,7 +6455,7 @@ unsigned int RtApiPulse::getDeviceCount( void ) return 1; } -RtAudio::DeviceInfo RtApiPulse::getDeviceInfo( unsigned int device ) +RtAudio::DeviceInfo RtApiPulse::getDeviceInfo( unsigned int /*device*/ ) { RtAudio::DeviceInfo info; info.probed = true; @@ -6603,7 +6597,7 @@ void RtApiPulse::callbackEvent( void ) else bytes = stream_.nUserChannels[INPUT] * stream_.bufferSize * formatBytes( stream_.userFormat ); - + if ( pa_simple_read( pah->s_rec, pulse_in, bytes, &pa_error ) < 0 ) { errorStream_ << "RtApiPulse::callbackEvent: audio read error, " << pa_strerror( pa_error ) << "."; @@ -6866,7 +6860,7 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode, stream_.state = STREAM_STOPPED; return true; - + error: if ( pah && stream_.callbackInfo.isRunning ) { pthread_cond_destroy( &pah->runnable_cv ); diff --git a/source/backend/engine/rtaudio-4.0.12/RtAudio.h b/source/modules/rtaudio/RtAudio.h similarity index 99% rename from source/backend/engine/rtaudio-4.0.12/RtAudio.h rename to source/modules/rtaudio/RtAudio.h index d78c3134d..0e60b2ad1 100644 --- a/source/backend/engine/rtaudio-4.0.12/RtAudio.h +++ b/source/modules/rtaudio/RtAudio.h @@ -516,6 +516,7 @@ class RtAudio // Operating system dependent thread functionality. #if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__) + #include #include #include diff --git a/source/backend/engine/rtaudio-4.0.12/RtError.h b/source/modules/rtaudio/RtError.h similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/RtError.h rename to source/modules/rtaudio/RtError.h diff --git a/source/backend/engine/rtaudio-4.0.12/config/config.guess b/source/modules/rtaudio/config/config.guess similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/config/config.guess rename to source/modules/rtaudio/config/config.guess diff --git a/source/backend/engine/rtaudio-4.0.12/config/config.sub b/source/modules/rtaudio/config/config.sub similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/config/config.sub rename to source/modules/rtaudio/config/config.sub diff --git a/source/backend/engine/rtaudio-4.0.12/config/install.sh b/source/modules/rtaudio/config/install.sh similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/config/install.sh rename to source/modules/rtaudio/config/install.sh diff --git a/source/backend/engine/rtaudio-4.0.12/configure b/source/modules/rtaudio/configure similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/configure rename to source/modules/rtaudio/configure diff --git a/source/backend/engine/rtaudio-4.0.12/configure.ac b/source/modules/rtaudio/configure.ac similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/configure.ac rename to source/modules/rtaudio/configure.ac diff --git a/source/backend/engine/rtaudio-4.0.12/contrib/python/pyrtaudio/PyRtAudioTest.py b/source/modules/rtaudio/contrib/python/pyrtaudio/PyRtAudioTest.py similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/contrib/python/pyrtaudio/PyRtAudioTest.py rename to source/modules/rtaudio/contrib/python/pyrtaudio/PyRtAudioTest.py diff --git a/source/backend/engine/rtaudio-4.0.12/contrib/python/pyrtaudio/readme b/source/modules/rtaudio/contrib/python/pyrtaudio/readme similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/contrib/python/pyrtaudio/readme rename to source/modules/rtaudio/contrib/python/pyrtaudio/readme diff --git a/source/backend/engine/rtaudio-4.0.12/contrib/python/pyrtaudio/rtaudiomodule.cpp b/source/modules/rtaudio/contrib/python/pyrtaudio/rtaudiomodule.cpp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/contrib/python/pyrtaudio/rtaudiomodule.cpp rename to source/modules/rtaudio/contrib/python/pyrtaudio/rtaudiomodule.cpp diff --git a/source/backend/engine/rtaudio-4.0.12/contrib/python/pyrtaudio/setup.py b/source/modules/rtaudio/contrib/python/pyrtaudio/setup.py similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/contrib/python/pyrtaudio/setup.py rename to source/modules/rtaudio/contrib/python/pyrtaudio/setup.py diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/Doxyfile b/source/modules/rtaudio/doc/doxygen/Doxyfile similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/Doxyfile rename to source/modules/rtaudio/doc/doxygen/Doxyfile diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/acknowledge.txt b/source/modules/rtaudio/doc/doxygen/acknowledge.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/acknowledge.txt rename to source/modules/rtaudio/doc/doxygen/acknowledge.txt diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/apinotes.txt b/source/modules/rtaudio/doc/doxygen/apinotes.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/apinotes.txt rename to source/modules/rtaudio/doc/doxygen/apinotes.txt diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/compiling.txt b/source/modules/rtaudio/doc/doxygen/compiling.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/compiling.txt rename to source/modules/rtaudio/doc/doxygen/compiling.txt diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/duplex.txt b/source/modules/rtaudio/doc/doxygen/duplex.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/duplex.txt rename to source/modules/rtaudio/doc/doxygen/duplex.txt diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/error.txt b/source/modules/rtaudio/doc/doxygen/error.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/error.txt rename to source/modules/rtaudio/doc/doxygen/error.txt diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/footer.html b/source/modules/rtaudio/doc/doxygen/footer.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/footer.html rename to source/modules/rtaudio/doc/doxygen/footer.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/header.html b/source/modules/rtaudio/doc/doxygen/header.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/header.html rename to source/modules/rtaudio/doc/doxygen/header.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/license.txt b/source/modules/rtaudio/doc/doxygen/license.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/license.txt rename to source/modules/rtaudio/doc/doxygen/license.txt diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/multi.txt b/source/modules/rtaudio/doc/doxygen/multi.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/multi.txt rename to source/modules/rtaudio/doc/doxygen/multi.txt diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/playback.txt b/source/modules/rtaudio/doc/doxygen/playback.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/playback.txt rename to source/modules/rtaudio/doc/doxygen/playback.txt diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/probe.txt b/source/modules/rtaudio/doc/doxygen/probe.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/probe.txt rename to source/modules/rtaudio/doc/doxygen/probe.txt diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/recording.txt b/source/modules/rtaudio/doc/doxygen/recording.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/recording.txt rename to source/modules/rtaudio/doc/doxygen/recording.txt diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/settings.txt b/source/modules/rtaudio/doc/doxygen/settings.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/settings.txt rename to source/modules/rtaudio/doc/doxygen/settings.txt diff --git a/source/backend/engine/rtaudio-4.0.12/doc/doxygen/tutorial.txt b/source/modules/rtaudio/doc/doxygen/tutorial.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/doxygen/tutorial.txt rename to source/modules/rtaudio/doc/doxygen/tutorial.txt diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/RtAudio_8h-source.html b/source/modules/rtaudio/doc/html/RtAudio_8h-source.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/RtAudio_8h-source.html rename to source/modules/rtaudio/doc/html/RtAudio_8h-source.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/RtAudio_8h.html b/source/modules/rtaudio/doc/html/RtAudio_8h.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/RtAudio_8h.html rename to source/modules/rtaudio/doc/html/RtAudio_8h.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/RtAudio_8h_source.html b/source/modules/rtaudio/doc/html/RtAudio_8h_source.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/RtAudio_8h_source.html rename to source/modules/rtaudio/doc/html/RtAudio_8h_source.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/RtError_8h-source.html b/source/modules/rtaudio/doc/html/RtError_8h-source.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/RtError_8h-source.html rename to source/modules/rtaudio/doc/html/RtError_8h-source.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/RtError_8h_source.html b/source/modules/rtaudio/doc/html/RtError_8h_source.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/RtError_8h_source.html rename to source/modules/rtaudio/doc/html/RtError_8h_source.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/acknowledge.html b/source/modules/rtaudio/doc/html/acknowledge.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/acknowledge.html rename to source/modules/rtaudio/doc/html/acknowledge.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/annotated.html b/source/modules/rtaudio/doc/html/annotated.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/annotated.html rename to source/modules/rtaudio/doc/html/annotated.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/apinotes.html b/source/modules/rtaudio/doc/html/apinotes.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/apinotes.html rename to source/modules/rtaudio/doc/html/apinotes.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/bugs.html b/source/modules/rtaudio/doc/html/bugs.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/bugs.html rename to source/modules/rtaudio/doc/html/bugs.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/classRtAudio-members.html b/source/modules/rtaudio/doc/html/classRtAudio-members.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/classRtAudio-members.html rename to source/modules/rtaudio/doc/html/classRtAudio-members.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/classRtAudio.html b/source/modules/rtaudio/doc/html/classRtAudio.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/classRtAudio.html rename to source/modules/rtaudio/doc/html/classRtAudio.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/classRtError-members.html b/source/modules/rtaudio/doc/html/classRtError-members.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/classRtError-members.html rename to source/modules/rtaudio/doc/html/classRtError-members.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/classRtError.html b/source/modules/rtaudio/doc/html/classRtError.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/classRtError.html rename to source/modules/rtaudio/doc/html/classRtError.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/classes.html b/source/modules/rtaudio/doc/html/classes.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/classes.html rename to source/modules/rtaudio/doc/html/classes.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/compiling.html b/source/modules/rtaudio/doc/html/compiling.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/compiling.html rename to source/modules/rtaudio/doc/html/compiling.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/doxygen.css b/source/modules/rtaudio/doc/html/doxygen.css similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/doxygen.css rename to source/modules/rtaudio/doc/html/doxygen.css diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/doxygen.png b/source/modules/rtaudio/doc/html/doxygen.png similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/doxygen.png rename to source/modules/rtaudio/doc/html/doxygen.png diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/duplex.html b/source/modules/rtaudio/doc/html/duplex.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/duplex.html rename to source/modules/rtaudio/doc/html/duplex.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/errors.html b/source/modules/rtaudio/doc/html/errors.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/errors.html rename to source/modules/rtaudio/doc/html/errors.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/files.html b/source/modules/rtaudio/doc/html/files.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/files.html rename to source/modules/rtaudio/doc/html/files.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/functions.html b/source/modules/rtaudio/doc/html/functions.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/functions.html rename to source/modules/rtaudio/doc/html/functions.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/functions_enum.html b/source/modules/rtaudio/doc/html/functions_enum.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/functions_enum.html rename to source/modules/rtaudio/doc/html/functions_enum.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/functions_eval.html b/source/modules/rtaudio/doc/html/functions_eval.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/functions_eval.html rename to source/modules/rtaudio/doc/html/functions_eval.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/functions_func.html b/source/modules/rtaudio/doc/html/functions_func.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/functions_func.html rename to source/modules/rtaudio/doc/html/functions_func.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/functions_vars.html b/source/modules/rtaudio/doc/html/functions_vars.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/functions_vars.html rename to source/modules/rtaudio/doc/html/functions_vars.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/globals.html b/source/modules/rtaudio/doc/html/globals.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/globals.html rename to source/modules/rtaudio/doc/html/globals.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/globals_enum.html b/source/modules/rtaudio/doc/html/globals_enum.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/globals_enum.html rename to source/modules/rtaudio/doc/html/globals_enum.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/globals_eval.html b/source/modules/rtaudio/doc/html/globals_eval.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/globals_eval.html rename to source/modules/rtaudio/doc/html/globals_eval.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/globals_type.html b/source/modules/rtaudio/doc/html/globals_type.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/globals_type.html rename to source/modules/rtaudio/doc/html/globals_type.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/index.html b/source/modules/rtaudio/doc/html/index.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/index.html rename to source/modules/rtaudio/doc/html/index.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/license.html b/source/modules/rtaudio/doc/html/license.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/license.html rename to source/modules/rtaudio/doc/html/license.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/multi.html b/source/modules/rtaudio/doc/html/multi.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/multi.html rename to source/modules/rtaudio/doc/html/multi.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/pages.html b/source/modules/rtaudio/doc/html/pages.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/pages.html rename to source/modules/rtaudio/doc/html/pages.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/playback.html b/source/modules/rtaudio/doc/html/playback.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/playback.html rename to source/modules/rtaudio/doc/html/playback.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/probe.html b/source/modules/rtaudio/doc/html/probe.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/probe.html rename to source/modules/rtaudio/doc/html/probe.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/recording.html b/source/modules/rtaudio/doc/html/recording.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/recording.html rename to source/modules/rtaudio/doc/html/recording.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/settings.html b/source/modules/rtaudio/doc/html/settings.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/settings.html rename to source/modules/rtaudio/doc/html/settings.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudioDeviceInfo-members.html b/source/modules/rtaudio/doc/html/structRtAudioDeviceInfo-members.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudioDeviceInfo-members.html rename to source/modules/rtaudio/doc/html/structRtAudioDeviceInfo-members.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudioDeviceInfo.html b/source/modules/rtaudio/doc/html/structRtAudioDeviceInfo.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudioDeviceInfo.html rename to source/modules/rtaudio/doc/html/structRtAudioDeviceInfo.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudioStreamParameters-members.html b/source/modules/rtaudio/doc/html/structRtAudioStreamParameters-members.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudioStreamParameters-members.html rename to source/modules/rtaudio/doc/html/structRtAudioStreamParameters-members.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudioStreamParameters.html b/source/modules/rtaudio/doc/html/structRtAudioStreamParameters.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudioStreamParameters.html rename to source/modules/rtaudio/doc/html/structRtAudioStreamParameters.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudio_1_1DeviceInfo-members.html b/source/modules/rtaudio/doc/html/structRtAudio_1_1DeviceInfo-members.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudio_1_1DeviceInfo-members.html rename to source/modules/rtaudio/doc/html/structRtAudio_1_1DeviceInfo-members.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudio_1_1DeviceInfo.html b/source/modules/rtaudio/doc/html/structRtAudio_1_1DeviceInfo.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudio_1_1DeviceInfo.html rename to source/modules/rtaudio/doc/html/structRtAudio_1_1DeviceInfo.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudio_1_1StreamOptions-members.html b/source/modules/rtaudio/doc/html/structRtAudio_1_1StreamOptions-members.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudio_1_1StreamOptions-members.html rename to source/modules/rtaudio/doc/html/structRtAudio_1_1StreamOptions-members.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudio_1_1StreamOptions.html b/source/modules/rtaudio/doc/html/structRtAudio_1_1StreamOptions.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudio_1_1StreamOptions.html rename to source/modules/rtaudio/doc/html/structRtAudio_1_1StreamOptions.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudio_1_1StreamParameters-members.html b/source/modules/rtaudio/doc/html/structRtAudio_1_1StreamParameters-members.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudio_1_1StreamParameters-members.html rename to source/modules/rtaudio/doc/html/structRtAudio_1_1StreamParameters-members.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudio_1_1StreamParameters.html b/source/modules/rtaudio/doc/html/structRtAudio_1_1StreamParameters.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/structRtAudio_1_1StreamParameters.html rename to source/modules/rtaudio/doc/html/structRtAudio_1_1StreamParameters.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/tab_b.gif b/source/modules/rtaudio/doc/html/tab_b.gif similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/tab_b.gif rename to source/modules/rtaudio/doc/html/tab_b.gif diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/tab_l.gif b/source/modules/rtaudio/doc/html/tab_l.gif similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/tab_l.gif rename to source/modules/rtaudio/doc/html/tab_l.gif diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/tab_r.gif b/source/modules/rtaudio/doc/html/tab_r.gif similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/tab_r.gif rename to source/modules/rtaudio/doc/html/tab_r.gif diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/tabs.css b/source/modules/rtaudio/doc/html/tabs.css similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/tabs.css rename to source/modules/rtaudio/doc/html/tabs.css diff --git a/source/backend/engine/rtaudio-4.0.12/doc/html/updates.html b/source/modules/rtaudio/doc/html/updates.html similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/html/updates.html rename to source/modules/rtaudio/doc/html/updates.html diff --git a/source/backend/engine/rtaudio-4.0.12/doc/images/ccrma.gif b/source/modules/rtaudio/doc/images/ccrma.gif similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/images/ccrma.gif rename to source/modules/rtaudio/doc/images/ccrma.gif diff --git a/source/backend/engine/rtaudio-4.0.12/doc/images/mcgill.gif b/source/modules/rtaudio/doc/images/mcgill.gif similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/images/mcgill.gif rename to source/modules/rtaudio/doc/images/mcgill.gif diff --git a/source/backend/engine/rtaudio-4.0.12/doc/release.txt b/source/modules/rtaudio/doc/release.txt similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/doc/release.txt rename to source/modules/rtaudio/doc/release.txt diff --git a/source/backend/engine/rtaudio-4.0.12/include/asio.cpp b/source/modules/rtaudio/include/asio.cpp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/asio.cpp rename to source/modules/rtaudio/include/asio.cpp diff --git a/source/backend/engine/rtaudio-4.0.12/include/asio.h b/source/modules/rtaudio/include/asio.h similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/asio.h rename to source/modules/rtaudio/include/asio.h diff --git a/source/backend/engine/rtaudio-4.0.12/include/asiodrivers.cpp b/source/modules/rtaudio/include/asiodrivers.cpp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/asiodrivers.cpp rename to source/modules/rtaudio/include/asiodrivers.cpp diff --git a/source/backend/engine/rtaudio-4.0.12/include/asiodrivers.h b/source/modules/rtaudio/include/asiodrivers.h similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/asiodrivers.h rename to source/modules/rtaudio/include/asiodrivers.h diff --git a/source/backend/engine/rtaudio-4.0.12/include/asiodrvr.h b/source/modules/rtaudio/include/asiodrvr.h similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/asiodrvr.h rename to source/modules/rtaudio/include/asiodrvr.h diff --git a/source/backend/engine/rtaudio-4.0.12/include/asiolist.cpp b/source/modules/rtaudio/include/asiolist.cpp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/asiolist.cpp rename to source/modules/rtaudio/include/asiolist.cpp diff --git a/source/backend/engine/rtaudio-4.0.12/include/asiolist.h b/source/modules/rtaudio/include/asiolist.h similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/asiolist.h rename to source/modules/rtaudio/include/asiolist.h diff --git a/source/backend/engine/rtaudio-4.0.12/include/asiosys.h b/source/modules/rtaudio/include/asiosys.h similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/asiosys.h rename to source/modules/rtaudio/include/asiosys.h diff --git a/source/backend/engine/rtaudio-4.0.12/include/dsound.h b/source/modules/rtaudio/include/dsound.h similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/dsound.h rename to source/modules/rtaudio/include/dsound.h diff --git a/source/backend/engine/rtaudio-4.0.12/include/ginclude.h b/source/modules/rtaudio/include/ginclude.h similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/ginclude.h rename to source/modules/rtaudio/include/ginclude.h diff --git a/source/backend/engine/rtaudio-4.0.12/include/iasiodrv.h b/source/modules/rtaudio/include/iasiodrv.h similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/iasiodrv.h rename to source/modules/rtaudio/include/iasiodrv.h diff --git a/source/backend/engine/rtaudio-4.0.12/include/iasiothiscallresolver.cpp b/source/modules/rtaudio/include/iasiothiscallresolver.cpp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/iasiothiscallresolver.cpp rename to source/modules/rtaudio/include/iasiothiscallresolver.cpp diff --git a/source/backend/engine/rtaudio-4.0.12/include/iasiothiscallresolver.h b/source/modules/rtaudio/include/iasiothiscallresolver.h similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/iasiothiscallresolver.h rename to source/modules/rtaudio/include/iasiothiscallresolver.h diff --git a/source/backend/engine/rtaudio-4.0.12/include/soundcard.h b/source/modules/rtaudio/include/soundcard.h similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/include/soundcard.h rename to source/modules/rtaudio/include/soundcard.h diff --git a/source/backend/engine/rtaudio-4.0.12/install b/source/modules/rtaudio/install similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/install rename to source/modules/rtaudio/install diff --git a/source/backend/engine/rtaudio-4.0.12/librtaudio.pc.in b/source/modules/rtaudio/librtaudio.pc.in similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/librtaudio.pc.in rename to source/modules/rtaudio/librtaudio.pc.in diff --git a/source/backend/engine/rtaudio-4.0.12/readme b/source/modules/rtaudio/readme similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/readme rename to source/modules/rtaudio/readme diff --git a/source/backend/engine/rtaudio-4.0.12/rtaudio-config.in b/source/modules/rtaudio/rtaudio-config.in similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/rtaudio-config.in rename to source/modules/rtaudio/rtaudio-config.in diff --git a/source/backend/engine/rtaudio-4.0.12/tests/Makefile.in b/source/modules/rtaudio/tests/Makefile.in similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/Makefile.in rename to source/modules/rtaudio/tests/Makefile.in diff --git a/source/backend/engine/rtaudio-4.0.12/tests/Windows/audioprobe.dsp b/source/modules/rtaudio/tests/Windows/audioprobe.dsp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/Windows/audioprobe.dsp rename to source/modules/rtaudio/tests/Windows/audioprobe.dsp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/Windows/duplex.dsp b/source/modules/rtaudio/tests/Windows/duplex.dsp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/Windows/duplex.dsp rename to source/modules/rtaudio/tests/Windows/duplex.dsp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/Windows/playraw.dsp b/source/modules/rtaudio/tests/Windows/playraw.dsp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/Windows/playraw.dsp rename to source/modules/rtaudio/tests/Windows/playraw.dsp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/Windows/playsaw.dsp b/source/modules/rtaudio/tests/Windows/playsaw.dsp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/Windows/playsaw.dsp rename to source/modules/rtaudio/tests/Windows/playsaw.dsp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/Windows/record.dsp b/source/modules/rtaudio/tests/Windows/record.dsp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/Windows/record.dsp rename to source/modules/rtaudio/tests/Windows/record.dsp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/Windows/rtaudio.dsw b/source/modules/rtaudio/tests/Windows/rtaudio.dsw similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/Windows/rtaudio.dsw rename to source/modules/rtaudio/tests/Windows/rtaudio.dsw diff --git a/source/backend/engine/rtaudio-4.0.12/tests/Windows/testall.dsp b/source/modules/rtaudio/tests/Windows/testall.dsp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/Windows/testall.dsp rename to source/modules/rtaudio/tests/Windows/testall.dsp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/Windows/teststops.dsp b/source/modules/rtaudio/tests/Windows/teststops.dsp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/Windows/teststops.dsp rename to source/modules/rtaudio/tests/Windows/teststops.dsp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/audioprobe.cpp b/source/modules/rtaudio/tests/audioprobe.cpp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/audioprobe.cpp rename to source/modules/rtaudio/tests/audioprobe.cpp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/duplex.cpp b/source/modules/rtaudio/tests/duplex.cpp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/duplex.cpp rename to source/modules/rtaudio/tests/duplex.cpp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/playraw.cpp b/source/modules/rtaudio/tests/playraw.cpp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/playraw.cpp rename to source/modules/rtaudio/tests/playraw.cpp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/playsaw.cpp b/source/modules/rtaudio/tests/playsaw.cpp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/playsaw.cpp rename to source/modules/rtaudio/tests/playsaw.cpp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/record.cpp b/source/modules/rtaudio/tests/record.cpp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/record.cpp rename to source/modules/rtaudio/tests/record.cpp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/testall.cpp b/source/modules/rtaudio/tests/testall.cpp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/testall.cpp rename to source/modules/rtaudio/tests/testall.cpp diff --git a/source/backend/engine/rtaudio-4.0.12/tests/teststops.cpp b/source/modules/rtaudio/tests/teststops.cpp similarity index 100% rename from source/backend/engine/rtaudio-4.0.12/tests/teststops.cpp rename to source/modules/rtaudio/tests/teststops.cpp diff --git a/source/backend/engine/rtmidi-2.0.1/Makefile.in b/source/modules/rtmidi/Makefile.in similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/Makefile.in rename to source/modules/rtmidi/Makefile.in diff --git a/source/backend/engine/rtmidi-2.0.1/RtError.h b/source/modules/rtmidi/RtError.h similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/RtError.h rename to source/modules/rtmidi/RtError.h diff --git a/source/backend/engine/rtmidi-2.0.1/RtMidi.cpp b/source/modules/rtmidi/RtMidi.cpp similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/RtMidi.cpp rename to source/modules/rtmidi/RtMidi.cpp diff --git a/source/backend/engine/rtmidi-2.0.1/RtMidi.h b/source/modules/rtmidi/RtMidi.h similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/RtMidi.h rename to source/modules/rtmidi/RtMidi.h diff --git a/source/backend/engine/rtmidi-2.0.1/config/config.guess b/source/modules/rtmidi/config/config.guess similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/config/config.guess rename to source/modules/rtmidi/config/config.guess diff --git a/source/backend/engine/rtmidi-2.0.1/config/config.sub b/source/modules/rtmidi/config/config.sub similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/config/config.sub rename to source/modules/rtmidi/config/config.sub diff --git a/source/backend/engine/rtmidi-2.0.1/config/install.sh b/source/modules/rtmidi/config/install.sh similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/config/install.sh rename to source/modules/rtmidi/config/install.sh diff --git a/source/backend/engine/rtmidi-2.0.1/configure b/source/modules/rtmidi/configure similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/configure rename to source/modules/rtmidi/configure diff --git a/source/backend/engine/rtmidi-2.0.1/configure.ac b/source/modules/rtmidi/configure.ac similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/configure.ac rename to source/modules/rtmidi/configure.ac diff --git a/source/backend/engine/rtmidi-2.0.1/doc/doxygen/Doxyfile b/source/modules/rtmidi/doc/doxygen/Doxyfile similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/doxygen/Doxyfile rename to source/modules/rtmidi/doc/doxygen/Doxyfile diff --git a/source/backend/engine/rtmidi-2.0.1/doc/doxygen/footer.html b/source/modules/rtmidi/doc/doxygen/footer.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/doxygen/footer.html rename to source/modules/rtmidi/doc/doxygen/footer.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/doxygen/header.html b/source/modules/rtmidi/doc/doxygen/header.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/doxygen/header.html rename to source/modules/rtmidi/doc/doxygen/header.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/doxygen/tutorial.txt b/source/modules/rtmidi/doc/doxygen/tutorial.txt similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/doxygen/tutorial.txt rename to source/modules/rtmidi/doc/doxygen/tutorial.txt diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/RtError_8h-source.html b/source/modules/rtmidi/doc/html/RtError_8h-source.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/RtError_8h-source.html rename to source/modules/rtmidi/doc/html/RtError_8h-source.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/RtError_8h_source.html b/source/modules/rtmidi/doc/html/RtError_8h_source.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/RtError_8h_source.html rename to source/modules/rtmidi/doc/html/RtError_8h_source.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/RtMidi_8h-source.html b/source/modules/rtmidi/doc/html/RtMidi_8h-source.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/RtMidi_8h-source.html rename to source/modules/rtmidi/doc/html/RtMidi_8h-source.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/RtMidi_8h.html b/source/modules/rtmidi/doc/html/RtMidi_8h.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/RtMidi_8h.html rename to source/modules/rtmidi/doc/html/RtMidi_8h.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/RtMidi_8h_source.html b/source/modules/rtmidi/doc/html/RtMidi_8h_source.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/RtMidi_8h_source.html rename to source/modules/rtmidi/doc/html/RtMidi_8h_source.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/annotated.html b/source/modules/rtmidi/doc/html/annotated.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/annotated.html rename to source/modules/rtmidi/doc/html/annotated.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInAlsa-members.html b/source/modules/rtmidi/doc/html/classMidiInAlsa-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInAlsa-members.html rename to source/modules/rtmidi/doc/html/classMidiInAlsa-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInAlsa.html b/source/modules/rtmidi/doc/html/classMidiInAlsa.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInAlsa.html rename to source/modules/rtmidi/doc/html/classMidiInAlsa.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInAlsa.png b/source/modules/rtmidi/doc/html/classMidiInAlsa.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInAlsa.png rename to source/modules/rtmidi/doc/html/classMidiInAlsa.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInApi-members.html b/source/modules/rtmidi/doc/html/classMidiInApi-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInApi-members.html rename to source/modules/rtmidi/doc/html/classMidiInApi-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInApi.html b/source/modules/rtmidi/doc/html/classMidiInApi.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInApi.html rename to source/modules/rtmidi/doc/html/classMidiInApi.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInApi.png b/source/modules/rtmidi/doc/html/classMidiInApi.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInApi.png rename to source/modules/rtmidi/doc/html/classMidiInApi.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInCore-members.html b/source/modules/rtmidi/doc/html/classMidiInCore-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInCore-members.html rename to source/modules/rtmidi/doc/html/classMidiInCore-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInCore.html b/source/modules/rtmidi/doc/html/classMidiInCore.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInCore.html rename to source/modules/rtmidi/doc/html/classMidiInCore.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInCore.png b/source/modules/rtmidi/doc/html/classMidiInCore.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInCore.png rename to source/modules/rtmidi/doc/html/classMidiInCore.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInDummy-members.html b/source/modules/rtmidi/doc/html/classMidiInDummy-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInDummy-members.html rename to source/modules/rtmidi/doc/html/classMidiInDummy-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInDummy.html b/source/modules/rtmidi/doc/html/classMidiInDummy.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInDummy.html rename to source/modules/rtmidi/doc/html/classMidiInDummy.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInDummy.png b/source/modules/rtmidi/doc/html/classMidiInDummy.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInDummy.png rename to source/modules/rtmidi/doc/html/classMidiInDummy.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInJack-members.html b/source/modules/rtmidi/doc/html/classMidiInJack-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInJack-members.html rename to source/modules/rtmidi/doc/html/classMidiInJack-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInJack.html b/source/modules/rtmidi/doc/html/classMidiInJack.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInJack.html rename to source/modules/rtmidi/doc/html/classMidiInJack.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInJack.png b/source/modules/rtmidi/doc/html/classMidiInJack.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInJack.png rename to source/modules/rtmidi/doc/html/classMidiInJack.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInWinKS-members.html b/source/modules/rtmidi/doc/html/classMidiInWinKS-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInWinKS-members.html rename to source/modules/rtmidi/doc/html/classMidiInWinKS-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInWinKS.html b/source/modules/rtmidi/doc/html/classMidiInWinKS.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInWinKS.html rename to source/modules/rtmidi/doc/html/classMidiInWinKS.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInWinKS.png b/source/modules/rtmidi/doc/html/classMidiInWinKS.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInWinKS.png rename to source/modules/rtmidi/doc/html/classMidiInWinKS.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInWinMM-members.html b/source/modules/rtmidi/doc/html/classMidiInWinMM-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInWinMM-members.html rename to source/modules/rtmidi/doc/html/classMidiInWinMM-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInWinMM.html b/source/modules/rtmidi/doc/html/classMidiInWinMM.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInWinMM.html rename to source/modules/rtmidi/doc/html/classMidiInWinMM.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInWinMM.png b/source/modules/rtmidi/doc/html/classMidiInWinMM.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiInWinMM.png rename to source/modules/rtmidi/doc/html/classMidiInWinMM.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutAlsa-members.html b/source/modules/rtmidi/doc/html/classMidiOutAlsa-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutAlsa-members.html rename to source/modules/rtmidi/doc/html/classMidiOutAlsa-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutAlsa.html b/source/modules/rtmidi/doc/html/classMidiOutAlsa.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutAlsa.html rename to source/modules/rtmidi/doc/html/classMidiOutAlsa.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutAlsa.png b/source/modules/rtmidi/doc/html/classMidiOutAlsa.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutAlsa.png rename to source/modules/rtmidi/doc/html/classMidiOutAlsa.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutApi-members.html b/source/modules/rtmidi/doc/html/classMidiOutApi-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutApi-members.html rename to source/modules/rtmidi/doc/html/classMidiOutApi-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutApi.html b/source/modules/rtmidi/doc/html/classMidiOutApi.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutApi.html rename to source/modules/rtmidi/doc/html/classMidiOutApi.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutApi.png b/source/modules/rtmidi/doc/html/classMidiOutApi.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutApi.png rename to source/modules/rtmidi/doc/html/classMidiOutApi.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutCore-members.html b/source/modules/rtmidi/doc/html/classMidiOutCore-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutCore-members.html rename to source/modules/rtmidi/doc/html/classMidiOutCore-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutCore.html b/source/modules/rtmidi/doc/html/classMidiOutCore.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutCore.html rename to source/modules/rtmidi/doc/html/classMidiOutCore.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutCore.png b/source/modules/rtmidi/doc/html/classMidiOutCore.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutCore.png rename to source/modules/rtmidi/doc/html/classMidiOutCore.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutDummy-members.html b/source/modules/rtmidi/doc/html/classMidiOutDummy-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutDummy-members.html rename to source/modules/rtmidi/doc/html/classMidiOutDummy-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutDummy.html b/source/modules/rtmidi/doc/html/classMidiOutDummy.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutDummy.html rename to source/modules/rtmidi/doc/html/classMidiOutDummy.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutDummy.png b/source/modules/rtmidi/doc/html/classMidiOutDummy.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutDummy.png rename to source/modules/rtmidi/doc/html/classMidiOutDummy.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutJack-members.html b/source/modules/rtmidi/doc/html/classMidiOutJack-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutJack-members.html rename to source/modules/rtmidi/doc/html/classMidiOutJack-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutJack.html b/source/modules/rtmidi/doc/html/classMidiOutJack.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutJack.html rename to source/modules/rtmidi/doc/html/classMidiOutJack.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutJack.png b/source/modules/rtmidi/doc/html/classMidiOutJack.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutJack.png rename to source/modules/rtmidi/doc/html/classMidiOutJack.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutWinKS-members.html b/source/modules/rtmidi/doc/html/classMidiOutWinKS-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutWinKS-members.html rename to source/modules/rtmidi/doc/html/classMidiOutWinKS-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutWinKS.html b/source/modules/rtmidi/doc/html/classMidiOutWinKS.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutWinKS.html rename to source/modules/rtmidi/doc/html/classMidiOutWinKS.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutWinKS.png b/source/modules/rtmidi/doc/html/classMidiOutWinKS.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutWinKS.png rename to source/modules/rtmidi/doc/html/classMidiOutWinKS.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutWinMM-members.html b/source/modules/rtmidi/doc/html/classMidiOutWinMM-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutWinMM-members.html rename to source/modules/rtmidi/doc/html/classMidiOutWinMM-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutWinMM.html b/source/modules/rtmidi/doc/html/classMidiOutWinMM.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutWinMM.html rename to source/modules/rtmidi/doc/html/classMidiOutWinMM.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutWinMM.png b/source/modules/rtmidi/doc/html/classMidiOutWinMM.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classMidiOutWinMM.png rename to source/modules/rtmidi/doc/html/classMidiOutWinMM.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtError-members.html b/source/modules/rtmidi/doc/html/classRtError-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtError-members.html rename to source/modules/rtmidi/doc/html/classRtError-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtError.html b/source/modules/rtmidi/doc/html/classRtError.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtError.html rename to source/modules/rtmidi/doc/html/classRtError.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidi-members.html b/source/modules/rtmidi/doc/html/classRtMidi-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidi-members.html rename to source/modules/rtmidi/doc/html/classRtMidi-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidi.gif b/source/modules/rtmidi/doc/html/classRtMidi.gif similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidi.gif rename to source/modules/rtmidi/doc/html/classRtMidi.gif diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidi.html b/source/modules/rtmidi/doc/html/classRtMidi.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidi.html rename to source/modules/rtmidi/doc/html/classRtMidi.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidi.png b/source/modules/rtmidi/doc/html/classRtMidi.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidi.png rename to source/modules/rtmidi/doc/html/classRtMidi.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiIn-members.html b/source/modules/rtmidi/doc/html/classRtMidiIn-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiIn-members.html rename to source/modules/rtmidi/doc/html/classRtMidiIn-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiIn.gif b/source/modules/rtmidi/doc/html/classRtMidiIn.gif similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiIn.gif rename to source/modules/rtmidi/doc/html/classRtMidiIn.gif diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiIn.html b/source/modules/rtmidi/doc/html/classRtMidiIn.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiIn.html rename to source/modules/rtmidi/doc/html/classRtMidiIn.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiIn.png b/source/modules/rtmidi/doc/html/classRtMidiIn.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiIn.png rename to source/modules/rtmidi/doc/html/classRtMidiIn.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiOut-members.html b/source/modules/rtmidi/doc/html/classRtMidiOut-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiOut-members.html rename to source/modules/rtmidi/doc/html/classRtMidiOut-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiOut.gif b/source/modules/rtmidi/doc/html/classRtMidiOut.gif similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiOut.gif rename to source/modules/rtmidi/doc/html/classRtMidiOut.gif diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiOut.html b/source/modules/rtmidi/doc/html/classRtMidiOut.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiOut.html rename to source/modules/rtmidi/doc/html/classRtMidiOut.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiOut.png b/source/modules/rtmidi/doc/html/classRtMidiOut.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classRtMidiOut.png rename to source/modules/rtmidi/doc/html/classRtMidiOut.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/classes.html b/source/modules/rtmidi/doc/html/classes.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/classes.html rename to source/modules/rtmidi/doc/html/classes.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/doxygen.css b/source/modules/rtmidi/doc/html/doxygen.css similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/doxygen.css rename to source/modules/rtmidi/doc/html/doxygen.css diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/doxygen.png b/source/modules/rtmidi/doc/html/doxygen.png similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/doxygen.png rename to source/modules/rtmidi/doc/html/doxygen.png diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/files.html b/source/modules/rtmidi/doc/html/files.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/files.html rename to source/modules/rtmidi/doc/html/files.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/functions.html b/source/modules/rtmidi/doc/html/functions.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/functions.html rename to source/modules/rtmidi/doc/html/functions.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/functions_enum.html b/source/modules/rtmidi/doc/html/functions_enum.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/functions_enum.html rename to source/modules/rtmidi/doc/html/functions_enum.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/functions_eval.html b/source/modules/rtmidi/doc/html/functions_eval.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/functions_eval.html rename to source/modules/rtmidi/doc/html/functions_eval.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/functions_func.html b/source/modules/rtmidi/doc/html/functions_func.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/functions_func.html rename to source/modules/rtmidi/doc/html/functions_func.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/functions_type.html b/source/modules/rtmidi/doc/html/functions_type.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/functions_type.html rename to source/modules/rtmidi/doc/html/functions_type.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/hierarchy.html b/source/modules/rtmidi/doc/html/hierarchy.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/hierarchy.html rename to source/modules/rtmidi/doc/html/hierarchy.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/index.html b/source/modules/rtmidi/doc/html/index.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/index.html rename to source/modules/rtmidi/doc/html/index.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage-members.html b/source/modules/rtmidi/doc/html/structMidiInApi_1_1MidiMessage-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage-members.html rename to source/modules/rtmidi/doc/html/structMidiInApi_1_1MidiMessage-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage.html b/source/modules/rtmidi/doc/html/structMidiInApi_1_1MidiMessage.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiMessage.html rename to source/modules/rtmidi/doc/html/structMidiInApi_1_1MidiMessage.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue-members.html b/source/modules/rtmidi/doc/html/structMidiInApi_1_1MidiQueue-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue-members.html rename to source/modules/rtmidi/doc/html/structMidiInApi_1_1MidiQueue-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue.html b/source/modules/rtmidi/doc/html/structMidiInApi_1_1MidiQueue.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1MidiQueue.html rename to source/modules/rtmidi/doc/html/structMidiInApi_1_1MidiQueue.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData-members.html b/source/modules/rtmidi/doc/html/structMidiInApi_1_1RtMidiInData-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData-members.html rename to source/modules/rtmidi/doc/html/structMidiInApi_1_1RtMidiInData-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData.html b/source/modules/rtmidi/doc/html/structMidiInApi_1_1RtMidiInData.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/structMidiInApi_1_1RtMidiInData.html rename to source/modules/rtmidi/doc/html/structMidiInApi_1_1RtMidiInData.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage-members.html b/source/modules/rtmidi/doc/html/structRtMidiIn_1_1MidiMessage-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage-members.html rename to source/modules/rtmidi/doc/html/structRtMidiIn_1_1MidiMessage-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage.html b/source/modules/rtmidi/doc/html/structRtMidiIn_1_1MidiMessage.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiMessage.html rename to source/modules/rtmidi/doc/html/structRtMidiIn_1_1MidiMessage.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue-members.html b/source/modules/rtmidi/doc/html/structRtMidiIn_1_1MidiQueue-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue-members.html rename to source/modules/rtmidi/doc/html/structRtMidiIn_1_1MidiQueue-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue.html b/source/modules/rtmidi/doc/html/structRtMidiIn_1_1MidiQueue.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1MidiQueue.html rename to source/modules/rtmidi/doc/html/structRtMidiIn_1_1MidiQueue.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData-members.html b/source/modules/rtmidi/doc/html/structRtMidiIn_1_1RtMidiInData-members.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData-members.html rename to source/modules/rtmidi/doc/html/structRtMidiIn_1_1RtMidiInData-members.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData.html b/source/modules/rtmidi/doc/html/structRtMidiIn_1_1RtMidiInData.html similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/structRtMidiIn_1_1RtMidiInData.html rename to source/modules/rtmidi/doc/html/structRtMidiIn_1_1RtMidiInData.html diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/tab_b.gif b/source/modules/rtmidi/doc/html/tab_b.gif similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/tab_b.gif rename to source/modules/rtmidi/doc/html/tab_b.gif diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/tab_l.gif b/source/modules/rtmidi/doc/html/tab_l.gif similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/tab_l.gif rename to source/modules/rtmidi/doc/html/tab_l.gif diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/tab_r.gif b/source/modules/rtmidi/doc/html/tab_r.gif similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/tab_r.gif rename to source/modules/rtmidi/doc/html/tab_r.gif diff --git a/source/backend/engine/rtmidi-2.0.1/doc/html/tabs.css b/source/modules/rtmidi/doc/html/tabs.css similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/html/tabs.css rename to source/modules/rtmidi/doc/html/tabs.css diff --git a/source/backend/engine/rtmidi-2.0.1/doc/images/ccrma.gif b/source/modules/rtmidi/doc/images/ccrma.gif similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/images/ccrma.gif rename to source/modules/rtmidi/doc/images/ccrma.gif diff --git a/source/backend/engine/rtmidi-2.0.1/doc/images/mcgill.gif b/source/modules/rtmidi/doc/images/mcgill.gif similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/images/mcgill.gif rename to source/modules/rtmidi/doc/images/mcgill.gif diff --git a/source/backend/engine/rtmidi-2.0.1/doc/release.txt b/source/modules/rtmidi/doc/release.txt similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/doc/release.txt rename to source/modules/rtmidi/doc/release.txt diff --git a/source/backend/engine/rtmidi-2.0.1/include/ks.h b/source/modules/rtmidi/include/ks.h similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/include/ks.h rename to source/modules/rtmidi/include/ks.h diff --git a/source/backend/engine/rtmidi-2.0.1/include/ksmedia.h b/source/modules/rtmidi/include/ksmedia.h similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/include/ksmedia.h rename to source/modules/rtmidi/include/ksmedia.h diff --git a/source/backend/engine/rtmidi-2.0.1/msw/readme b/source/modules/rtmidi/msw/readme similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/msw/readme rename to source/modules/rtmidi/msw/readme diff --git a/source/backend/engine/rtmidi-2.0.1/msw/rtmidilib.sln b/source/modules/rtmidi/msw/rtmidilib.sln similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/msw/rtmidilib.sln rename to source/modules/rtmidi/msw/rtmidilib.sln diff --git a/source/backend/engine/rtmidi-2.0.1/msw/rtmidilib.vcproj b/source/modules/rtmidi/msw/rtmidilib.vcproj similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/msw/rtmidilib.vcproj rename to source/modules/rtmidi/msw/rtmidilib.vcproj diff --git a/source/backend/engine/rtmidi-2.0.1/readme b/source/modules/rtmidi/readme similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/readme rename to source/modules/rtmidi/readme diff --git a/source/backend/engine/rtmidi-2.0.1/rtmidi-config.in b/source/modules/rtmidi/rtmidi-config.in similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/rtmidi-config.in rename to source/modules/rtmidi/rtmidi-config.in diff --git a/source/backend/engine/rtmidi-2.0.1/tests/Makefile.in b/source/modules/rtmidi/tests/Makefile.in similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/tests/Makefile.in rename to source/modules/rtmidi/tests/Makefile.in diff --git a/source/backend/engine/rtmidi-2.0.1/tests/RtMidi.dsw b/source/modules/rtmidi/tests/RtMidi.dsw similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/tests/RtMidi.dsw rename to source/modules/rtmidi/tests/RtMidi.dsw diff --git a/source/backend/engine/rtmidi-2.0.1/tests/cmidiin.cpp b/source/modules/rtmidi/tests/cmidiin.cpp similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/tests/cmidiin.cpp rename to source/modules/rtmidi/tests/cmidiin.cpp diff --git a/source/backend/engine/rtmidi-2.0.1/tests/cmidiin.dsp b/source/modules/rtmidi/tests/cmidiin.dsp similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/tests/cmidiin.dsp rename to source/modules/rtmidi/tests/cmidiin.dsp diff --git a/source/backend/engine/rtmidi-2.0.1/tests/midiout.cpp b/source/modules/rtmidi/tests/midiout.cpp similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/tests/midiout.cpp rename to source/modules/rtmidi/tests/midiout.cpp diff --git a/source/backend/engine/rtmidi-2.0.1/tests/midiout.dsp b/source/modules/rtmidi/tests/midiout.dsp similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/tests/midiout.dsp rename to source/modules/rtmidi/tests/midiout.dsp diff --git a/source/backend/engine/rtmidi-2.0.1/tests/midiprobe.cpp b/source/modules/rtmidi/tests/midiprobe.cpp similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/tests/midiprobe.cpp rename to source/modules/rtmidi/tests/midiprobe.cpp diff --git a/source/backend/engine/rtmidi-2.0.1/tests/midiprobe.dsp b/source/modules/rtmidi/tests/midiprobe.dsp similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/tests/midiprobe.dsp rename to source/modules/rtmidi/tests/midiprobe.dsp diff --git a/source/backend/engine/rtmidi-2.0.1/tests/qmidiin.cpp b/source/modules/rtmidi/tests/qmidiin.cpp similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/tests/qmidiin.cpp rename to source/modules/rtmidi/tests/qmidiin.cpp diff --git a/source/backend/engine/rtmidi-2.0.1/tests/qmidiin.dsp b/source/modules/rtmidi/tests/qmidiin.dsp similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/tests/qmidiin.dsp rename to source/modules/rtmidi/tests/qmidiin.dsp diff --git a/source/backend/engine/rtmidi-2.0.1/tests/sysextest.cpp b/source/modules/rtmidi/tests/sysextest.cpp similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/tests/sysextest.cpp rename to source/modules/rtmidi/tests/sysextest.cpp diff --git a/source/backend/engine/rtmidi-2.0.1/tests/sysextest.dsp b/source/modules/rtmidi/tests/sysextest.dsp similarity index 100% rename from source/backend/engine/rtmidi-2.0.1/tests/sysextest.dsp rename to source/modules/rtmidi/tests/sysextest.dsp