Changeset 3 for trunk/include

Timestamp:

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

Author:

zorg

Message:

Update to 1.2 (work in progress)

Location:

trunk/include

Files:

• Makefile.am (modified) (1 diff)
• config.h.in (modified) (2 diffs)
• mainpage.h (modified) (2 diffs)
• mpcdec (moved) (moved from trunk/include/musepack)
• mpcdec/config_types.h.in (modified) (1 diff)
• mpcdec/config_win32.h (added)
• mpcdec/decoder.h (modified) (1 diff)
• mpcdec/huffman.h (modified) (2 diffs)
• mpcdec/internal.h (modified) (3 diffs)
• mpcdec/math.h (modified) (2 diffs)
• mpcdec/reader.h (modified) (4 diffs)
• mpcdec/requant.h (modified) (2 diffs)
• mpcdec/streaminfo.h (modified) (2 diffs)

trunk/include/Makefile.am

@@ -4 +4 @@
 
 nobase_include_HEADERS = \
-        musepack/config_types.h \
-        musepack/decoder.h \
-        musepack/huffman.h \
-        musepack/math.h \
-        musepack/musepack.h \
-        musepack/reader.h \
-        musepack/requant.h \
-        musepack/streaminfo.h
+        mpcdec/config_types.h \
+        mpcdec/decoder.h \
+        mpcdec/huffman.h \
+        mpcdec/math.h \
+        mpcdec/mpcdec.h \
+        mpcdec/reader.h \
+        mpcdec/requant.h \
+        mpcdec/streaminfo.h

trunk/include/config.h.in

@@ -1 @@
-/* include/config.h.in.  Generated from configure.in by autoheader.  */
+/* include/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
@@ -92 +92 @@
 #undef const
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 #undef inline
+#endif
 
 /* Define to `long' if <sys/types.h> does not define. */

trunk/include/mainpage.h

@@ -1 +1 @@
 /**
-   \mainpage libmusepack documentation
+   \mainpage libmpcdec documentation
 
-   \section whats what is libmusepack
-   libmusepack is a library that decodes musepack compressed audio data.  Musepack
+   \section whats what is libmpcdec
+   libmpcdec is a library that decodes musepack compressed audio data.  Musepack
    is a free, high performance, high quality lossy audio compression codec.  For
    more information on musepack visit http://www.musepack.net.
 
-   \section using using libmusepack
+   \section using using libmpcdec
 
-   Using libmusepack is very straightforward.  There are typically four things you must
-   do to use libmusepack in your application.
+   Using libmpcdec is very straightforward.  There are typically four things you must
+   do to use libmpcdec in your application.
 
    \subsection step1 step 1: implement an mpc_reader to provide raw data to the decoder library
@@ -35 +35 @@
 
    For a simple example of all of these steps see the sample application distributed with
-   libmusepack in src/sample.cpp.
+   libmpcdec in src/sample.cpp.
 */

trunk/include/mpcdec/config_types.h.in

@@ -36 +36 @@
 #define __MUSEPACK_CONFIG_TYPES_H__
 
-typedef unsigned char BOOL;
+typedef unsigned char mpc_bool_t;
 #define TRUE  1
 #define FALSE 0
 
-/* these are filled in by configure */
 typedef @SIZE16@ mpc_int16_t;
 typedef @USIZE16@ mpc_uint16_t;

trunk/include/mpcdec/decoder.h

@@ -35 +35 @@
 /// \file decoder.h
 
-#ifndef _musepack_decoder_h_
-#define _musepack_decoder_h_
+#ifndef _mpcdec_decoder_h_
+#define _mpcdec_decoder_h_
 
