Changeset 264

Timestamp:

04/15/07 23:37:21 (18 years ago)

Author:

r2d

Message:

added a way to open a reader with an already open file (patch by DEATH)

Location:

libmpc/branches/r2d

Files:

• include/mpc/reader.h (modified) (2 diffs)
• libmpcdec/mpc_reader.c (modified) (3 diffs)

libmpc/branches/r2d/include/mpc/reader.h

@@ -40 +40 @@
 
 #include <mpc/mpc_types.h>
+#include <stdio.h>
 
 #ifdef __cplusplus
@@ -80 +81 @@
 mpc_status mpc_reader_init_stdio(mpc_reader *p_reader, const char *filename);
 
+/// Initializes reader with default stdio file reader implementation.  Use
+/// this if you prefer to open the file yourself.
+///
+/// \param r p_reader handle to initialize
+/// \param p_file input file handle (already open)
+mpc_status mpc_reader_init_stdio_stream(mpc_reader * p_reader, FILE * p_file);
+
 /// Release reader with default stdio file reader implementation.
 ///

libmpc/branches/r2d/libmpcdec/mpc_reader.c

@@ -88 +88 @@
 
 mpc_status
-mpc_reader_init_stdio(mpc_reader *p_reader, const char *filename)
+mpc_reader_init_stdio_stream(mpc_reader * p_reader, FILE * p_file)
 {
     mpc_reader tmp_reader; mpc_reader_stdio *p_stdio; int err;
@@ -99 +99 @@
 
     p_stdio->magic  = STDIO_MAGIC;
-    p_stdio->p_file = fopen(filename, "rb");
-    if(!p_stdio->p_file) goto clean;
+    p_stdio->p_file = p_file;
     p_stdio->is_seekable = MPC_TRUE;
     err = fseek(p_stdio->p_file, 0, SEEK_END);
@@ -126 +125 @@
 }
 
+mpc_status
+mpc_reader_init_stdio(mpc_reader *p_reader, const char *filename)
+{
+        FILE * stream = fopen(filename, "rb");
+        if (stream == NULL) return MPC_STATUS_FILE;
+        return mpc_reader_init_stdio_stream(p_reader,stream);
+}
+
 void
 mpc_reader_exit_stdio(mpc_reader *p_reader)