Changeset 68 for libmpcdec/branches/zorg/include/mpcdec/reader.h

Timestamp:

10/06/06 17:14:05 (18 years ago)

Author:

zorg

Message:

Separated public interface from private headers
Use opaque objects whenever possible
Some (useless?) cosmetics on libmpcdec
Remove sv5-6 outdated support
Added libwavformat for upcoming mpcdec
New layout
Work in progress...

File:

• libmpcdec/branches/zorg/include/mpcdec/reader.h (modified) (2 diffs)

libmpcdec/branches/zorg/include/mpcdec/reader.h

@@ -32 +32 @@
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+/// \file reader.h
+#ifndef _MPCDEC_READER_H_
+#define _MPCDEC_READER_H_
+#ifdef WIN32
+#pragma once
+#endif
 
-/// \file reader.h
+#include "mpc_types.h"
 
-#ifndef _mpcdec_reader_h_
-#define _mpcdec_reader_h_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 /// \brief Stream reader interface structure.
@@ -43 +51 @@
 /// to feed it with raw data.  Implement the five member functions to provide
 /// a functional reader.
-typedef struct mpc_reader_t {
+typedef struct mpc_reader_t mpc_reader;
+struct mpc_reader_t {
     /// Reads size bytes of data into buffer at ptr.
-        mpc_int32_t (*read)(void *t, void *ptr, mpc_int32_t size);
+        mpc_int32_t (*read)(mpc_reader *p_reader, void *ptr, mpc_int32_t size);
 
     /// Seeks to byte position offset.
-        mpc_bool_t (*seek)(void *t, mpc_int32_t offset);
+        mpc_bool_t (*seek)(mpc_reader *p_reader, mpc_int32_t offset);
 
     /// Returns the current byte offset in the stream.
-        mpc_int32_t (*tell)(void *t);
+        mpc_int32_t (*tell)(mpc_reader *p_reader);
 
     /// Returns the total length of the source stream, in bytes.
-        mpc_int32_t (*get_size)(void *t);
+        mpc_int32_t (*get_size)(mpc_reader *p_reader);
 
     /// True if the stream is a seekable stream.
-        mpc_bool_t (*canseek)(void *t);
+        mpc_bool_t (*canseek)(mpc_reader *p_reader);
 
     /// Field that can be used to identify a particular instance of
     /// reader or carry along data associated with that reader.
     void *data;
-
-} mpc_reader;
-
-typedef struct mpc_reader_file_t {
-        mpc_reader reader;
-
-    FILE *file;
-    long file_size;
-    mpc_bool_t is_seekable;
-} mpc_reader_file;
+};
 
 /// Initializes reader with default stdio file reader implementation.  Use
 /// this if you're just reading from a plain file.
 ///
-/// \param r reader struct to initalize
-/// \param input input stream to attach to the reader
-void mpc_reader_setup_file_reader(mpc_reader_file *r, FILE *input);
+/// \param r p_reader handle to initialize
+/// \param filename input filename to attach to the reader
+mpc_status mpc_init_stdio_reader(mpc_reader *p_reader, char *filename);
 
-#endif // _mpcdec_reader_h_
+/// Release reader with default stdio file reader implementation.
+///
+/// \param r reader handle to release
+void mpc_exit_stdio_reader(mpc_reader *p_reader);
+
+#ifdef __cplusplus
+}
+#endif
+#endif