aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-08-26 08:27:07 +0200
committerMax Kellermann <max@duempel.org>2008-08-26 08:27:07 +0200
commit67bf4b448dad25f2f0c60451f53fcacb0a0bde15 (patch)
tree374ce955b4a26cc927f82d8ab5a5f92b11288f20
parentc60209ff04e51a1ea95b489d411469712e776d3a (diff)
downloadmpd-67bf4b448dad25f2f0c60451f53fcacb0a0bde15.tar.gz
mpd-67bf4b448dad25f2f0c60451f53fcacb0a0bde15.tar.xz
mpd-67bf4b448dad25f2f0c60451f53fcacb0a0bde15.zip
added decoder_get_url()
The wavpack decoder plugin implements a hack, and it needs the song URL for that. This API (and the hack) should be revised later, but add that function for now.
Diffstat (limited to '')
-rw-r--r--src/decoder_api.c5
-rw-r--r--src/decoder_api.h2
-rw-r--r--src/inputPlugins/wavpack_plugin.c2
3 files changed, 8 insertions, 1 deletions
diff --git a/src/decoder_api.c b/src/decoder_api.c
index 5d5763b1f..2009733ad 100644
--- a/src/decoder_api.c
+++ b/src/decoder_api.c
@@ -45,6 +45,11 @@ void decoder_initialized(struct decoder * decoder,
notify_signal(&pc.notify);
}
+const char *decoder_get_url(mpd_unused struct decoder * decoder, char * buffer)
+{
+ return get_song_url(buffer, dc.current_song);
+}
+
enum decoder_command decoder_get_command(mpd_unused struct decoder * decoder)
{
return dc.command;
diff --git a/src/decoder_api.h b/src/decoder_api.h
index 3781d79d2..c73066913 100644
--- a/src/decoder_api.h
+++ b/src/decoder_api.h
@@ -103,6 +103,8 @@ void decoder_initialized(struct decoder * decoder,
const AudioFormat * audio_format,
float total_time);
+const char *decoder_get_url(struct decoder * decoder, char * buffer);
+
enum decoder_command decoder_get_command(struct decoder * decoder);
/**
diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c
index 6816da83d..76cb03d30 100644
--- a/src/inputPlugins/wavpack_plugin.c
+++ b/src/inputPlugins/wavpack_plugin.c
@@ -456,7 +456,7 @@ static int wavpack_streamdecode(struct decoder * decoder, InputStream *is)
* As we use dc.utf8url, this function will be bad for
* single files. utf8url is not absolute file path :/
*/
- utf8url = get_song_url(tmp, dc.current_song);
+ utf8url = decoder_get_url(decoder, tmp);
if (utf8url == NULL) {
break;
}