devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Minor whitespace and formatting fixes.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12253 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dan Everton 2007-02-10 09:55:06 +00:00
parent e8fe1f596f
commit 5158751263
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/metadata.c
View file

@ -570,13 +570,15 @@ static bool get_speex_metadata(int fd, struct mp3entry* id3)
{ {
return false; return false;
} }
if ((memcmp(buf, "OggS", 4) != 0) || (memcmp(&buf[28], "Speex", 5) != 0)) if ((memcmp(buf, "OggS", 4) != 0) || (memcmp(&buf[28], "Speex", 5) != 0))
{ {
return false; return false;
} }
/* We need to ensure the serial number from this page is the same as the /* We need to ensure the serial number from this page is the same as the
* one from the last page (since we only support a single bitstream). * one from the last page (since we only support a single bitstream).
*/ */
serial = get_long_le(&buf[14]); serial = get_long_le(&buf[14]);
if ((lseek(fd, 33, SEEK_SET) < 0)||(read(fd, buf, 58) < 4)) if ((lseek(fd, 33, SEEK_SET) < 0)||(read(fd, buf, 58) < 4))
{ {
@ -756,13 +758,15 @@ static bool get_vorbis_metadata(int fd, struct mp3entry* id3)
if ((memcmp(buf, "OggS", 4) != 0) || (memcmp(&buf[29], "vorbis", 6) != 0)) if ((memcmp(buf, "OggS", 4) != 0) || (memcmp(&buf[29], "vorbis", 6) != 0))
{ {
if ((memcmp(buf, "OggS", 4) != 0) || (memcmp(&buf[28], "Speex", 5) != 0)) if ((memcmp(buf, "OggS", 4) != 0) || (memcmp(&buf[28], "Speex", 5) != 0))
{ {
return false; return false;
}else{ }
id3->codectype=AFMT_SPEEX; else
return get_speex_metadata(fd,id3); {
} id3->codectype = AFMT_SPEEX;
return get_speex_metadata(fd, id3);
}
} }
/* We need to ensure the serial number from this page is the same as the /* We need to ensure the serial number from this page is the same as the

6
firmware/id3.c
View file

@ -101,9 +101,9 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] =
/* NESM (NES Sound Format) */ /* NESM (NES Sound Format) */
[AFMT_NSF] = [AFMT_NSF] =
AFMT_ENTRY("NSF", "nsf", NULL, "nsf\0nsfe\0" ), AFMT_ENTRY("NSF", "nsf", NULL, "nsf\0nsfe\0" ),
/* Speex File Format */ /* Speex File Format */
[AFMT_SPEEX] = [AFMT_SPEEX] =
AFMT_ENTRY("Speex","speex", NULL, "spx\0" ) AFMT_ENTRY("Speex","speex", NULL, "spx\0" ),
#endif #endif
}; };