aboutsummaryrefslogtreecommitdiffstats
path: root/src/input_stream.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-12-27 13:34:51 +0100
committerMax Kellermann <max@duempel.org>2008-12-27 13:34:51 +0100
commit9220e0edfff2428fbbcec60460c5841cbd40eadd (patch)
treecc997a53da08b83db7add4a0813d8b2ab80cf8ad /src/input_stream.h
parent0e7c67067b11e2db06bfc6a05798559a7e44a25f (diff)
parent4674d0442a4edc8647c060fbff2dd5e7ae9e3f84 (diff)
downloadmpd-9220e0edfff2428fbbcec60460c5841cbd40eadd.tar.gz
mpd-9220e0edfff2428fbbcec60460c5841cbd40eadd.tar.xz
mpd-9220e0edfff2428fbbcec60460c5841cbd40eadd.zip
Merge branch 'experimental' of git://git.musicpd.org/metyl/mpd
Conflicts: configure.ac src/ls.h src/output/shout_plugin.c
Diffstat (limited to 'src/input_stream.h')
-rw-r--r--src/input_stream.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/input_stream.h b/src/input_stream.h
index c8d8068d3..7ed0039a3 100644
--- a/src/input_stream.h
+++ b/src/input_stream.h
@@ -48,6 +48,8 @@ struct input_stream {
void *data;
char *meta_name;
char *meta_title;
+
+ void *archive;
};
void input_stream_global_init(void);