diff --git a/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj b/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj index 79a44a684..83d343074 100644 --- a/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj +++ b/Plugins/MIDI/MIDI.xcodeproj/project.pbxproj @@ -8,20 +8,17 @@ /* Begin PBXBuildFile section */ 8309220B2640D0B8005855C1 /* SFPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8309220A2640D0B8005855C1 /* SFPlayer.cpp */; }; - 8309220C2640D3CD005855C1 /* libFLAC.8.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830921FD2640CC16005855C1 /* libFLAC.8.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 8309220D2640D3CF005855C1 /* libfluidsynth.3.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830921FB2640CC16005855C1 /* libfluidsynth.3.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 8309220E2640D3D3005855C1 /* libglib-2.0.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830922022640CC16005855C1 /* libglib-2.0.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 8309220F2640D3D8005855C1 /* libgthread-2.0.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830921FF2640CC16005855C1 /* libgthread-2.0.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 830922102640D3E4005855C1 /* libintl.8.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830922042640CC16005855C1 /* libintl.8.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 830922112640D3E8005855C1 /* libogg.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830922062640CC16005855C1 /* libogg.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 830922122640D3EC005855C1 /* libopus.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830922052640CC16005855C1 /* libopus.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 830922132640D3F1005855C1 /* libpcre.1.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830922012640CC16005855C1 /* libpcre.1.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 830922142640D3F4005855C1 /* libportaudio.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830922032640CC16005855C1 /* libportaudio.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 830922152640D3F7005855C1 /* libreadline.8.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830921FE2640CC16005855C1 /* libreadline.8.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 830922162640D3FD005855C1 /* libsndfile.1.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830922002640CC16005855C1 /* libsndfile.1.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 830922172640D400005855C1 /* libvorbis.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830922072640CC16005855C1 /* libvorbis.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 830922182640D40D005855C1 /* libvorbisenc.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830921FC2640CC16005855C1 /* libvorbisenc.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 830922192640D45D005855C1 /* libfluidsynth.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 830921FB2640CC16005855C1 /* libfluidsynth.3.dylib */; }; + 833741F126463EE5004E43ED /* libiconv.2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 833741F026463ECF004E43ED /* libiconv.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 833741F226463EE8004E43ED /* libncurses.6.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 833741EF26463ECF004E43ED /* libncurses.6.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 833741F326463EEC004E43ED /* libSDL2-2.0.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 833741EE26463ECF004E43ED /* libSDL2-2.0.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 834BE91B1DE407CB00A07DCD /* resampler.c in Sources */ = {isa = PBXBuildFile; fileRef = 834BE9191DE407CB00A07DCD /* resampler.c */; }; 83686AAC1C5C69D400671C7A /* AUPlayerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83686AAB1C5C69D400671C7A /* AUPlayerView.mm */; }; 83686AB11C5C783000671C7A /* CoreAudioKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83686AB01C5C783000671C7A /* CoreAudioKit.framework */; }; @@ -78,19 +75,16 @@ dstPath = ""; dstSubfolderSpec = 6; files = ( - 8309220C2640D3CD005855C1 /* libFLAC.8.dylib in CopyFiles */, 8309220D2640D3CF005855C1 /* libfluidsynth.3.dylib in CopyFiles */, 8309220F2640D3D8005855C1 /* libgthread-2.0.0.dylib in CopyFiles */, 8309220E2640D3D3005855C1 /* libglib-2.0.0.dylib in CopyFiles */, + 833741F126463EE5004E43ED /* libiconv.2.dylib in CopyFiles */, 830922102640D3E4005855C1 /* libintl.8.dylib in CopyFiles */, - 830922112640D3E8005855C1 /* libogg.0.dylib in CopyFiles */, - 830922122640D3EC005855C1 /* libopus.0.dylib in CopyFiles */, + 833741F226463EE8004E43ED /* libncurses.6.dylib in CopyFiles */, 830922132640D3F1005855C1 /* libpcre.1.dylib in CopyFiles */, - 830922142640D3F4005855C1 /* libportaudio.2.dylib in CopyFiles */, 830922152640D3F7005855C1 /* libreadline.8.dylib in CopyFiles */, + 833741F326463EEC004E43ED /* libSDL2-2.0.0.dylib in CopyFiles */, 830922162640D3FD005855C1 /* libsndfile.1.dylib in CopyFiles */, - 830922172640D400005855C1 /* libvorbis.0.dylib in CopyFiles */, - 830922182640D40D005855C1 /* libvorbisenc.2.dylib in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -99,19 +93,16 @@ /* Begin PBXFileReference section */ 830921FA2640CBBD005855C1 /* SFPlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFPlayer.h; sourceTree = ""; }; 830921FB2640CC16005855C1 /* libfluidsynth.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfluidsynth.3.dylib; path = ../../ThirdParty/FluidSynth/libfluidsynth.3.dylib; sourceTree = ""; }; - 830921FC2640CC16005855C1 /* libvorbisenc.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisenc.2.dylib; path = ../../ThirdParty/FluidSynth/libvorbisenc.2.dylib; sourceTree = ""; }; - 830921FD2640CC16005855C1 /* libFLAC.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libFLAC.8.dylib; path = ../../ThirdParty/FluidSynth/libFLAC.8.dylib; sourceTree = ""; }; 830921FE2640CC16005855C1 /* libreadline.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libreadline.8.dylib; path = ../../ThirdParty/FluidSynth/libreadline.8.dylib; sourceTree = ""; }; 830921FF2640CC16005855C1 /* libgthread-2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libgthread-2.0.0.dylib"; path = "../../ThirdParty/FluidSynth/libgthread-2.0.0.dylib"; sourceTree = ""; }; 830922002640CC16005855C1 /* libsndfile.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsndfile.1.dylib; path = ../../ThirdParty/FluidSynth/libsndfile.1.dylib; sourceTree = ""; }; 830922012640CC16005855C1 /* libpcre.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpcre.1.dylib; path = ../../ThirdParty/FluidSynth/libpcre.1.dylib; sourceTree = ""; }; 830922022640CC16005855C1 /* libglib-2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libglib-2.0.0.dylib"; path = "../../ThirdParty/FluidSynth/libglib-2.0.0.dylib"; sourceTree = ""; }; - 830922032640CC16005855C1 /* libportaudio.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libportaudio.2.dylib; path = ../../ThirdParty/FluidSynth/libportaudio.2.dylib; sourceTree = ""; }; 830922042640CC16005855C1 /* libintl.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libintl.8.dylib; path = ../../ThirdParty/FluidSynth/libintl.8.dylib; sourceTree = ""; }; - 830922052640CC16005855C1 /* libopus.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopus.0.dylib; path = ../../ThirdParty/FluidSynth/libopus.0.dylib; sourceTree = ""; }; - 830922062640CC16005855C1 /* libogg.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libogg.0.dylib; path = ../../ThirdParty/FluidSynth/libogg.0.dylib; sourceTree = ""; }; - 830922072640CC16005855C1 /* libvorbis.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbis.0.dylib; path = ../../ThirdParty/FluidSynth/libvorbis.0.dylib; sourceTree = ""; }; 8309220A2640D0B8005855C1 /* SFPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SFPlayer.cpp; sourceTree = ""; }; + 833741EE26463ECF004E43ED /* libSDL2-2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2-2.0.0.dylib"; path = "../../ThirdParty/FluidSynth/libSDL2-2.0.0.dylib"; sourceTree = ""; }; + 833741EF26463ECF004E43ED /* libncurses.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.6.dylib; path = ../../ThirdParty/FluidSynth/libncurses.6.dylib; sourceTree = ""; }; + 833741F026463ECF004E43ED /* libiconv.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.2.dylib; path = ../../ThirdParty/FluidSynth/libiconv.2.dylib; sourceTree = ""; }; 833F68431CDBCABE00AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = ""; }; 834BE9191DE407CB00A07DCD /* resampler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = resampler.c; sourceTree = ""; }; 834BE91A1DE407CB00A07DCD /* resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resampler.h; sourceTree = ""; }; @@ -261,22 +252,19 @@ 83B0668C180D5668008E3612 /* Other Frameworks */ = { isa = PBXGroup; children = ( - 830921FD2640CC16005855C1 /* libFLAC.8.dylib */, + 83B0668F180D5668008E3612 /* AppKit.framework */, + 83B0668E180D5668008E3612 /* CoreData.framework */, + 83B0668D180D5668008E3612 /* Foundation.framework */, 830921FB2640CC16005855C1 /* libfluidsynth.3.dylib */, 830922022640CC16005855C1 /* libglib-2.0.0.dylib */, 830921FF2640CC16005855C1 /* libgthread-2.0.0.dylib */, + 833741F026463ECF004E43ED /* libiconv.2.dylib */, 830922042640CC16005855C1 /* libintl.8.dylib */, - 830922062640CC16005855C1 /* libogg.0.dylib */, - 830922052640CC16005855C1 /* libopus.0.dylib */, + 833741EF26463ECF004E43ED /* libncurses.6.dylib */, 830922012640CC16005855C1 /* libpcre.1.dylib */, - 830922032640CC16005855C1 /* libportaudio.2.dylib */, 830921FE2640CC16005855C1 /* libreadline.8.dylib */, + 833741EE26463ECF004E43ED /* libSDL2-2.0.0.dylib */, 830922002640CC16005855C1 /* libsndfile.1.dylib */, - 830922072640CC16005855C1 /* libvorbis.0.dylib */, - 830921FC2640CC16005855C1 /* libvorbisenc.2.dylib */, - 83B0668D180D5668008E3612 /* Foundation.framework */, - 83B0668E180D5668008E3612 /* CoreData.framework */, - 83B0668F180D5668008E3612 /* AppKit.framework */, ); name = "Other Frameworks"; sourceTree = ""; diff --git a/Plugins/MIDI/MIDI/SFPlayer.cpp b/Plugins/MIDI/MIDI/SFPlayer.cpp index 54e2b6da7..37b6b1768 100644 --- a/Plugins/MIDI/MIDI/SFPlayer.cpp +++ b/Plugins/MIDI/MIDI/SFPlayer.cpp @@ -171,7 +171,7 @@ bool SFPlayer::startup() size_t dot = sSoundFontName.find_last_of( '.' ); if ( dot != std::string::npos ) ext.assign( sSoundFontName.begin() + dot + 1, sSoundFontName.end() ); - if ( !strcasecmp( ext.c_str(), "sf2" ) || !strcasecmp( ext.c_str(), "sf3" ) ) + if ( !strcasecmp( ext.c_str(), "sf2" ) ) { for (unsigned i = 0; i < 3; ++i) { diff --git a/Preferences/Preferences/MIDIPane.m b/Preferences/Preferences/MIDIPane.m index d308fb1a0..2b85618bc 100644 --- a/Preferences/Preferences/MIDIPane.m +++ b/Preferences/Preferences/MIDIPane.m @@ -24,7 +24,7 @@ - (IBAction)setSoundFont:(id)sender { - NSArray *fileTypes = @[@"sf3", @"sf2", @"sflist"]; + NSArray *fileTypes = @[@"sf2", @"sflist"]; NSOpenPanel * panel = [NSOpenPanel openPanel]; [panel setAllowsMultipleSelection:NO]; [panel setCanChooseDirectories:NO]; diff --git a/ThirdParty/FluidSynth/README.txt b/ThirdParty/FluidSynth/README.txt index b08dd3063..2656cb6f4 100644 --- a/ThirdParty/FluidSynth/README.txt +++ b/ThirdParty/FluidSynth/README.txt @@ -1,16 +1,9 @@ -These binaries were carefully retrieved from Homebrew for both x86_64 -and arm64, their signatures were removed, then their id and import -paths were patched using install_name_tool. +These binaries were built +universal using MacPorts. The following versions are included as of this commit: -fluidsynth: HEAD-d0ec534 from unmerged PR -flac: 1.3.3 -glib: 2.68.1 -libogg: 1.3.4 -libvorbis: 1.3.7 -opus: 1.3.1 -pcre: 8.44 -readline: 8.1 -libsndfile: 1.0.31 -portaudio: HEAD-aa05346 +fluidsynth: 1525a6fc0b59acafd309a8de8bfc89e9c2f0cda8 +glib: 2.58.3_1 +pcre: 8.44_1 +readline: 8.1.000_0 +libsndfile: 1.0.28_1 diff --git a/ThirdParty/FluidSynth/include/fluidsynth/midi.h b/ThirdParty/FluidSynth/include/fluidsynth/midi.h index 721b1a62f..047dcfc7d 100644 --- a/ThirdParty/FluidSynth/include/fluidsynth/midi.h +++ b/ThirdParty/FluidSynth/include/fluidsynth/midi.h @@ -246,7 +246,7 @@ enum fluid_player_status { FLUID_PLAYER_READY, /**< Player is ready */ FLUID_PLAYER_PLAYING, /**< Player is currently playing */ - FLUID_PLAYER_STOPPING, /**< Player is stopping, but hasn't finished yet */ + FLUID_PLAYER_STOPPING, /**< Player is stopping, but hasn't finished yet (currently unused) */ FLUID_PLAYER_DONE /**< Player is finished playing */ }; diff --git a/ThirdParty/FluidSynth/libFLAC.8.dylib b/ThirdParty/FluidSynth/libFLAC.8.dylib deleted file mode 100644 index 42d1c294e..000000000 Binary files a/ThirdParty/FluidSynth/libFLAC.8.dylib and /dev/null differ diff --git a/ThirdParty/FluidSynth/libSDL2-2.0.0.dylib b/ThirdParty/FluidSynth/libSDL2-2.0.0.dylib new file mode 100755 index 000000000..7ca05e980 Binary files /dev/null and b/ThirdParty/FluidSynth/libSDL2-2.0.0.dylib differ diff --git a/ThirdParty/FluidSynth/libfluidsynth.3.dylib b/ThirdParty/FluidSynth/libfluidsynth.3.dylib old mode 100644 new mode 100755 index a45922fb0..72af7494e Binary files a/ThirdParty/FluidSynth/libfluidsynth.3.dylib and b/ThirdParty/FluidSynth/libfluidsynth.3.dylib differ diff --git a/ThirdParty/FluidSynth/libglib-2.0.0.dylib b/ThirdParty/FluidSynth/libglib-2.0.0.dylib old mode 100644 new mode 100755 index 0819c9cb5..52ebcf3c6 Binary files a/ThirdParty/FluidSynth/libglib-2.0.0.dylib and b/ThirdParty/FluidSynth/libglib-2.0.0.dylib differ diff --git a/ThirdParty/FluidSynth/libgthread-2.0.0.dylib b/ThirdParty/FluidSynth/libgthread-2.0.0.dylib old mode 100644 new mode 100755 index fd231afbf..4d8929b01 Binary files a/ThirdParty/FluidSynth/libgthread-2.0.0.dylib and b/ThirdParty/FluidSynth/libgthread-2.0.0.dylib differ diff --git a/ThirdParty/FluidSynth/libiconv.2.dylib b/ThirdParty/FluidSynth/libiconv.2.dylib new file mode 100755 index 000000000..9522de445 Binary files /dev/null and b/ThirdParty/FluidSynth/libiconv.2.dylib differ diff --git a/ThirdParty/FluidSynth/libintl.8.dylib b/ThirdParty/FluidSynth/libintl.8.dylib index 6087949be..29c04b8e1 100644 Binary files a/ThirdParty/FluidSynth/libintl.8.dylib and b/ThirdParty/FluidSynth/libintl.8.dylib differ diff --git a/ThirdParty/FluidSynth/libncurses.6.dylib b/ThirdParty/FluidSynth/libncurses.6.dylib new file mode 100755 index 000000000..fd6403f90 Binary files /dev/null and b/ThirdParty/FluidSynth/libncurses.6.dylib differ diff --git a/ThirdParty/FluidSynth/libogg.0.dylib b/ThirdParty/FluidSynth/libogg.0.dylib deleted file mode 100644 index 971e78e66..000000000 Binary files a/ThirdParty/FluidSynth/libogg.0.dylib and /dev/null differ diff --git a/ThirdParty/FluidSynth/libopus.0.dylib b/ThirdParty/FluidSynth/libopus.0.dylib deleted file mode 100644 index da3a16d1e..000000000 Binary files a/ThirdParty/FluidSynth/libopus.0.dylib and /dev/null differ diff --git a/ThirdParty/FluidSynth/libpcre.1.dylib b/ThirdParty/FluidSynth/libpcre.1.dylib old mode 100644 new mode 100755 index 5adaf512b..7335a6c8c Binary files a/ThirdParty/FluidSynth/libpcre.1.dylib and b/ThirdParty/FluidSynth/libpcre.1.dylib differ diff --git a/ThirdParty/FluidSynth/libportaudio.2.dylib b/ThirdParty/FluidSynth/libportaudio.2.dylib deleted file mode 100644 index 742903cd6..000000000 Binary files a/ThirdParty/FluidSynth/libportaudio.2.dylib and /dev/null differ diff --git a/ThirdParty/FluidSynth/libreadline.8.dylib b/ThirdParty/FluidSynth/libreadline.8.dylib old mode 100644 new mode 100755 index 7bce04a35..6bc286bfc Binary files a/ThirdParty/FluidSynth/libreadline.8.dylib and b/ThirdParty/FluidSynth/libreadline.8.dylib differ diff --git a/ThirdParty/FluidSynth/libsndfile.1.dylib b/ThirdParty/FluidSynth/libsndfile.1.dylib old mode 100644 new mode 100755 index 600dbd4cd..aecdda8cb Binary files a/ThirdParty/FluidSynth/libsndfile.1.dylib and b/ThirdParty/FluidSynth/libsndfile.1.dylib differ diff --git a/ThirdParty/FluidSynth/libvorbis.0.dylib b/ThirdParty/FluidSynth/libvorbis.0.dylib deleted file mode 100644 index a2c3bc718..000000000 Binary files a/ThirdParty/FluidSynth/libvorbis.0.dylib and /dev/null differ diff --git a/ThirdParty/FluidSynth/libvorbisenc.2.dylib b/ThirdParty/FluidSynth/libvorbisenc.2.dylib deleted file mode 100644 index 8b128201a..000000000 Binary files a/ThirdParty/FluidSynth/libvorbisenc.2.dylib and /dev/null differ