Changeset 85 for libmpcdec/branches/zorg/src

Timestamp:

11/03/06 00:10:26 (18 years ago)

Author:

zorg

Message:

Prefix symbols to prevent conflicts

Location:

libmpcdec/branches/zorg/src

Files:

• mpc_decoder.c (modified) (7 diffs)
• mpc_reader.c (modified) (3 diffs)

libmpcdec/branches/zorg/src/mpc_decoder.c

@@ -262 +262 @@
     case 0x07:
     case 0x17:
-        mpc_decoder_read_bitstream_sv7(d, FALSE);
+        mpc_decoder_read_bitstream_sv7(d, MPC_FALSE);
         break;
     default:
@@ -297 +297 @@
         // decode data and check for validity of frame
                 FrameBitCnt = mpc_decoder_bits_read(d);
-        mpc_decoder_read_bitstream_sv7(d, FALSE);
+        mpc_decoder_read_bitstream_sv7(d, MPC_FALSE);
                 d->FrameWasValid = mpc_decoder_bits_read(d) - FrameBitCnt == FwdJumpInfo;
         break;
@@ -315 +315 @@
                 }
                 FrameBitCnt = mpc_decoder_bits_read(d);
-                mpc_decoder_read_bitstream_sv7(d, FALSE);
+                mpc_decoder_read_bitstream_sv7(d, MPC_FALSE);
                 d->BlockBits -= mpc_decoder_bits_read(d) - FrameBitCnt;
                 d->FrameWasValid = 1;
@@ -347 +347 @@
             } else {
                 mpc_decoder_bitstream_read(d, 20);
-                mpc_decoder_read_bitstream_sv7(d, FALSE);
+                mpc_decoder_read_bitstream_sv7(d, MPC_FALSE);
                 mpc_decoder_requantisierung(d, d->Max_Band);
             }
@@ -729 +729 @@
     }
 
-    if (seeking == TRUE)
+    if (seeking == MPC_TRUE)
         return;
 
@@ -1002 +1002 @@
         if (fwd <= d->DecodedFrames + d->seeking_window) {
             if (d->StreamVersion >= 7)
-                mpc_decoder_read_bitstream_sv7(d, TRUE);
+                mpc_decoder_read_bitstream_sv7(d, MPC_TRUE);
             else
-                return FALSE;
+                return MPC_FALSE;
         }
         mpc_decoder_bitstream_jump(d, FwdJumpInfo - mpc_decoder_bits_read(d));
@@ -1012 +1012 @@
     }
 
-    return TRUE;
-}
+    return MPC_TRUE;
+}

libmpcdec/branches/zorg/src/mpc_reader.c

@@ -59 +59 @@
 {
     mpc_reader_stdio *p_stdio = (mpc_reader_stdio*) p_reader->data;
-    if(p_stdio->magic != STDIO_MAGIC) return FALSE;
-    return p_stdio->is_seekable ? fseek(p_stdio->p_file, offset, SEEK_SET) == 0 : FALSE;
+    if(p_stdio->magic != STDIO_MAGIC) return MPC_FALSE;
+    return p_stdio->is_seekable ? fseek(p_stdio->p_file, offset, SEEK_SET) == 0 : MPC_FALSE;
 }
 
@@ -83 +83 @@
 {
     mpc_reader_stdio *p_stdio = (mpc_reader_stdio*) p_reader->data;
-    if(p_stdio->magic != STDIO_MAGIC) return FALSE;
+    if(p_stdio->magic != STDIO_MAGIC) return MPC_FALSE;
     return p_stdio->is_seekable;
 }
@@ -101 +101 @@
     p_stdio->p_file = fopen(filename, "rb");
     if(!p_stdio->p_file) goto clean;
-    p_stdio->is_seekable = TRUE;
+    p_stdio->is_seekable = MPC_TRUE;
     err = fseek(p_stdio->p_file, 0, SEEK_END);
     if(err < 0) goto clean;