aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-08-15 00:35:56 +0200
committerMax Kellermann <max@duempel.org>2012-08-15 00:36:04 +0200
commitc8ec85d649e46df87d1b526fde2d8234428925c0 (patch)
tree7f5bf0884ff2a7e3677077bdf45db63dfdb00ce9
parente291f3d257360667e12754154acac9ba3fe3316a (diff)
downloadmpd-c8ec85d649e46df87d1b526fde2d8234428925c0.tar.gz
mpd-c8ec85d649e46df87d1b526fde2d8234428925c0.tar.xz
mpd-c8ec85d649e46df87d1b526fde2d8234428925c0.zip
decoder/fluidsynth: check if file is really a MIDI
Use fluid_is_midifile() to verify the file format.
-rw-r--r--NEWS1
-rw-r--r--src/decoder/fluidsynth_decoder_plugin.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 2cb2c04c9..0dfa92b60 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ ver 0.17.2 (2012/??/??)
- fix crash in local file check
* decoder:
- fluidsynth: remove throttle (requires libfluidsynth 1.1)
+ - fluidsynth: check MIDI file format while scanning
* output:
- httpd: use monotonic clock, avoid hiccups after system clock adjustment
- httpd: fix throttling bug after resuming playback
diff --git a/src/decoder/fluidsynth_decoder_plugin.c b/src/decoder/fluidsynth_decoder_plugin.c
index 9e2511d3e..8cb524c98 100644
--- a/src/decoder/fluidsynth_decoder_plugin.c
+++ b/src/decoder/fluidsynth_decoder_plugin.c
@@ -208,10 +208,7 @@ fluidsynth_scan_file(const char *file,
G_GNUC_UNUSED const struct tag_handler *handler,
G_GNUC_UNUSED void *handler_ctx)
{
- /* to be implemented */
- (void)file;
-
- return true;
+ return fluid_is_midifile(file);
}
static const char *const fluidsynth_suffixes[] = {