From 93deb844996120b6326345d6d87e803142dd1968 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 23 Oct 2013 22:08:59 +0200 Subject: input_stream: rename struct to InputStream --- src/InputPlugin.hxx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/InputPlugin.hxx') diff --git a/src/InputPlugin.hxx b/src/InputPlugin.hxx index 1a867b118..00226d195 100644 --- a/src/InputPlugin.hxx +++ b/src/InputPlugin.hxx @@ -27,7 +27,7 @@ #include struct config_param; -struct input_stream; +struct InputStream; class Error; struct Tag; @@ -50,10 +50,10 @@ struct InputPlugin { */ void (*finish)(void); - struct input_stream *(*open)(const char *uri, - Mutex &mutex, Cond &cond, - Error &error); - void (*close)(struct input_stream *is); + InputStream *(*open)(const char *uri, + Mutex &mutex, Cond &cond, + Error &error); + void (*close)(InputStream *is); /** * Check for errors that may have occurred in the I/O thread. @@ -61,15 +61,15 @@ struct InputPlugin { * * @return false on error */ - bool (*check)(struct input_stream *is, Error &error); + bool (*check)(InputStream *is, Error &error); /** * Update the public attributes. Call before access. Can be * nullptr if the plugin always keeps its attributes up to date. */ - void (*update)(struct input_stream *is); + void (*update)(InputStream *is); - Tag *(*tag)(struct input_stream *is); + Tag *(*tag)(InputStream *is); /** * Returns true if the next read operation will not block: @@ -79,12 +79,12 @@ struct InputPlugin { * If this method is unimplemented, then it is assumed that * reading will never block. */ - bool (*available)(struct input_stream *is); + bool (*available)(InputStream *is); - size_t (*read)(struct input_stream *is, void *ptr, size_t size, + size_t (*read)(InputStream *is, void *ptr, size_t size, Error &error); - bool (*eof)(struct input_stream *is); - bool (*seek)(struct input_stream *is, offset_type offset, int whence, + bool (*eof)(InputStream *is); + bool (*seek)(InputStream *is, offset_type offset, int whence, Error &error); }; -- cgit v1.2.3