aboutsummaryrefslogtreecommitdiffstats
path: root/src/archive/bz2_archive_plugin.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/archive/bz2_archive_plugin.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/archive/bz2_archive_plugin.c b/src/archive/bz2_archive_plugin.c
index 2414eb519..303f22136 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"
@@ -113,7 +114,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 +173,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;