We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch to add ID3 magic to Mix_LoadMUS and Mix_LoadMUS_RW

mp3magic.diff (text/plain), 1.62 KB, created by Forrest Voight on 2008-07-14 14:28:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forrest Voight

Created: 2008-07-14 14:28:45 UTC

Size: 1.62 KB

patch

obsolete

>Index: music.c
>===================================================================
>--- music.c	(revision 3718)
>+++ music.c	(working copy)
>@@ -635,7 +635,8 @@
> 	if ( (ext && MIX_string_equals(ext, "MPG")) ||
> 	     (ext && MIX_string_equals(ext, "MP3")) ||
> 	     (ext && MIX_string_equals(ext, "MPEG")) ||
>-	     (magic[0] == 0xFF && (magic[1] & 0xF0) == 0xF0) ) {
>+	     (magic[0] == 0xFF && (magic[1] & 0xF0) == 0xF0) ||
>+	     (strncmp((char *)magic, "ID3", 3) == 0) ) {
> 		if ( Mix_InitMP3() == 0 ) {
> 			SMPEG_Info info;
> 			music->type = MUS_MP3;
>@@ -656,7 +657,8 @@
> 	     (ext && MIX_string_equals(ext, "MP3")) ||
> 	     (ext && MIX_string_equals(ext, "MPEG")) ||
> 	     (ext && MIX_string_equals(ext, "MAD")) ||
>-	     (magic[0] == 0xFF && (magic[1] & 0xF0) == 0xF0) ) {
>+	     (magic[0] == 0xFF && (magic[1] & 0xF0) == 0xF0) ||
>+	     (strncmp((char *)magic, "ID3", 3) == 0) ) {
> 		music->type = MUS_MP3_MAD;
> 		music->data.mp3_mad = mad_openFile(file, &used_mixer);
> 		if (music->data.mp3_mad == 0) {
>@@ -1546,7 +1548,7 @@
> 	} else
> #endif
> #ifdef MP3_MUSIC
>-	if ( magic[0] == 0xFF && (magic[1] & 0xF0) == 0xF0 ) {
>+	if ( ( magic[0] == 0xFF && (magic[1] & 0xF0) == 0xF0) || ( strncmp((char *)magic, "ID3", 3) == 0 ) ) {
> 		if ( Mix_InitMP3() == 0 ) {
> 			SMPEG_Info info;
> 			music->type = MUS_MP3;
>@@ -1563,7 +1565,7 @@
> 	} else
> #endif
> #ifdef MP3_MAD_MUSIC
>-	if ( magic[0] == 0xFF && (magic[1] & 0xF0) == 0xF0 ) {
>+	if ( ( magic[0] == 0xFF && (magic[1] & 0xF0) == 0xF0) || ( strncmp((char *)magic, "ID3", 3) == 0 ) ) {
> 		music->type = MUS_MP3_MAD;
> 		music->data.mp3_mad = mad_openFileRW(rw, &used_mixer);
> 		if (music->data.mp3_mad == 0) {

Actions: View | Diff

Attachments on bug 604: 260

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.