From 6f3d70b5e24cebbd6fd8c3a665a801628ef912ff Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 27 Jan 2013 17:20:50 +0100 Subject: DecoderControl, InputStream: use Mutex/Cond instead of GMutex/GCond --- src/input_stream.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/input_stream.h') diff --git a/src/input_stream.h b/src/input_stream.h index 0d32c0742..24dda1eee 100644 --- a/src/input_stream.h +++ b/src/input_stream.h @@ -33,7 +33,9 @@ struct input_stream; #ifdef __cplusplus extern "C" { -#endif + +#include "thread/Mutex.hxx" +#include "thread/Cond.hxx" /** * Opens a new input stream. You may not access it until the "ready" @@ -46,13 +48,15 @@ extern "C" { * notifications * @return an #input_stream object on success, NULL on error */ -gcc_nonnull(1, 2) +gcc_nonnull(1) G_GNUC_MALLOC struct input_stream * input_stream_open(const char *uri, - GMutex *mutex, GCond *cond, + Mutex &mutex, Cond &cond, GError **error_r); +#endif + /** * Close the input stream and free resources. * -- cgit v1.2.3