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

libmpcdec/branches/zorg/src/math.h

@@ -32 +32 @@
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-
 /// \file math.h
 /// Libmpcdec internal math routines.  
+#ifndef _MPCDEC_MATH_H_
+#define _MPCDEC_MATH_H_
+#ifdef WIN32
+#pragma once
+#endif
 
-#ifndef _mpcdec_math_h_
-#define _mpcdec_math_h_
+#include <mpcdec/mpc_types.h>
 
-//#define MPC_FIXED_POINT
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define MPC_FIXED_POINT_SHIFT 16
 
+
 #ifdef MPC_FIXED_POINT
 
-
 #ifdef _WIN32_WCE
-
 #include <cmnintrin.h>
-
 #define MPC_HAVE_MULHIGH
-
 #endif
-
 
 #define MPC_FIXED_POINT_SCALE_SHIFT (MPC_FIXED_POINT_SHIFT + MPC_FIXED_POINT_FRACTPART)
 #define MPC_FIXED_POINT_SCALE (1 << (MPC_FIXED_POINT_SCALE_SHIFT - 1))
 
-
 //in fixedpoint mode, results in decode output buffer are in -MPC_FIXED_POINT_SCALE ... MPC_FIXED_POINT_SCALE range
 
 #define MPC_FIXED_POINT_FRACTPART 14
-typedef mpc_int32_t MPC_SAMPLE_FORMAT;
 
 typedef mpc_int64_t MPC_SAMPLE_FORMAT_MULTIPLY;
@@ -119 +118 @@
 //in floating-point mode, decoded samples are in -1...1 range
 
-typedef float MPC_SAMPLE_FORMAT;
-
 #define MAKE_MPC_SAMPLE(X) ((MPC_SAMPLE_FORMAT)(X))
 #define MAKE_MPC_SAMPLE_EX(X,Y) ((MPC_SAMPLE_FORMAT)(X))
@@ -141 +138 @@
 #endif
 
-#endif // _mpcdec_math_h_
-
+#ifdef __cplusplus
+}
+#endif
+#endif