Changeset 3 for trunk/src/sample.cpp

Timestamp:

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

Author:

zorg

Message:

Update to 1.2 (work in progress)

File:

• trunk/src/sample.cpp (modified) (7 diffs)

trunk/src/sample.cpp

@@ -37 +37 @@
 #include <time.h>
 
-#include "musepack/musepack.h"
+#include <mpcdec/mpcdec.h>
 
 /*
@@ -46 +46 @@
     FILE *file;
     long size;
-    BOOL seekable;
+    mpc_bool_t seekable;
 } reader_data;
 
@@ -59 +59 @@
 }
 
-BOOL
+mpc_bool_t
 seek_impl(void *data, mpc_int32_t offset)
 {
@@ -80 +80 @@
 }
 
-BOOL
+mpc_bool_t
 canseek_impl(void *data)
 {
@@ -133 +133 @@
 
         m_data_bytes_written = 0;
-    } BOOL WriteSamples(const MPC_SAMPLE_FORMAT * p_buffer, unsigned p_size) {
+    } mpc_bool_t WriteSamples(const MPC_SAMPLE_FORMAT * p_buffer, unsigned p_size) {
         unsigned n;
         int clip_min = -1 << (m_bps - 1),
@@ -172 +172 @@
   private:
 
-    BOOL Seek(unsigned p_offset) {
+    mpc_bool_t Seek(unsigned p_offset) {
         return !fseek(m_file, p_offset, SEEK_SET);
     }
 
-    BOOL WriteRaw(const void *p_buffer, unsigned p_bytes) {
+    mpc_bool_t WriteRaw(const void *p_buffer, unsigned p_bytes) {
         return fwrite(p_buffer, 1, p_bytes, m_file) == p_bytes;
     }
 
-    BOOL WriteDword(unsigned long p_val) {
+    mpc_bool_t WriteDword(unsigned long p_val) {
         return WriteInt(p_val, 32);
     }
-    BOOL WriteWord(unsigned short p_val) {
+    mpc_bool_t WriteWord(unsigned short p_val) {
         return WriteInt(p_val, 16);
     }
 
     // write a little-endian number properly
-    BOOL WriteInt(unsigned int p_val, unsigned p_width_bits) {
+    mpc_bool_t WriteInt(unsigned int p_val, unsigned p_width_bits) {
         unsigned char temp;
         unsigned shift = 0;
@@ -284 +284 @@
     begin = clock();
     unsigned total_samples = 0;
-    BOOL successful = FALSE;
+    mpc_bool_t successful = FALSE;
     for (;;) {
         unsigned status = mpc_decoder_decode(&decoder, sample_buffer, 0, 0);