Changeset 77 for mppenc/branches/r2d/src/tags.c

Timestamp:

10/17/06 16:55:28 (18 years ago)

Author:

r2d

Message:

• added profile.c in libmpcpsy

File:

• mppenc/branches/r2d/src/tags.c (modified) (9 diffs)

mppenc/branches/r2d/src/tags.c

@@ -600 +600 @@
 
 static int
-IsUnicode ( const unsigned char* src, size_t len )
+IsUnicode ( const char* src, size_t len )
 {
     if ( len <= 2 )
@@ -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] != 0xFFi  ||  src [1] != 0xFEi )                 // 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] == 0xFFi  &&  ( src [0] & 0xFE ) == 0xFE )
             return 0;
         if ( ( src [1] & 0xFC ) == 0xD8 ) {
@@ -652 +652 @@
 addtag ( const char*           key,             // the item key
          size_t                keylen,          // length of item key, or 0 for auto-determine
-         const unsigned char*  value,           // the item value
+         const char*           value,           // the item value
          size_t                valuelen,        // the length of the item value (before any possible translation)
          int                   converttoutf8,   // convert flags of item value
@@ -659 +659 @@
     unsigned char*  p;
     unsigned char*  q;
-    unsigned char   ch;
+    char   ch;
     size_t          i;
 #ifdef _WIN32
@@ -716 +716 @@
     p = malloc ( keylen );
     memcpy ( p, key, keylen );
-    T [TagCount] . key    = p;
+        T [TagCount] . key    = (char*) p;
     T [TagCount] . keylen = keylen;
 
@@ -925 +925 @@
         return -1;
 
-    memcpy_crop  ( "Title"  , tmp +  3, 30, 0 );
-    memcpy_crop  ( "Artist" , tmp + 33, 30, 0 );
-    memcpy_crop  ( "Album"  , tmp + 63, 30, 0 );
-    memcpy_crop  ( "Year"   , tmp + 93,  4, 0 );
-    memcpy_crop  ( "Comment", tmp + 97, 30, 0 );
+        memcpy_crop  ( "Title"  , (char*)tmp +  3, 30, 0 );
+        memcpy_crop  ( "Artist" , (char*)tmp + 33, 30, 0 );
+        memcpy_crop  ( "Album"  , (char*)tmp + 63, 30, 0 );
+        memcpy_crop  ( "Year"   , (char*)tmp + 93,  4, 0 );
+        memcpy_crop  ( "Comment", (char*)tmp + 97, 30, 0 );
 
     if ( tmp[127] < sizeof(GenreList)/sizeof(*GenreList) )
@@ -937 +937 @@
     if ( tmp[125] == 0  &&  tmp[126] != 0 )
         if ( ! TagKeyExists ( "Track", 0 ) ) {
-            sprintf ( tmp, "%u",  tmp[126] );
-            addtag ("Track", 0, tmp, strlen (tmp), 0, 0 );
+                sprintf ( (char*)tmp, "%u",  tmp[126] );
+                addtag ("Track", 0, (char*)tmp, strlen ((char*)tmp), 0, 0 );
         }
 
@@ -991 +991 @@
         len   = Read_LE_Uint32 ( p );        p += 4;
         flags = Read_LE_Uint32 ( p );        p += 4;
-        strcpy ( key, p );                   p += strlen (key) + 1;
-        if ( ! TagKeyExists ( key, 0 ) )
-            addtag ( key, 0, p, len > 0  &&  p [len-1] == '\0'  ?  len-1  :  len, version >= 2000  ?  0  :  5, flags );
+                strcpy ( (char*)key, (char*)p );                   p += strlen ((char*)key) + 1;
+                if ( ! TagKeyExists ( (char*)key, 0 ) )
+                        addtag ( (char*)key, 0, (char*)p, len > 0  &&  p [len-1] == '\0'  ?  len-1  :  len, version >= 2000  ?  0  :  5, flags );
                                              p += len;
     }