summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Everton <dan@iocaine.org>2007-02-10 09:55:06 +0000
committerDan Everton <dan@iocaine.org>2007-02-10 09:55:06 +0000
commit51587512635a8b19e6a5f19a20074d0d4d1f17da (patch)
tree362fd357027d90e8c865fedaee062d798750ba62
parente8fe1f596fe6df93f5d27b49e78997f80c08022b (diff)
downloadrockbox-51587512635a8b19e6a5f19a20074d0d4d1f17da.tar.gz
rockbox-51587512635a8b19e6a5f19a20074d0d4d1f17da.tar.bz2
rockbox-51587512635a8b19e6a5f19a20074d0d4d1f17da.zip
Minor whitespace and formatting fixes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12253 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/metadata.c22
-rw-r--r--firmware/id3.c6
2 files changed, 16 insertions, 12 deletions
diff --git a/apps/metadata.c b/apps/metadata.c
index 08f77e9492..3f2c496671 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -570,13 +570,15 @@ static bool get_speex_metadata(int fd, struct mp3entry* id3)
{
return false;
}
+
if ((memcmp(buf, "OggS", 4) != 0) || (memcmp(&buf[28], "Speex", 5) != 0))
{
return false;
}
+
/* 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]);
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[28], "Speex", 5) != 0))
- {
- return false;
- }else{
- id3->codectype=AFMT_SPEEX;
- return get_speex_metadata(fd,id3);
- }
+ if ((memcmp(buf, "OggS", 4) != 0) || (memcmp(&buf[28], "Speex", 5) != 0))
+ {
+ return false;
+ }
+ else
+ {
+ 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
diff --git a/firmware/id3.c b/firmware/id3.c
index 4e990f8154..bc42cf5c62 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -101,9 +101,9 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] =
/* NESM (NES Sound Format) */
[AFMT_NSF] =
AFMT_ENTRY("NSF", "nsf", NULL, "nsf\0nsfe\0" ),
- /* Speex File Format */
- [AFMT_SPEEX] =
- AFMT_ENTRY("Speex","speex", NULL, "spx\0" )
+ /* Speex File Format */
+ [AFMT_SPEEX] =
+ AFMT_ENTRY("Speex","speex", NULL, "spx\0" ),
#endif
};