Changeset 68 for libmpcdec/branches/zorg/src/internal.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/src/internal.h (moved) (moved from libmpcdec/branches/zorg/include/mpcdec/internal.h) (2 diffs)

libmpcdec/branches/zorg/src/internal.h

@@ -32 +32 @@
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-
 /// \file internal.h
 /// Definitions and structures used only internally by the libmpcdec.
+#ifndef _MPCDEC_INTERNAL_H_
+#define _MPCDEC_INTERNAL_H_
+#ifdef WIN32
+#pragma once
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#ifndef _mpcdec_internal_h
-#define _mpcdec_internal_h
-
+#include <mpcdec/mpcdec.h>
 
 enum {
-    MPC_DECODER_SYNTH_DELAY = 481
+    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
 };
 
 /// Big/little endian 32 bit byte swapping routine.
-static __inline
+static mpc_inline
 mpc_uint32_t mpc_swap32(mpc_uint32_t val) {
-    return (((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) |
-            ((val & 0x0000ff00) <<  8) | ((val & 0x000000ff) << 24));
+    return (((val & 0xFF000000) >> 24) | ((val & 0x00FF0000) >> 8)
+          | ((val & 0x0000FF00) <<  8) | ((val & 0x000000FF) << 24));
 }
 
 /// Searches for a ID3v2-tag and reads the length (in bytes) of it.
-/// \param reader supplying raw stream data
+///
+/// \param p_reader supplying raw stream data
 /// \return size of tag, in bytes
-/// \return -1 on errors of any kind
-mpc_int32_t JumpID3v2(mpc_reader* fp);
+/// \return MPC_STATUS_FILE on errors of any kind
+mpc_int32_t mpc_skip_id3v2(mpc_reader* p_reader);
 
 /// helper functions used by multiple files
@@ -62 +70 @@
 void mpc_decoder_synthese_filter_float(mpc_decoder *d, MPC_SAMPLE_FORMAT* OutData);
 
-#endif // _mpcdec_internal_h
-
+#ifdef __cplusplus
+}
+#endif
+#endif