Changeset 3 for trunk/src/mpc_decoder.c

Timestamp:

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

Author:

zorg

Message:

Update to 1.2 (work in progress)

File:

• trunk/src/mpc_decoder.c (modified) (7 diffs)

trunk/src/mpc_decoder.c

@@ -36 +36 @@
 /// Core decoding routines and logic.
 
-#include "musepack/musepack.h"
-#include "musepack/internal.h"
-#include "musepack/requant.h"
-#include "musepack/huffman.h"
+#include <mpcdec/mpcdec.h>
+#include <mpcdec/internal.h>
+#include <mpcdec/requant.h>
+#include <mpcdec/huffman.h>
 
 //------------------------------------------------------------------------------
@@ -62 +62 @@
 void mpc_decoder_read_bitstream_sv7(mpc_decoder *d);
 void mpc_decoder_update_buffer(mpc_decoder *d, mpc_uint32_t RING);
-BOOL mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample);
+mpc_bool_t mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample);
 void mpc_decoder_requantisierung(mpc_decoder *d, const mpc_int32_t Last_Band);
 
@@ -73 +73 @@
 };
 
-static BOOL f_seek(mpc_decoder *d, mpc_int32_t offset) 
+static mpc_bool_t f_seek(mpc_decoder *d, mpc_int32_t offset) 
 { 
     return d->r->seek(d->r->data, offset); 
@@ -992 +992 @@
         case -1:
             for (k=0; k<36; k++ ) {
-                tmp  = random_int(d);
+                tmp  = mpc_random_int(d);
                 *L++ = ((tmp >> 24) & 0xFF) + ((tmp >> 16) & 0xFF) + ((tmp >>  8) & 0xFF) + ((tmp >>  0) & 0xFF) - 510;
             }
@@ -1052 +1052 @@
         case -1:
                 for (k=0; k<36; k++ ) {
-                    tmp  = random_int(d);
+                    tmp  = mpc_random_int(d);
                     *R++ = ((tmp >> 24) & 0xFF) + ((tmp >> 16) & 0xFF) + ((tmp >>  8) & 0xFF) + ((tmp >>  0) & 0xFF) - 510;
                 }
@@ -1192 +1192 @@
 }
 
-BOOL mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si) 
+mpc_bool_t mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si) 
 {
     mpc_decoder_set_streaminfo(d, si);
@@ -1265 +1265 @@
 }
 
-BOOL mpc_decoder_seek_seconds(mpc_decoder *d, double seconds) 
+mpc_bool_t mpc_decoder_seek_seconds(mpc_decoder *d, double seconds) 
 {
     return mpc_decoder_seek_sample(d, (mpc_int64_t)(seconds * (double)d->SampleRate + 0.5));
 }
 
-BOOL mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample) 
+mpc_bool_t mpc_decoder_seek_sample(mpc_decoder *d, mpc_int64_t destsample) 
 {
     mpc_uint32_t fpos;