Changeset 195 for libmpc/branches/r2d/mpcenc/tags.c

Timestamp:

12/29/06 15:21:35 (17 years ago)

Author:

r2d

Message:

• moved libmpcdec includes in /mpc
• removed mppdec.h and mpp.h
• mpcenc defines cleanup

File:

• libmpc/branches/r2d/mpcenc/tags.c (modified) (8 diffs)

libmpc/branches/r2d/mpcenc/tags.c

@@ -60 +60 @@
 
 struct APETagFooterStruct {
-    Uint8_t   ID       [8];    // should equal 'APETAGEX'
-    Uint8_t   Version  [4];    // currently 1000 (version 1.000)
-    Uint8_t   Length   [4];    // the complete size of the tag, including this footer
-    Uint8_t   TagCount [4];    // the number of fields in the tag
-    Uint8_t   Flags    [4];    // the tag flags (none currently defined)
-    Uint8_t   Reserved [8];    // reserved for later use
+    mpc_uint8_t   ID       [8];    // should equal 'APETAGEX'
+    mpc_uint8_t   Version  [4];    // currently 1000 (version 1.000)
+    mpc_uint8_t   Length   [4];    // the complete size of the tag, including this footer
+    mpc_uint8_t   TagCount [4];    // the number of fields in the tag
+    mpc_uint8_t   Flags    [4];    // the tag flags (none currently defined)
+    mpc_uint8_t   Reserved [8];    // reserved for later use
 };
 
@@ -608 +608 @@
         return 0;
 
-        if ( src [0] != 0xFF  ||  src [1] != 0xFE )                 // Microsoft Unicode preample (also useful to detect endianess, but currently only little endian is supported)
+        if ( src [0] != (char)0xFF  ||  src [1] != (char)0xFE )     // Microsoft Unicode preample (also useful to detect endianess, but currently only little endian is supported)
         return 0;
 
@@ -614 +614 @@
         if ( ( src [1] & 0xFC ) == 0xDC )
             return 0;
-        if ( src [1] == 0xFF  &&  ( src [0] & 0xFE ) == 0xFE )
+                if ( src [1] == (char)0xFF  &&  ( src [0] & 0xFE ) == 0xFE )
             return 0;
         if ( ( src [1] & 0xFC ) == 0xD8 ) {
@@ -796 +796 @@
 
 
-static int Cdecl
+static int mpc_cdecl
 cmpfn2 ( const void* p1, const void* p2 )
 {
@@ -910 +910 @@
 CopyTags_ID3 ( FILE* fp )
 {
-    Uint8_t  tmp [128];
-
-    if ( -1 == SEEK ( fp, -128L, SEEK_END ) )
+    mpc_uint8_t  tmp [128];
+
+    if ( -1 == fseek ( fp, -128L, SEEK_END ) )
         return -1;
 
@@ -948 +948 @@
 Read_LE_Uint32 ( const unsigned char* p )
 {
-    return ((Uint32_t)p[0] <<  0) |
-           ((Uint32_t)p[1] <<  8) |
-           ((Uint32_t)p[2] << 16) |
-           ((Uint32_t)p[3] << 24);
+    return ((mpc_uint32_t)p[0] <<  0) |
+           ((mpc_uint32_t)p[1] <<  8) |
+           ((mpc_uint32_t)p[2] << 16) |
+           ((mpc_uint32_t)p[3] << 24);
 }
 
@@ -958 +958 @@
 CopyTags_APE ( FILE* fp )
 {
-    Uint32_t                   len;
-    Uint32_t                   flags;
-    Uint32_t                   version;
+    mpc_uint32_t               len;
+    mpc_uint32_t               flags;
+    mpc_uint32_t               version;
     unsigned char              buff [32768];
     unsigned char              key [257];
     unsigned char*             p;
     struct APETagFooterStruct  T;
-    Uint32_t                   TagLen;
-    Uint32_t                   TagCount;
-    // Uint32_t                   tmp;
-
-    if ( -1 == SEEK ( fp, -(long)sizeof T, SEEK_END ) )
+    mpc_uint32_t               TagLen;
+    mpc_uint32_t               TagCount;
+
+    if ( -1 == fseek ( fp, -(long)sizeof T, SEEK_END ) )
         return -1;
     if ( sizeof(T) != READ ( fp, &T, sizeof T ) )
@@ -981 +980 @@
     if ( TagLen <= sizeof T )
         return -1;
-    if ( -1 == SEEK ( fp, -(long)TagLen, SEEK_END ) )
+    if ( -1 == fseek ( fp, -(long)TagLen, SEEK_END ) )
         return -1;
     memset ( buff, 0, sizeof(buff) );