summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2004-07-08 10:12:39 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2004-07-08 10:12:39 +0000
commit4242a34ad6f569d2a135e272c8beb95af2aea127 (patch)
treed779ca10bc00d9353adfe63f6365ecf5702ba9d4 /firmware
parentc685b35611e9be2a761d863de8d7c5124576a12d (diff)
downloadrockbox-4242a34ad6f569d2a135e272c8beb95af2aea127.zip
rockbox-4242a34ad6f569d2a135e272c8beb95af2aea127.tar.gz
rockbox-4242a34ad6f569d2a135e272c8beb95af2aea127.tar.bz2
rockbox-4242a34ad6f569d2a135e272c8beb95af2aea127.tar.xz
Patch #961687 by Eric Lassauge, MP3 playback using libmad in the X11 simulator
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4849 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/mpeg.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 2e5464e..8f0612c 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -38,6 +38,8 @@
#include "usb.h"
#include "file.h"
#include "hwcompat.h"
+#else
+#include "mpegplay.h"
#endif /* #ifndef SIMULATOR */
extern void bitswap(unsigned char *data, int length);
@@ -2447,6 +2449,9 @@ void mpeg_play(int offset)
break;
continue;
}
+#ifdef HAVE_MPEG_PLAY
+ real_mpeg_play(trackname);
+#endif
playlist_next(steps);
taginfo.offset = offset;
set_elapsed(&taginfo);