haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Audacious-plugins: Use system soundfont for MIDI playback

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-04-15 22:43:12 +10:00
parent 9dda10fee4
commit cd92f5238c
2 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media-plugins/audacious-plugins/audacious_plugins-3.10.1.recipe
View File

@@ -11,7 +11,7 @@ fetch lyrics for your music, to set an alarm in the morning, and more."
HOMEPAGE="https://audacious-media-player.org/"
COPYRIGHT="2010-2018 Błażej Szczygieł"
LICENSE="GNU GPL v3"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/audacious-media-player/audacious-plugins/archive/audacious-plugins-$portVersion.tar.gz"
CHECKSUM_SHA256="548fd3dd56da5e2f719844fb3dc5c53925a8f0fff21646fc8f88ff41880586e0"
SOURCE_DIR="audacious-plugins-audacious-plugins-$portVersion"
@@ -34,7 +34,7 @@ REQUIRES="
lib:libcurl$secondaryArchSuffix
lib:libfaad$secondaryArchSuffix
lib:libFLAC$secondaryArchSuffix
lib:libfluidsynth$secondaryArchSuffix
lib:libfluidsynth$secondaryArchSuffix >= 2
lib:libgio_2.0$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libglib_2.0$secondaryArchSuffix
@@ -72,7 +72,7 @@ BUILD_REQUIRES="
devel:libcurl$secondaryArchSuffix
devel:libfaad$secondaryArchSuffix
devel:libflac$secondaryArchSuffix
devel:libfluidsynth$secondaryArchSuffix
devel:libfluidsynth$secondaryArchSuffix >= 2
devel:libgl$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
@@ -102,6 +102,7 @@ BUILD_PREREQUIRES="
cmd:awk
cmd:find
cmd:gcc$secondaryArchSuffix
cmd:lrelease$secondaryArchSuffix >= 5
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:python2

53
media-plugins/audacious-plugins/patches/audacious_plugins-3.10.1.patchset
View File

@@ -1,4 +1,4 @@
From 53427322102071f8e1b9e60618b1a2fb1a546571 Mon Sep 17 00:00:00 2001
From 355096acdce158cb68126ccadf12a767736a9029 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 4 Jan 2019 16:58:00 +1000
Subject: Add Haiku support
@@ -598,5 +598,54 @@ index da5bdc1..17a46b1 100644
menu = audqt::menu_build (items);
tray->setContextMenu (menu);
--
2.19.1
2.21.0
From 42ee265e732dc1d50de476865a36cd8e2f85ec94 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 14 Apr 2019 17:58:31 +1000
Subject: Use system soundfont
diff --git a/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc b/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc
index 09d8c24..0d90608 100644
--- a/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc
+++ b/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc
@@ -32,6 +32,10 @@
#include "../i_configure.h"
#include "../i_midievent.h"
+#ifdef __HAIKU__
+#include <FindDirectory.h>
+#endif
+
typedef struct
{
fluid_settings_t * settings;
@@ -208,6 +212,23 @@ static void i_soundfont_load ()
{
String soundfont_file = aud_get_str ("amidiplug", "fsyn_soundfont_file");
+#ifdef __HAIKU__
+ char midiSettings[PATH_MAX] = "";
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, midiSettings, sizeof(midiSettings)) == B_OK) {
+ strcat(midiSettings, "/Media/midi_settings");
+ if( access( midiSettings, F_OK ) != -1 ) {
+ FILE *inFile = fopen(midiSettings, "rt");
+ if (inFile) {
+ char sf2file[PATH_MAX];
+ if (fscanf(inFile, "# Midi\n\tsoundfont \"%[^\"]\"", sf2file)) {
+ soundfont_file = String(sf2file);
+ }
+ fclose(inFile);
+ }
+ }
+ }
+#endif
+
if (soundfont_file[0])
{
Index<String> sffiles = str_list_to_index (soundfont_file, ";");
--
2.21.0