Changeset 162 for libmpc/branches/r2d/mppenc/mppenc.c

Timestamp:

12/19/06 02:08:32 (18 years ago)

Author:

zorg

Message:

Fix mpcdec compilation for latest libmpcdec
Fix and update cmake build system (static libs only currently)
Use mpc booleans in mppenc

File:

• libmpc/branches/r2d/mppenc/mppenc.c (modified) (5 diffs)

libmpc/branches/r2d/mppenc/mppenc.c

@@ -36 +36 @@
 int           APE_Version     = 2000;
 int           LowDelay        = 0;
-Bool_t        EnableTags      = FALSE;
-Bool_t        IsEndBeep       = FALSE;
+Bool_t        EnableTags      = MPC_FALSE;
+Bool_t        IsEndBeep       = MPC_FALSE;
 
 #define MODE_OVERWRITE          0
@@ -898 +898 @@
         }
         else if ( 0 == strcmp ( arg, "beep")  ) {
-            IsEndBeep = TRUE;
+            IsEndBeep = MPC_TRUE;
         }
         else if ( 0 == strcmp ( arg, "scale") ) {                                       // ScalingFactor
@@ -1043 +1043 @@
         }
         else if ( 0 == strcmp ( arg, "writetags") ) {
-            EnableTags = TRUE;
+            EnableTags = MPC_TRUE;
         }
         else if ( 0 == strcmp ( arg, "lowdelay") ) {
@@ -1633 +1633 @@
         writeStreamInfo ( &e, m.Max_Band, m.MS_Channelmode > 0, SamplesInWAVE,
                                            m.SampleFreq, Wave.Channels > 2 ? 2 : Wave.Channels);
-        writeBlock(&e, "SI", TRUE);
+        writeBlock(&e, "SI", MPC_TRUE);
         writeEncoderInfo(&e, m.MainQual, m.PNS > 0, MPPENC_MAJOR, MPPENC_MINOR,
                                           MPPENC_IMPLEMENT, MPPENC_BUILD);
-        writeBlock(&e, "EI", FALSE);
+        writeBlock(&e, "EI", MPC_FALSE);
         e.seek_ptr = ftell(e.outputFile);
         writeBits (&e, 0, 8);
         writeBits (&e, 0, 32); // jump 40 bits for seek table pointer
-        writeBlock(&e, "SP", FALSE); // reserve space for seek pointer
+        writeBlock(&e, "SP", MPC_FALSE); // reserve space for seek pointer
 
 
@@ -1745 +1745 @@
                 e.seek_pos++;
         }
-        writeBlock(&e, "AD", FALSE);
+        writeBlock(&e, "AD", MPC_FALSE);
         writeSeekTable(&e);
-        writeBlock(&e, "ST", FALSE); // write seek table block
-        writeBlock(&e, "SE", FALSE); // write end of stream block
+        writeBlock(&e, "ST", MPC_FALSE); // write seek table block
+        writeBlock(&e, "SE", MPC_FALSE); // write end of stream block
     ShowProgress (&m, SamplesInWAVE, SamplesInWAVE, e.outputBits );