| @@ -3,4 +3,4 @@ sudo apt-get install -y pkg-config \ | |||
| libasound2-dev libpulse-dev libmagic-dev libx11-dev libxft-dev \ | |||
| libgl1-mesa-dev libglu1-mesa-dev \ | |||
| liblo-static fftw3-static mxml-static zlib-static ntk-static \ | |||
| fluidsynth-static linuxsampler-static | |||
| fluidsynth-static | |||
| @@ -3,4 +3,4 @@ sudo apt-get install -y pkg-config \ | |||
| # mingw32-x-gcc mingw32-x-pkgconfig | |||
| # mingw32-x-liblo mingw32-x-fftw3 mingw32-x-mxml mingw32-x-zlib | |||
| # mingw32-x-fluidsynth mingw32-x-linuxsampler | |||
| # mingw32-x-fluidsynth | |||
| @@ -3,4 +3,4 @@ sudo apt-get install -y pkg-config \ | |||
| # mingw64-x-gcc mingw64-x-pkgconfig | |||
| # mingw64-x-liblo mingw64-x-fftw3 mingw64-x-mxml mingw64-x-zlib | |||
| # mingw64-x-fluidsynth mingw64-x-linuxsampler | |||
| # mingw64-x-fluidsynth | |||
| @@ -2,7 +2,7 @@ | |||
| # -*- coding: utf-8 -*- | |||
| # Script to start carla plugin bridges | |||
| # Copyright (C) 2015 Filipe Coelho <falktx@falktx.com> | |||
| # Copyright (C) 2015-2018 Filipe Coelho <falktx@falktx.com> | |||
| # | |||
| # This program is free software; you can redistribute it and/or | |||
| # modify it under the terms of the GNU General Public License as | |||
| @@ -210,7 +210,6 @@ LADSPA_PATH = os.getenv("LADSPA_PATH") | |||
| DSSI_PATH = os.getenv("DSSI_PATH") | |||
| LV2_PATH = os.getenv("LV2_PATH") | |||
| VST2_PATH = os.getenv("VST_PATH") | |||
| GIG_PATH = os.getenv("GIG_PATH") | |||
| SF2_PATH = os.getenv("SF2_PATH") | |||
| SFZ_PATH = os.getenv("SFZ_PATH") | |||
| @@ -218,7 +217,6 @@ if LADSPA_PATH is not None: os.environ["ENGINE_OPTION_PLUGIN_PATH_LADSPA"] = LAD | |||
| if DSSI_PATH is not None: os.environ["ENGINE_OPTION_PLUGIN_PATH_DSSI"] = DSSI_PATH | |||
| if LV2_PATH is not None: os.environ["ENGINE_OPTION_PLUGIN_PATH_LV2"] = LV2_PATH | |||
| if VST2_PATH is not None: os.environ["ENGINE_OPTION_PLUGIN_PATH_VST2"] = VST2_PATH | |||
| if GIG_PATH is not None: os.environ["ENGINE_OPTION_PLUGIN_PATH_GIG"] = GIG_PATH | |||
| if SF2_PATH is not None: os.environ["ENGINE_OPTION_PLUGIN_PATH_SF2"] = SF2_PATH | |||
| if SFZ_PATH is not None: os.environ["ENGINE_OPTION_PLUGIN_PATH_SFZ"] = SFZ_PATH | |||
| @@ -10,7 +10,7 @@ Features | |||
| --------- | |||
| * LADSPA, DSSI, LV2 and VST plugin formats | |||
| * GIG, SF2 and SFZ sound banks | |||
| * SF2/3 and SFZ sound banks | |||
| * Internal audio and midi file player | |||
| * Automation of plugin parameters via MIDI CC | |||
| * Remote control over OSC | |||
| @@ -28,12 +28,10 @@ rm -rf file-* | |||
| rm -rf flac-* | |||
| rm -rf fltk-* | |||
| rm -rf fluidsynth-* | |||
| rm -rf libgig-* | |||
| rm -rf liblo-* | |||
| rm -rf libogg-* | |||
| rm -rf libsndfile-* | |||
| rm -rf libvorbis-* | |||
| rm -rf linuxsampler-* | |||
| rm -rf pkg-config-* | |||
| rm -rf zlib-* | |||
| @@ -208,58 +206,6 @@ if [ ! -f libsndfile-${LIBSNDFILE_VERSION}/build-done ]; then | |||
| cd .. | |||
| fi | |||
| # --------------------------------------------------------------------------------------------------------------------- | |||
| # libgig | |||
| if [ ! -d libgig-${LIBGIG_VERSION} ]; then | |||
| wget http://download.linuxsampler.org/packages/libgig-${LIBGIG_VERSION}.tar.bz2 | |||
| tar -xf libgig-${LIBGIG_VERSION}.tar.bz2 | |||
| fi | |||
| if [ ! -f libgig-${LIBGIG_VERSION}/build-done ]; then | |||
| cd libgig-${LIBGIG_VERSION} | |||
| if [ ! -f patched ]; then | |||
| patch -p1 -i ../patches/libgig_fix-build.patch | |||
| touch patched | |||
| fi | |||
| ./configure --enable-static --disable-shared --prefix=${PREFIX} | |||
| make ${MAKE_ARGS} | |||
| make install | |||
| touch build-done | |||
| cd .. | |||
| fi | |||
| # --------------------------------------------------------------------------------------------------------------------- | |||
| # linuxsampler | |||
| if [ ! -d linuxsampler-${LINUXSAMPLER_VERSION} ]; then | |||
| wget http://download.linuxsampler.org/packages/linuxsampler-${LINUXSAMPLER_VERSION}.tar.bz2 | |||
| tar -xf linuxsampler-${LINUXSAMPLER_VERSION}.tar.bz2 | |||
| fi | |||
| if [ ! -f linuxsampler-${LINUXSAMPLER_VERSION}/build-done ]; then | |||
| cd linuxsampler-${LINUXSAMPLER_VERSION} | |||
| if [ ! -f patched ]; then | |||
| patch -p1 -i ../patches/linuxsampler_allow-no-drivers-build.patch | |||
| patch -p1 -i ../patches/linuxsampler_disable-ladspa-fx.patch | |||
| touch patched | |||
| fi | |||
| rm -f configure | |||
| make -f Makefile.svn configure | |||
| ./configure \ | |||
| --enable-static --disable-shared --prefix=${PREFIX} \ | |||
| --enable-signed-triang-algo=diharmonic --enable-unsigned-triang-algo=diharmonic --enable-subfragment-size=8 \ | |||
| --disable-alsa-driver --disable-arts-driver --disable-jack-driver \ | |||
| --disable-asio-driver --disable-midishare-driver --disable-mmemidi-driver \ | |||
| --disable-coreaudio-driver --disable-coremidi-driver \ | |||
| --disable-instruments-db --disable-sf2-engine | |||
| make ${MAKE_ARGS} | |||
| make install | |||
| sed -i -e "s|-llinuxsampler|-llinuxsampler -L${PREFIX}/lib/libgig -lgig -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lpthread -lm|" ${PREFIX}/lib/pkgconfig/linuxsampler.pc | |||
| touch build-done | |||
| cd .. | |||
| fi | |||
| # --------------------------------------------------------------------------------------------------------------------- | |||
| # glib | |||
| @@ -8,8 +8,6 @@ LIBOGG_VERSION=1.3.3 | |||
| LIBVORBIS_VERSION=1.3.5 | |||
| FLAC_VERSION=1.3.2 | |||
| LIBSNDFILE_VERSION=1.0.28 | |||
| LIBGIG_VERSION=4.0.0 | |||
| LINUXSAMPLER_VERSION=2.0.0 | |||
| FLUIDSYNTH_VERSION=1.1.6 | |||
| MXML_VERSION=2.11 | |||
| FFTW3_VERSION=3.3.7 | |||
| @@ -1,29 +0,0 @@ | |||
| diff --git a/src/DLS.h b/src/DLS.h | |||
| index 065bfe6..6c9d76c 100644 | |||
| --- a/src/DLS.h | |||
| +++ b/src/DLS.h | |||
| @@ -515,10 +515,10 @@ namespace DLS { | |||
| virtual void Save(const String& Path, progress_t* pProgress = NULL); | |||
| virtual void Save(progress_t* pProgress = NULL); | |||
| virtual ~File(); | |||
| - protected: | |||
| typedef std::list<Sample*> SampleList; | |||
| typedef std::list<Instrument*> InstrumentList; | |||
| + protected: | |||
| RIFF::File* pRIFF; | |||
| std::list<RIFF::File*> ExtensionFiles; | |||
| SampleList* pSamples; | |||
| diff --git a/src/gig.cpp b/src/gig.cpp | |||
| index 6a24f16..902e1ae 100644 | |||
| --- a/src/gig.cpp | |||
| +++ b/src/gig.cpp | |||
| @@ -4181,7 +4181,7 @@ namespace { | |||
| * @param pGroup - script's new group | |||
| */ | |||
| void Script::SetGroup(ScriptGroup* pGroup) { | |||
| - if (this->pGroup = pGroup) return; | |||
| + if (this->pGroup == pGroup) return; | |||
| if (pChunk) | |||
| pChunk->GetParent()->MoveSubChunk(pChunk, pGroup->pList); | |||
| this->pGroup = pGroup; | |||
| @@ -1,24 +0,0 @@ | |||
| --- linuxsampler-static-1.0.0+svn2356.orig/configure.ac | |||
| +++ linuxsampler-static-1.0.0+svn2356/configure.ac | |||
| @@ -556,21 +556,6 @@ if test "x$MAC_PLUGIN_INSTALL_DIR" = "x" | |||
| fi | |||
| AC_SUBST(MAC_PLUGIN_INSTALL_DIR) | |||
| -# have we found at least one MIDI input and one audio output driver ? | |||
| -if test "$have_midi_input_driver" = "false"; then | |||
| - echo "No supported MIDI input system found!" | |||
| - echo "Sorry, LinuxSampler only supports the following MIDI drivers at the moment:" | |||
| - echo "ALSA, JACK, MIDIShare, CoreMIDI, MME." | |||
| - echo "If you think you have one of those available on your system, make sure you" | |||
| - echo "also have the respective development (header) files installed." | |||
| - exit -1; | |||
| -fi | |||
| -if test "$have_audio_output_driver" = "false"; then | |||
| - echo "No supported audio output system found!" | |||
| - echo "Sorry, LinuxSampler only supports ALSA, JACK, ARTS and ASIO as audio output" | |||
| - echo "driver at the moment!" | |||
| - exit -1; | |||
| -fi | |||
| @@ -1,10 +0,0 @@ | |||
| --- linuxsampler-static-1.0.0+svn2497.orig/src/effects/LadspaEffect.cpp | |||
| +++ linuxsampler-static-1.0.0+svn2497/src/effects/LadspaEffect.cpp | |||
| @@ -374,6 +374,7 @@ static String defaultLadspaDir() { | |||
| std::vector<EffectInfo*> LadspaEffect::AvailableEffects() { | |||
| std::vector<EffectInfo*> v; // will be filled in callback function _foundLadspaDll() | |||
| + return v; | |||
| char* pcLadspaPath = getenv("LADSPA_PATH"); | |||
| String ladspaDir = pcLadspaPath ? pcLadspaPath : defaultLadspaDir(); | |||
| @@ -10,7 +10,7 @@ Features | |||
| --------- | |||
| * LADSPA, DSSI, LV2 and VST plugin formats | |||
| * GIG, SF2 and SFZ sound banks | |||
| * SF2/3 and SFZ sound banks | |||
| * Internal audio and midi file player | |||
| * Automation of plugin parameters via MIDI CC | |||
| * Remote control over OSC | |||
| @@ -40,12 +40,10 @@ rm -rf fftw-* | |||
| rm -rf gettext-* | |||
| rm -rf glib-* | |||
| rm -rf libffi-* | |||
| rm -rf libgig-* | |||
| rm -rf liblo-* | |||
| rm -rf libogg-* | |||
| rm -rf libsndfile-* | |||
| rm -rf libvorbis-* | |||
| rm -rf linuxsampler-* | |||
| rm -rf mxml-* | |||
| rm -rf pkg-config-* | |||
| rm -rf pyliblo-* | |||
| @@ -229,64 +227,6 @@ if [ ! -f libsndfile-${LIBSNDFILE_VERSION}/build-done ]; then | |||
| cd .. | |||
| fi | |||
| # --------------------------------------------------------------------------------------------------------------------- | |||
| # libgig | |||
| if [ ! -d libgig-${LIBGIG_VERSION} ]; then | |||
| curl -O http://download.linuxsampler.org/packages/libgig-${LIBGIG_VERSION}.tar.bz2 | |||
| tar -xf libgig-${LIBGIG_VERSION}.tar.bz2 | |||
| fi | |||
| if [ ! -f libgig-${LIBGIG_VERSION}/build-done ]; then | |||
| cd libgig-${LIBGIG_VERSION} | |||
| if [ ! -f patched ]; then | |||
| patch -p1 -i ../patches/libgig_fix-build.patch | |||
| touch patched | |||
| fi | |||
| ./configure --enable-static --disable-shared --prefix=${PREFIX} | |||
| make ${MAKE_ARGS} | |||
| make install | |||
| touch build-done | |||
| cd .. | |||
| fi | |||
| # --------------------------------------------------------------------------------------------------------------------- | |||
| # linuxsampler | |||
| if [ ! -d linuxsampler-${LINUXSAMPLER_VERSION} ]; then | |||
| curl -O http://download.linuxsampler.org/packages/linuxsampler-${LINUXSAMPLER_VERSION}.tar.bz2 | |||
| tar -xf linuxsampler-${LINUXSAMPLER_VERSION}.tar.bz2 | |||
| fi | |||
| if [ ! -f linuxsampler-${LINUXSAMPLER_VERSION}/build-done ]; then | |||
| cd linuxsampler-${LINUXSAMPLER_VERSION} | |||
| if [ ! -f patched ]; then | |||
| patch -p1 -i ../patches/linuxsampler_allow-no-drivers-build.patch | |||
| patch -p1 -i ../patches/linuxsampler_disable-ladspa-fx.patch | |||
| sed -i -e "s|HAVE_AU|HAVE_VST|" src/hostplugins/Makefile.am | |||
| touch patched | |||
| fi | |||
| env PATH=/opt/local/bin:$PATH /opt/local/bin/aclocal -I /opt/local/share/aclocal | |||
| env PATH=/opt/local/bin:$PATH /opt/local/bin/glibtoolize --force --copy | |||
| env PATH=/opt/local/bin:$PATH /opt/local/bin/autoheader | |||
| env PATH=/opt/local/bin:$PATH /opt/local/bin/automake --add-missing --copy | |||
| env PATH=/opt/local/bin:$PATH /opt/local/bin/autoconf | |||
| env PATH=/opt/local/bin:$PATH ./configure \ | |||
| --enable-static --disable-shared --prefix=${PREFIX} \ | |||
| --enable-signed-triang-algo=diharmonic --enable-unsigned-triang-algo=diharmonic --enable-subfragment-size=8 \ | |||
| --disable-alsa-driver --disable-arts-driver --disable-jack-driver \ | |||
| --disable-asio-driver --disable-midishare-driver --disable-mmemidi-driver \ | |||
| --disable-coreaudio-driver --disable-coremidi-driver \ | |||
| --disable-instruments-db --disable-sf2-engine | |||
| env PATH=/opt/local/bin:$PATH ./scripts/generate_instrument_script_parser.sh | |||
| sed -i -e "s/bison (GNU Bison) //" config.h | |||
| env PATH=/opt/local/bin:$PATH make ${MAKE_ARGS} | |||
| make install | |||
| sed -i -e "s|-llinuxsampler|-llinuxsampler -L${PREFIX}/lib/libgig -lgig -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lpthread -lm|" ${PREFIX}/lib/pkgconfig/linuxsampler.pc | |||
| touch build-done | |||
| cd .. | |||
| fi | |||
| # --------------------------------------------------------------------------------------------------------------------- | |||
| # libffi | |||
| @@ -8,8 +8,6 @@ LIBOGG_VERSION=1.3.3 | |||
| LIBVORBIS_VERSION=1.3.5 | |||
| FLAC_VERSION=1.3.2 | |||
| LIBSNDFILE_VERSION=1.0.28 | |||
| LIBGIG_VERSION=4.0.0 | |||
| LINUXSAMPLER_VERSION=2.0.0 | |||
| LIBFFI_VERSION=3.2.1 | |||
| GETTEXT_VERSION=0.18.3.2 | |||
| GLIB_VERSION=2.44.1 | |||
| @@ -1,29 +0,0 @@ | |||
| diff --git a/src/DLS.h b/src/DLS.h | |||
| index 065bfe6..6c9d76c 100644 | |||
| --- a/src/DLS.h | |||
| +++ b/src/DLS.h | |||
| @@ -515,10 +515,10 @@ namespace DLS { | |||
| virtual void Save(const String& Path, progress_t* pProgress = NULL); | |||
| virtual void Save(progress_t* pProgress = NULL); | |||
| virtual ~File(); | |||
| - protected: | |||
| typedef std::list<Sample*> SampleList; | |||
| typedef std::list<Instrument*> InstrumentList; | |||
| + protected: | |||
| RIFF::File* pRIFF; | |||
| std::list<RIFF::File*> ExtensionFiles; | |||
| SampleList* pSamples; | |||
| diff --git a/src/gig.cpp b/src/gig.cpp | |||
| index 6a24f16..902e1ae 100644 | |||
| --- a/src/gig.cpp | |||
| +++ b/src/gig.cpp | |||
| @@ -4181,7 +4181,7 @@ namespace { | |||
| * @param pGroup - script's new group | |||
| */ | |||
| void Script::SetGroup(ScriptGroup* pGroup) { | |||
| - if (this->pGroup = pGroup) return; | |||
| + if (this->pGroup == pGroup) return; | |||
| if (pChunk) | |||
| pChunk->GetParent()->MoveSubChunk(pChunk, pGroup->pList); | |||
| this->pGroup = pGroup; | |||
| @@ -1,24 +0,0 @@ | |||
| --- linuxsampler-static-1.0.0+svn2356.orig/configure.ac | |||
| +++ linuxsampler-static-1.0.0+svn2356/configure.ac | |||
| @@ -556,21 +556,6 @@ if test "x$MAC_PLUGIN_INSTALL_DIR" = "x" | |||
| fi | |||
| AC_SUBST(MAC_PLUGIN_INSTALL_DIR) | |||
| -# have we found at least one MIDI input and one audio output driver ? | |||
| -if test "$have_midi_input_driver" = "false"; then | |||
| - echo "No supported MIDI input system found!" | |||
| - echo "Sorry, LinuxSampler only supports the following MIDI drivers at the moment:" | |||
| - echo "ALSA, JACK, MIDIShare, CoreMIDI, MME." | |||
| - echo "If you think you have one of those available on your system, make sure you" | |||
| - echo "also have the respective development (header) files installed." | |||
| - exit -1; | |||
| -fi | |||
| -if test "$have_audio_output_driver" = "false"; then | |||
| - echo "No supported audio output system found!" | |||
| - echo "Sorry, LinuxSampler only supports ALSA, JACK, ARTS and ASIO as audio output" | |||
| - echo "driver at the moment!" | |||
| - exit -1; | |||
| -fi | |||
| @@ -1,10 +0,0 @@ | |||
| --- linuxsampler-static-1.0.0+svn2497.orig/src/effects/LadspaEffect.cpp | |||
| +++ linuxsampler-static-1.0.0+svn2497/src/effects/LadspaEffect.cpp | |||
| @@ -374,6 +374,7 @@ static String defaultLadspaDir() { | |||
| std::vector<EffectInfo*> LadspaEffect::AvailableEffects() { | |||
| std::vector<EffectInfo*> v; // will be filled in callback function _foundLadspaDll() | |||
| + return v; | |||
| char* pcLadspaPath = getenv("LADSPA_PATH"); | |||
| String ladspaDir = pcLadspaPath ? pcLadspaPath : defaultLadspaDir(); | |||
| @@ -10,7 +10,7 @@ Features | |||
| --------- | |||
| * LADSPA, DSSI, LV2 and VST plugin formats | |||
| * GIG, SF2 and SFZ sound banks | |||
| * SF2/3 and SFZ sound banks | |||
| * Internal audio and midi file player | |||
| * Automation of plugin parameters via MIDI CC | |||
| * Remote control over OSC | |||
| @@ -31,12 +31,10 @@ cleanup_pkgs() | |||
| rm -rf flac-* | |||
| rm -rf fluidsynth-* | |||
| rm -rf glib-* | |||
| rm -rf libgig-* | |||
| rm -rf liblo-* | |||
| rm -rf libogg-* | |||
| rm -rf libsndfile-* | |||
| rm -rf libvorbis-* | |||
| rm -rf linuxsampler-* | |||
| rm -rf pkg-config-* | |||
| rm -rf zlib-* | |||
| @@ -245,61 +243,6 @@ if [ ! -f libsndfile-${LIBSNDFILE_VERSION}/build-done ]; then | |||
| cd .. | |||
| fi | |||
| # --------------------------------------------------------------------------------------------------------------------- | |||
| # libgig | |||
| if [ ! -d libgig-${LIBGIG_VERSION} ]; then | |||
| wget -c http://download.linuxsampler.org/packages/libgig-${LIBGIG_VERSION}.tar.bz2 | |||
| tar -xf libgig-${LIBGIG_VERSION}.tar.bz2 | |||
| fi | |||
| if [ ! -f libgig-${LIBGIG_VERSION}/build-done ]; then | |||
| cd libgig-${LIBGIG_VERSION} | |||
| if [ ! -f patched ]; then | |||
| patch -p1 -i ../patches/libgig_fix-build.patch | |||
| touch patched | |||
| fi | |||
| ./configure --enable-static --disable-shared --prefix=${PREFIX} \ | |||
| --target=${MINGW_PREFIX} --host=${MINGW_PREFIX} --build=${HOST_ARCH} | |||
| make ${MAKE_ARGS} | |||
| make install | |||
| touch build-done | |||
| cd .. | |||
| fi | |||
| # --------------------------------------------------------------------------------------------------------------------- | |||
| # linuxsampler | |||
| if [ ! -d linuxsampler-${LINUXSAMPLER_VERSION} ]; then | |||
| wget -c http://download.linuxsampler.org/packages/linuxsampler-${LINUXSAMPLER_VERSION}.tar.bz2 | |||
| tar -xf linuxsampler-${LINUXSAMPLER_VERSION}.tar.bz2 | |||
| fi | |||
| if [ ! -f linuxsampler-${LINUXSAMPLER_VERSION}/build-done ]; then | |||
| cd linuxsampler-${LINUXSAMPLER_VERSION} | |||
| if [ ! -f patched ]; then | |||
| patch -p1 -i ../patches/linuxsampler_allow-no-drivers-build.patch | |||
| patch -p1 -i ../patches/linuxsampler_disable-ladspa-fx.patch | |||
| sed -i -e "s|HAVE_LV2|HAVE_AU|" src/hostplugins/Makefile.am | |||
| touch patched | |||
| fi | |||
| rm -f configure | |||
| make -f Makefile.svn configure | |||
| ./configure \ | |||
| --enable-static --disable-shared --prefix=${PREFIX} \ | |||
| --target=${MINGW_PREFIX} --host=${MINGW_PREFIX} --build=${HOST_ARCH} \ | |||
| --enable-signed-triang-algo=diharmonic --enable-unsigned-triang-algo=diharmonic --enable-subfragment-size=8 \ | |||
| --disable-alsa-driver --disable-arts-driver --disable-jack-driver \ | |||
| --disable-asio-driver --disable-midishare-driver --disable-mmemidi-driver \ | |||
| --disable-coreaudio-driver --disable-coremidi-driver \ | |||
| --disable-instruments-db --disable-sf2-engine | |||
| make ${MAKE_ARGS} | |||
| make install | |||
| sed -i -e "s|-llinuxsampler|-llinuxsampler -L${PREFIX}/lib/libgig -lgig -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lm -lrpcrt4|" ${PREFIX}/lib/pkgconfig/linuxsampler.pc | |||
| touch build-done | |||
| cd .. | |||
| fi | |||
| # ------------------------------------------------------------------------------------ | |||
| # glib | |||
| @@ -8,8 +8,6 @@ LIBOGG_VERSION=1.3.3 | |||
| LIBVORBIS_VERSION=1.3.5 | |||
| FLAC_VERSION=1.3.2 | |||
| LIBSNDFILE_VERSION=1.0.28 | |||
| LIBGIG_VERSION=4.0.0 | |||
| LINUXSAMPLER_VERSION=2.0.0 | |||
| LIBFFI_VERSION=3.2.1 | |||
| GETTEXT_VERSION=0.18.3.2 | |||
| GLIB_VERSION=2.22.5 | |||
| @@ -1,29 +0,0 @@ | |||
| diff --git a/src/DLS.h b/src/DLS.h | |||
| index 065bfe6..6c9d76c 100644 | |||
| --- a/src/DLS.h | |||
| +++ b/src/DLS.h | |||
| @@ -515,10 +515,10 @@ namespace DLS { | |||
| virtual void Save(const String& Path, progress_t* pProgress = NULL); | |||
| virtual void Save(progress_t* pProgress = NULL); | |||
| virtual ~File(); | |||
| - protected: | |||
| typedef std::list<Sample*> SampleList; | |||
| typedef std::list<Instrument*> InstrumentList; | |||
| + protected: | |||
| RIFF::File* pRIFF; | |||
| std::list<RIFF::File*> ExtensionFiles; | |||
| SampleList* pSamples; | |||
| diff --git a/src/gig.cpp b/src/gig.cpp | |||
| index 6a24f16..902e1ae 100644 | |||
| --- a/src/gig.cpp | |||
| +++ b/src/gig.cpp | |||
| @@ -4181,7 +4181,7 @@ namespace { | |||
| * @param pGroup - script's new group | |||
| */ | |||
| void Script::SetGroup(ScriptGroup* pGroup) { | |||
| - if (this->pGroup = pGroup) return; | |||
| + if (this->pGroup == pGroup) return; | |||
| if (pChunk) | |||
| pChunk->GetParent()->MoveSubChunk(pChunk, pGroup->pList); | |||
| this->pGroup = pGroup; | |||
| @@ -1,24 +0,0 @@ | |||
| --- linuxsampler-static-1.0.0+svn2356.orig/configure.ac | |||
| +++ linuxsampler-static-1.0.0+svn2356/configure.ac | |||
| @@ -556,21 +556,6 @@ if test "x$MAC_PLUGIN_INSTALL_DIR" = "x" | |||
| fi | |||
| AC_SUBST(MAC_PLUGIN_INSTALL_DIR) | |||
| -# have we found at least one MIDI input and one audio output driver ? | |||
| -if test "$have_midi_input_driver" = "false"; then | |||
| - echo "No supported MIDI input system found!" | |||
| - echo "Sorry, LinuxSampler only supports the following MIDI drivers at the moment:" | |||
| - echo "ALSA, JACK, MIDIShare, CoreMIDI, MME." | |||
| - echo "If you think you have one of those available on your system, make sure you" | |||
| - echo "also have the respective development (header) files installed." | |||
| - exit -1; | |||
| -fi | |||
| -if test "$have_audio_output_driver" = "false"; then | |||
| - echo "No supported audio output system found!" | |||
| - echo "Sorry, LinuxSampler only supports ALSA, JACK, ARTS and ASIO as audio output" | |||
| - echo "driver at the moment!" | |||
| - exit -1; | |||
| -fi | |||
| @@ -1,10 +0,0 @@ | |||
| --- linuxsampler-static-1.0.0+svn2497.orig/src/effects/LadspaEffect.cpp | |||
| +++ linuxsampler-static-1.0.0+svn2497/src/effects/LadspaEffect.cpp | |||
| @@ -374,6 +374,7 @@ static String defaultLadspaDir() { | |||
| std::vector<EffectInfo*> LadspaEffect::AvailableEffects() { | |||
| std::vector<EffectInfo*> v; // will be filled in callback function _foundLadspaDll() | |||
| + return v; | |||
| char* pcLadspaPath = getenv("LADSPA_PATH"); | |||
| String ladspaDir = pcLadspaPath ? pcLadspaPath : defaultLadspaDir(); | |||
| @@ -24,7 +24,6 @@ DEFINES += HAVE_ZYN_UI_DEPS | |||
| PKGCONFIG += liblo | |||
| PKGCONFIG += fftw3 | |||
| PKGCONFIG += fluidsynth | |||
| PKGCONFIG += linuxsampler | |||
| PKGCONFIG += mxml | |||
| PKGCONFIG += zlib | |||
| @@ -215,7 +215,7 @@ Engine: Engine.cpp | |||
| ../backend/carla_engine.a ../backend/carla_plugin.a $(MODULEDIR)/native-plugins.a \ | |||
| $(MODULEDIR)/dgl.a $(MODULEDIR)/jackbridge.a $(MODULEDIR)/lilv.a $(MODULEDIR)/rtmempool.a \ | |||
| -Wl,--end-group \ | |||
| $(PEDANTIC_CXX_FLAGS) $(shell pkg-config --libs alsa libpulse-simple liblo QtCore QtXml fluidsynth linuxsampler x11 gl smf fftw3 mxml zlib ntk_images ntk) -o $@ | |||
| $(PEDANTIC_CXX_FLAGS) $(shell pkg-config --libs alsa libpulse-simple liblo QtCore QtXml fluidsynth x11 gl smf fftw3 mxml zlib ntk_images ntk) -o $@ | |||
| env LD_LIBRARY_PATH=../backend valgrind --leak-check=full ./$@ | |||
| # $(MODULEDIR)/juce_audio_basics.a $(MODULEDIR)/juce_core.a \ | |||