music.c
changeset 538 b5e3fe1b5a09
parent 533 f19368c22ebd
child 541 323b314739ef
     1.1 --- a/music.c	Mon Jan 02 19:18:27 2012 -0500
     1.2 +++ b/music.c	Mon Jul 18 23:35:08 2011 -0700
     1.3 @@ -566,9 +566,7 @@
     1.4  #ifdef MP3_MUSIC
     1.5  	if ( (ext && MIX_string_equals(ext, "MPG")) ||
     1.6  	     (ext && MIX_string_equals(ext, "MP3")) ||
     1.7 -	     (ext && MIX_string_equals(ext, "MPEG")) ||
     1.8 -	     (magic[0] == 0xFF && (magic[1] & 0xF0) == 0xF0) ||
     1.9 -	     (strncmp((char *)magic, "ID3", 3) == 0) ) {
    1.10 +	     (ext && MIX_string_equals(ext, "MPEG")) ) {
    1.11  		if ( Mix_Init(MIX_INIT_MP3) ) {
    1.12  			SMPEG_Info info;
    1.13  			music->type = MUS_MP3;
    1.14 @@ -589,8 +587,9 @@
    1.15  	     (ext && MIX_string_equals(ext, "MP3")) ||
    1.16  	     (ext && MIX_string_equals(ext, "MPEG")) ||
    1.17  	     (ext && MIX_string_equals(ext, "MAD")) ||
    1.18 +	     /* Don't check the magic. Lots of bogus but usable MP3s out there...
    1.19  	     (magic[0] == 0xFF && (magic[1] & 0xF0) == 0xF0) ||
    1.20 -	     (strncmp((char *)magic, "ID3", 3) == 0) ) {
    1.21 +	     (strncmp((char *)magic, "ID3", 3) == 0)*/ ) {
    1.22  		music->type = MUS_MP3_MAD;
    1.23  		music->data.mp3_mad = mad_openFile(file, &used_mixer);
    1.24  		if (music->data.mp3_mad == 0) {