Index: libmpcdec/branches/zorg/include/mpcdec/mpcdec.h
===================================================================
--- libmpcdec/branches/zorg/include/mpcdec/mpcdec.h	(revision 69)
+++ libmpcdec/branches/zorg/include/mpcdec/mpcdec.h	(revision 70)
@@ -46,18 +46,20 @@
 #endif
 
+enum {
+    MPC_FRAME_LENGTH          = (36 * 32),              ///< Samples per mpc frame
+    MPC_DECODER_BUFFER_LENGTH = (MPC_FRAME_LENGTH * 4), ///< Required buffer size for decoder
+    MPC_DECODER_SYNTH_DELAY   = 481
+};
+
 typedef struct mpc_decoder_t mpc_decoder;
 
-/// Sets up decoder library.
-/// Call this first when preparing to decode an mpc stream.
+/// Initializes mpc decoder with the supplied stream info parameters.
 /// \param p_reader reader that will supply raw data to the decoder
-void mpc_decoder_setup(mpc_decoder *p_dec, mpc_reader *p_reader);
-
-/// Initializes mpc decoder with the supplied stream info parameters.
 /// \param si streaminfo structure indicating format of source stream
 /// \return TRUE if decoder was initalized successfully, FALSE otherwise    
-mpc_status mpc_init_decoder(mpc_decoder **p_dec, mpc_streaminfo *si);
+mpc_status mpc_decoder_init(mpc_decoder **p_dec, mpc_reader *p_reader, mpc_streaminfo *si);
 
 /// Releases input mpc decoder 
-void mpc_exit_decoder(mpc_decoder *p_dec);
+void mpc_decoder_exit(mpc_decoder *p_dec);
 
 /// Call this next after calling mpc_decoder_setup.
Index: libmpcdec/branches/zorg/include/mpcdec/reader.h
===================================================================
--- libmpcdec/branches/zorg/include/mpcdec/reader.h	(revision 69)
+++ libmpcdec/branches/zorg/include/mpcdec/reader.h	(revision 70)
@@ -78,10 +78,10 @@
 /// \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);
+mpc_status mpc_reader_init_stdio(mpc_reader *p_reader, char *filename);
 
 /// Release reader with default stdio file reader implementation.
 ///
 /// \param r reader handle to release
-void mpc_exit_stdio_reader(mpc_reader *p_reader);
+void mpc_reader_exit_stdio(mpc_reader *p_reader);
 
 #ifdef __cplusplus
Index: libmpcdec/branches/zorg/include/mpcdec/streaminfo.h
===================================================================
--- libmpcdec/branches/zorg/include/mpcdec/streaminfo.h	(revision 69)
+++ libmpcdec/branches/zorg/include/mpcdec/streaminfo.h	(revision 70)
@@ -94,13 +94,9 @@
 } mpc_streaminfo;
 
-/// Initializes a streaminfo structure.
-/// \param si streaminfo structure to initialize
-void mpc_streaminfo_init(mpc_streaminfo *si);
-
 /// Reads streaminfo header from the mpc stream supplied by r.
 /// \param si si pointer to which info will be written
 /// \param p_reader stream reader to supply raw data
 /// \return error code
-mpc_status mpc_streaminfo_read(mpc_streaminfo *si, mpc_reader *p_reader);
+mpc_status mpc_streaminfo_init(mpc_streaminfo *si, mpc_reader *p_reader);
 
 /// Gets length of stream si, in seconds.