aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/mpg123_decoder_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-02-11 19:12:02 +0100
committerMax Kellermann <max@duempel.org>2012-02-11 17:04:29 +0100
commit5d73215a8dad922c8e383f3837f3ec9e26503389 (patch)
tree8fc4b96d93a907054a05d3250f97bf4f68c6df85 /src/decoder/mpg123_decoder_plugin.c
parentb7356bc526dbbd6fa00d40caff2addec10ae7c7e (diff)
downloadmpd-5d73215a8dad922c8e383f3837f3ec9e26503389.tar.gz
mpd-5d73215a8dad922c8e383f3837f3ec9e26503389.tar.xz
mpd-5d73215a8dad922c8e383f3837f3ec9e26503389.zip
decoder_plugin: scan tags with callback table
Pass a callback table to scan_file() and scan_stream(), instead of returning a tag object.
Diffstat (limited to 'src/decoder/mpg123_decoder_plugin.c')
-rw-r--r--src/decoder/mpg123_decoder_plugin.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/decoder/mpg123_decoder_plugin.c b/src/decoder/mpg123_decoder_plugin.c
index 224f3db2a..657a9c889 100644
--- a/src/decoder/mpg123_decoder_plugin.c
+++ b/src/decoder/mpg123_decoder_plugin.c
@@ -20,6 +20,7 @@
#include "config.h" /* must be first for large file support */
#include "decoder_api.h"
#include "audio_check.h"
+#include "tag_handler.h"
#include <glib.h>
@@ -192,41 +193,40 @@ mpd_mpg123_file_decode(struct decoder *decoder, const char *path_fs)
mpg123_delete(handle);
}
-static struct tag *
-mpd_mpg123_tag_dup(const char *path_fs)
+static bool
+mpd_mpg123_scan_file(const char *path_fs,
+ const struct tag_handler *handler, void *handler_ctx)
{
struct audio_format audio_format;
mpg123_handle *handle;
int error;
off_t num_samples;
- struct tag *tag;
handle = mpg123_new(NULL, &error);
if (handle == NULL) {
g_warning("mpg123_new() failed: %s",
mpg123_plain_strerror(error));
- return NULL;
+ return false;
}
if (!mpd_mpg123_open(handle, path_fs, &audio_format)) {
mpg123_delete(handle);
- return NULL;
+ return false;
}
num_samples = mpg123_length(handle);
if (num_samples <= 0) {
mpg123_delete(handle);
- return NULL;
+ return false;
}
- tag = tag_new();
-
- tag->time = num_samples / audio_format.sample_rate;
-
/* ID3 tag support not yet implemented */
mpg123_delete(handle);
- return tag;
+
+ tag_handler_invoke_duration(handler, handler_ctx,
+ num_samples / audio_format.sample_rate);
+ return true;
}
static const char *const mpg123_suffixes[] = {
@@ -240,6 +240,6 @@ const struct decoder_plugin mpg123_decoder_plugin = {
.finish = mpd_mpg123_finish,
.file_decode = mpd_mpg123_file_decode,
/* streaming not yet implemented */
- .tag_dup = mpd_mpg123_tag_dup,
+ .scan_file = mpd_mpg123_scan_file,
.suffixes = mpg123_suffixes,
};