6 files changed, 34 insertions, 14 deletions
diff --git a/src/archive/bz2_archive_plugin.c b/src/archive/bz2_archive_plugin.c
index 2414eb51..e2420048 100644
--- a/src/archive/bz2_archive_plugin.c
+++ b/src/archive/bz2_archive_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "archive/bz2_archive_plugin.h"
 #include "archive_api.h"
+#include "input_internal.h"
 #include "input_plugin.h"
 #include "refcount.h"
 
@@ -102,6 +103,11 @@ bz2_destroy(struct bz2_input_stream *data)
 
 /* archive open && listing routine */
 
+#if GCC_CHECK_VERSION(4, 2)
+/* workaround for a warning caused by G_STATIC_MUTEX_INIT */
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
 static struct archive_file *
 bz2_open(const char *pathname, GError **error_r)
 {
@@ -113,7 +119,11 @@ bz2_open(const char *pathname, GError **error_r)
 	refcount_init(&context->ref);
 
 	//open archive
-	context->istream = input_stream_open(pathname, error_r);
+	static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+	context->istream = input_stream_open(pathname,
+					     g_static_mutex_get_mutex(&mutex),
+					     NULL,
+					     error_r);
 	if (context->istream == NULL) {
 		g_free(context);
 		return NULL;
@@ -168,12 +178,15 @@ bz2_close(struct archive_file *file)
 /* single archive handling */
 
 static struct input_stream *
-bz2_open_stream(struct archive_file *file, const char *path, GError **error_r)
+bz2_open_stream(struct archive_file *file, const char *path,
+		GMutex *mutex, GCond *cond,
+		GError **error_r)
 {
 	struct bz2_archive_file *context = (struct bz2_archive_file *) file;
 	struct bz2_input_stream *bis = g_new(struct bz2_input_stream, 1);
 
-	input_stream_init(&bis->base, &bz2_inputplugin, path);
+	input_stream_init(&bis->base, &bz2_inputplugin, path,
+			  mutex, cond);
 
 	bis->archive = context;
 
diff --git a/src/archive/bz2_archive_plugin.h b/src/archive/bz2_archive_plugin.h
index 19904900..46c69a66 100644
--- a/src/archive/bz2_archive_plugin.h
+++ b/src/archive/bz2_archive_plugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/archive/iso9660_archive_plugin.c b/src/archive/iso9660_archive_plugin.c
index 142fa10e..bb6cb958 100644
--- a/src/archive/iso9660_archive_plugin.c
+++ b/src/archive/iso9660_archive_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "archive/iso9660_archive_plugin.h"
 #include "archive_api.h"
+#include "input_internal.h"
 #include "input_plugin.h"
 #include "refcount.h"
 
@@ -172,15 +173,17 @@ struct iso9660_input_stream {
 };
 
 static struct input_stream *
-iso9660_archive_open_stream(struct archive_file *file,
-		const char *pathname, GError **error_r)
+iso9660_archive_open_stream(struct archive_file *file, const char *pathname,
+			    GMutex *mutex, GCond *cond,
+			    GError **error_r)
 {
 	struct iso9660_archive_file *context =
 		(struct iso9660_archive_file *)file;
 	struct iso9660_input_stream *iis;
 
 	iis = g_new(struct iso9660_input_stream, 1);
-	input_stream_init(&iis->base, &iso9660_input_plugin, pathname);
+	input_stream_init(&iis->base, &iso9660_input_plugin, pathname,
+			  mutex, cond);
 
 	iis->archive = context;
 	iis->statbuf = iso9660_ifs_stat_translate(context->iso, pathname);
diff --git a/src/archive/iso9660_archive_plugin.h b/src/archive/iso9660_archive_plugin.h
index 2a3864ce..47dc6e47 100644
--- a/src/archive/iso9660_archive_plugin.h
+++ b/src/archive/iso9660_archive_plugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/archive/zzip_archive_plugin.c b/src/archive/zzip_archive_plugin.c
index 3c2b8031..ad96b5f8 100644
--- a/src/archive/zzip_archive_plugin.c
+++ b/src/archive/zzip_archive_plugin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,7 @@
 #include "archive/zzip_archive_plugin.h"
 #include "archive_api.h"
 #include "archive_api.h"
+#include "input_internal.h"
 #include "input_plugin.h"
 #include "refcount.h"
 
@@ -134,14 +135,17 @@ struct zzip_input_stream {
 
 static struct input_stream *
 zzip_archive_open_stream(struct archive_file *file,
-			 const char *pathname, GError **error_r)
+			 const char *pathname,
+			 GMutex *mutex, GCond *cond,
+			 GError **error_r)
 {
 	struct zzip_archive *context = (struct zzip_archive *) file;
 	struct zzip_input_stream *zis;
 	ZZIP_STAT z_stat;
 
 	zis = g_new(struct zzip_input_stream, 1);
-	input_stream_init(&zis->base, &zzip_input_plugin, pathname);
+	input_stream_init(&zis->base, &zzip_input_plugin, pathname,
+			  mutex, cond);
 
 	zis->archive = context;
 	zis->file = zzip_file_open(context->dir, pathname, 0);
diff --git a/src/archive/zzip_archive_plugin.h b/src/archive/zzip_archive_plugin.h
index 6d5037ee..2b2c01e5 100644
--- a/src/archive/zzip_archive_plugin.h
+++ b/src/archive/zzip_archive_plugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify