Skip to content

Commit

Permalink
Disable fluidsynth audio backends if possible
Browse files Browse the repository at this point in the history
Closes LMMS#649
Partially reverts LMMS#3446
  • Loading branch information
tresf committed Apr 18, 2018
1 parent 07a23c4 commit 97f8f2f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 49 deletions.
8 changes: 1 addition & 7 deletions .travis/osx..install.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

PACKAGES="cmake pkgconfig fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk portaudio node fltk"
PACKAGES="cmake pkgconfig fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio node fltk"

if [ $QT5 ]; then
PACKAGES="$PACKAGES qt5"
Expand All @@ -10,10 +10,4 @@ fi

brew install $PACKAGES ccache

# Recompile fluid-synth without CoreAudio per issues #649
# Changes to fluid-synth.rb must be pushed to URL prior to use
url=$(git remote get-url origin)
branch=$(git symbolic-ref --short HEAD)
brew install --build-from-source $url/raw/$branch/cmake/apple/fluid-synth.rb

sudo npm install -g appdmg
42 changes: 0 additions & 42 deletions cmake/apple/fluid-synth.rb

This file was deleted.

6 changes: 6 additions & 0 deletions plugins/sf2_player/sf2_player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@ sf2Instrument::sf2Instrument( InstrumentTrack * _instrument_track ) :
m_notesRunning[i] = 0;
}


#if FLUIDSYNTH_VERSION_MAJOR >= 1 && FLUIDSYNTH_VERSION_MINOR >= 1 && FLUIDSYNTH_VERSION_MICRO >= 9
// Deactivate all audio drivers in fluidsynth
const char *none[] = { NULL };
fluid_audio_driver_register( none );
#endif
m_settings = new_fluid_settings();

//fluid_settings_setint( m_settings, (char *) "audio.period-size", engine::mixer()->framesPerPeriod() );
Expand Down

0 comments on commit 97f8f2f

Please sign in to comment.