summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorDan Everton <dan@iocaine.org>2007-02-09 10:06:53 +0000
committerDan Everton <dan@iocaine.org>2007-02-09 10:06:53 +0000
commitebc58c9f066e89088bfb6b8193b4266e5145d8e1 (patch)
tree309ccacdc57fae01fb2231b9e2b2faf468129b3c /firmware
parent46424301c3c3974c9e1e682886f51a4828e4534a (diff)
downloadrockbox-ebc58c9f066e89088bfb6b8193b4266e5145d8e1.tar.gz
rockbox-ebc58c9f066e89088bfb6b8193b4266e5145d8e1.tar.bz2
rockbox-ebc58c9f066e89088bfb6b8193b4266e5145d8e1.zip
Add Speex playback support. Patch from FS #5607 thanks to Frederik Vestre.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12241 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/id3.h12
-rw-r--r--firmware/id3.c5
2 files changed, 16 insertions, 1 deletions
diff --git a/firmware/export/id3.h b/firmware/export/id3.h
index 74b49635ba..a62dc5e513 100644
--- a/firmware/export/id3.h
+++ b/firmware/export/id3.h
@@ -22,6 +22,8 @@
#include <stdbool.h>
#include "config.h"
#include "file.h"
+#include "lcd.h"
+#include "system.h"
/* Audio file types. */
enum
@@ -46,6 +48,7 @@ enum
AFMT_AAC, /* Advanced Audio Coding (AAC) in M4A container */
AFMT_SHN, /* Shorten */
AFMT_SID, /* SID File Format */
+ AFMT_SPEEX, /* Ogg Speex speech */
AFMT_ADX, /* ADX File Format */
AFMT_NSF, /* NESM (NES Sound Format) */
#endif
@@ -206,6 +209,15 @@ struct mp3entry {
long track_peak; /* 7.24 signed fixed point. 0 for no peak. */
long album_peak;
#endif
+
+#ifdef HAVE_LCD_BITMAP
+ /* album art support */
+ fb_data* albumart_data;
+ unsigned int albumart_width;
+ unsigned int albumart_height;
+ bool albumart_found;
+ char albumart_path[MAX_PATH];
+#endif
};
enum {
diff --git a/firmware/id3.c b/firmware/id3.c
index 4276db6027..4e990f8154 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -18,7 +18,7 @@
****************************************************************************/
/*
* Parts of this code has been stolen from the Ample project and was written
- * by David Härdeman. It has since been extended and enhanced pretty much by
+ * by David H�deman. It has since been extended and enhanced pretty much by
* all sorts of friendly Rockbox people.
*
*/
@@ -101,6 +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" )
#endif
};