-#include "musepack/huffman.h"
-#include "musepack/math.h"
-#include "musepack/musepack.h"
-#include "musepack/reader.h"
-#include "musepack/streaminfo.h"
+#include "huffman.h"
+#include "math.h"
+#include "mpcdec.h"
+#include "reader.h"
+#include "streaminfo.h"
 
 enum {

trunk/include/mpcdec/huffman.h

@@ -36 +36 @@
 /// Data structures and functions for huffman coding.
 
-#ifndef _musepack_huffman_h_
-#define _musepack_huffman_h_
+#ifndef _mpcdec_huffman_h_
+#define _mpcdec_huffman_h_
 
-#include "musepack/config_types.h"
-#include "musepack/decoder.h"
+#ifndef WIN32
+#include "mpcdec/config_types.h"
+#else
+#include "mpcdec/config_win32.h"
+#endif
+
+#include "decoder.h"
 
 struct mpc_decoder_t; // forward declare to break circular dependencies
@@ -73 +78 @@
 void mpc_decoder_init_huffman_sv7_tables(struct mpc_decoder_t *d);
 
-#endif // _musepack_huffman_h_
+#endif // _mpcdec_huffman_h_

trunk/include/mpcdec/internal.h

@@ -33 +33 @@
 */
 
-/// \file musepack_internal.h
-/// Definitions and structures used only internally by the libmusepack.
+/// \file internal.h
+/// Definitions and structures used only internally by the libmpcdec.
 
-#ifndef _musepack_internal_h
-#define _musepack_internal_h
+#ifndef _mpcdec_internal_h
+#define _mpcdec_internal_h
+
 
 enum {
@@ -44 +45 @@
 
 /// Big/little endian 32 bit byte swapping routine.
-static inline
+static __inline
 mpc_uint32_t swap32(mpc_uint32_t val) {
     const unsigned char* src = (const unsigned char*)&val;
@@ -59 +60 @@
 
 /// helper functions used by multiple files
-mpc_uint32_t random_int(mpc_decoder *d); // in synth_filter.c
+mpc_uint32_t mpc_random_int(mpc_decoder *d); // in synth_filter.c
 void mpc_decoder_initialisiere_quantisierungstabellen(mpc_decoder *d, double scale_factor);
 void mpc_decoder_synthese_filter_float(mpc_decoder *d, MPC_SAMPLE_FORMAT* OutData);
 
-#endif // _musepack_internal_h
+#endif // _mpcdec_internal_h
 

trunk/include/mpcdec/math.h

@@ -33 +33 @@
 */
 
-/// \file mpc_math.h
-/// Libmusepack internal math routines.  
+/// \file math.h
+/// Libmpcdec internal math routines.  
 
-#ifndef _musepack_math_h_
-#define _musepack_math_h_
+#ifndef _mpcdec_math_h_
+#define _mpcdec_math_h_
 
 //#define MPC_FIXED_POINT
@@ -141 +141 @@
 #endif
 
-#endif // _musepack_math_h_
+#endif // _mpcdec_math_h_
 

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_

trunk/include/mpcdec/requant.h

@@ -36 +36 @@
 /// Requantization function definitions.
 
-#ifndef _musepack_requant_h
-#define _musepack_requant_h_
+#ifndef _mpcdec_requant_h
+#define _mpcdec_requant_h_
 
-#include "musepack/musepack.h"
+#include "mpcdec.h"
 
 /* C O N S T A N T S */
@@ -49 +49 @@
 #define Dc      (__Dc + 1)
 
-#endif // _musepack_requant_h_
+#endif // _mpcdec_requant_h_

trunk/include/mpcdec/streaminfo.h

@@ -35 +35 @@
 /// \file streaminfo.h
 
-#ifndef _musepack_streaminfo_h_
-#define _musepack_streaminfo_h_
+#ifndef _mpcdec_streaminfo_h_
+#define _mpcdec_streaminfo_h_
 
 typedef mpc_int32_t mpc_streaminfo_off_t;
@@ -84 +84 @@
 } mpc_streaminfo;
 
-#endif // _musepack_streaminfo_h_
+#endif // _mpcdec_streaminfo_h_