oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/fluidsynth: add "soundfont" setting

Browse Source 
Replaces the old global "soundfont" which never worked.
This commit is contained in:
Max Kellermann 2012-08-15 00:51:45 +02:00
parent 9c83464b95
commit 02325d2ede
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
doc/user.xml
View File

@ -818,6 +818,37 @@ systemctl start mpd.socket</programlisting>
</section> </section>
<section>
<title><varname>fluidsynth</varname></title>
<para>
MIDI decoder based on libfluidsynth.
</para>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>Setting</entry>
<entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry>
<varname>soundfont</varname>
</entry>
<entry>
The absolute path of the soundfont file. Defaults
to
<filename>/usr/share/sounds/sf2/FluidR3_GM.sf2</filename>.
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</section>
<section> <section>
<title><varname>mikmod</varname></title> <title><varname>mikmod</varname></title>

13
src/decoder/fluidsynth_decoder_plugin.c
View File

@ -28,6 +28,8 @@
#undef G_LOG_DOMAIN #undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "fluidsynth" #define G_LOG_DOMAIN "fluidsynth"
static const char *soundfont_path;
/** /**
* Convert a fluidsynth log level to a GLib log level. * Convert a fluidsynth log level to a GLib log level.
*/ */
@ -65,8 +67,12 @@ fluidsynth_mpd_log_function(int level, char *message, G_GNUC_UNUSED void *data)
} }
static bool static bool
fluidsynth_init(G_GNUC_UNUSED const struct config_param *param) fluidsynth_init(const struct config_param *param)
{ {
soundfont_path =
config_get_block_string(param, "soundfont",
"/usr/share/sounds/sf2/FluidR3_GM.sf2");
fluid_set_log_function(LAST_LOG_LEVEL, fluid_set_log_function(LAST_LOG_LEVEL,
fluidsynth_mpd_log_function, NULL); fluidsynth_mpd_log_function, NULL);
@ -86,17 +92,12 @@ fluidsynth_file_decode(struct decoder *decoder, const char *path_fs)
char setting_verbose[] = "synth.verbose"; char setting_verbose[] = "synth.verbose";
char setting_yes[] = "yes"; char setting_yes[] = "yes";
*/ */
const char *soundfont_path;
fluid_settings_t *settings; fluid_settings_t *settings;
fluid_synth_t *synth; fluid_synth_t *synth;
fluid_player_t *player; fluid_player_t *player;
int ret; int ret;
enum decoder_command cmd; enum decoder_command cmd;
soundfont_path =
config_get_string("soundfont",
"/usr/share/sounds/sf2/FluidR3_GM.sf2");
/* set up fluid settings */ /* set up fluid settings */
settings = new_fluid_settings(); settings = new_fluid_settings();