Changeset 196 for libmpc/branches/r2d/libmpcdec/mpc_reader.c

Timestamp:

12/30/06 17:49:40 (18 years ago)

Author:

r2d

Message:

• moved skip_id3v2 to demuxer and changed so it doesn't need seek (not tested with id3v2 tags)

File:

• libmpc/branches/r2d/libmpcdec/mpc_reader.c (modified) (1 diff)

libmpc/branches/r2d/libmpcdec/mpc_reader.c

@@ -136 +136 @@
 }
 
-mpc_int32_t
-mpc_skip_id3v2(mpc_reader* p_reader)
-{
-    mpc_uint8_t  tmp [10];
-    mpc_uint32_t unsynchronisation; // ID3v2.4-flag
-    mpc_uint32_t extHeaderPresent;  // ID3v2.4-flag
-    mpc_uint32_t experimentalFlag;  // ID3v2.4-flag
-    mpc_uint32_t footerPresent;     // ID3v2.4-flag
-    mpc_int32_t  ret;
-
-    // seek to first byte of mpc data
-    ret = p_reader->seek(p_reader, 0);
-    if(!ret) return 0;
-
-    p_reader->read(p_reader, tmp, sizeof tmp);
-
-    // check id3-tag
-    if ( 0 != memcmp( tmp, "ID3", 3 ) )
-        return 0;
-
-    // read flags
-    unsynchronisation = tmp[5] & 0x80;
-    extHeaderPresent  = tmp[5] & 0x40;
-    experimentalFlag  = tmp[5] & 0x20;
-    footerPresent     = tmp[5] & 0x10;
-
-    if ( tmp[5] & 0x0F )
-        return MPC_STATUS_FILE; // not (yet???) allowed
-    if ( (tmp[6] | tmp[7] | tmp[8] | tmp[9]) & 0x80 )
-        return MPC_STATUS_FILE; // not allowed
-
-    // read headerSize (syncsave: 4 * $0xxxxxxx = 28 significant bits)
-    ret  = tmp[6] << 21;
-    ret += tmp[7] << 14;
-    ret += tmp[8] <<  7;
-    ret += tmp[9];
-    ret += 10;
-    if ( footerPresent )
-        ret += 10;
-
-    return ret;
-}
-
-
-