Changeset 3 for trunk/include/mpcdec/reader.h

Timestamp:

08/12/06 16:21:35 (18 years ago)

Author:

zorg

Message:

Update to 1.2 (work in progress)

Location:

trunk/include/mpcdec

Files:

• . (moved) (moved from trunk/include/musepack)
• reader.h (modified) (4 diffs)

trunk/include/mpcdec/reader.h

@@ -35 +35 @@
 /// \file reader.h
 
-#ifndef _musepack_reader_h_
-#define _musepack_reader_h_
+#ifndef _mpcdec_reader_h_
+#define _mpcdec_reader_h_
 
 /// \brief Stream reader interface structure.
@@ -48 +48 @@
 
     /// Seeks to byte position offset.
-        BOOL (*seek)(void *t, mpc_int32_t offset);
+        mpc_bool_t (*seek)(void *t, mpc_int32_t offset);
 
     /// Returns the current byte offset in the stream.
@@ -57 +57 @@
 
     /// True if the stream is a seekable stream.
-        BOOL (*canseek)(void *t);
+        mpc_bool_t (*canseek)(void *t);
 
-    /// Optional field that can be used to identify a particular instance of
+    /// Field that can be used to identify a particular instance of
     /// reader or carry along data associated with that reader.
     void *data;
 
-    // These are used by provided internal standard file-based reader implementation.
-    // You shouldn't touch them.  They're included in the main struct to avoid
-    // malloc/free.
+} mpc_reader;
+
+typedef struct mpc_reader_file_t {
+        mpc_reader reader;
+
     FILE *file;
     long file_size;
-    BOOL is_seekable;
-} mpc_reader;
+    mpc_bool_t is_seekable;
+} mpc_reader_file;
 
 /// Initializes reader with default stdio file reader implementation.  Use
@@ -76 +78 @@
 /// \param r reader struct to initalize
 /// \param input input stream to attach to the reader
-void mpc_reader_setup_file_reader(mpc_reader *r, FILE *input);
+void mpc_reader_setup_file_reader(mpc_reader_file *r, FILE *input);
 
-#endif // _musepack_reader_h_
+#endif // _mpcdec_reader_h_