summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-05-27 09:56:22 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-05-27 09:56:22 +0000
commitf6951bc5cc5efc5753710bd34456ff79840147e9 (patch)
tree44f61b8e5c74859eafbc34e871bebd6b11ce6b1f
parent3facc983d16fcf68cf8d0df2d57557c5a18be993 (diff)
downloadrockbox-f6951bc5cc5efc5753710bd34456ff79840147e9.tar.gz
rockbox-f6951bc5cc5efc5753710bd34456ff79840147e9.zip
Moved mpeg_play() to after id3 display
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@735 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/play.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/play.c b/apps/play.c
index b0af2264c4..b107b28d38 100644
--- a/apps/play.c
+++ b/apps/play.c
@@ -39,15 +39,12 @@
39 39
40void playtune(char *dir, char *file) 40void playtune(char *dir, char *file)
41{ 41{
42 static char mfile[256];
42 char buffer[256]; 43 char buffer[256];
43 mp3entry mp3; 44 mp3entry mp3;
44 bool good=1; 45 bool good=1;
45 46
46 snprintf(buffer, sizeof(buffer), "%s/%s", dir, file); 47 snprintf(buffer, sizeof(buffer), "%s/%s", dir, file);
47#if !defined(SIMULATOR) || defined(MPEGPLAY)
48 mpeg_play(buffer);
49#endif
50
51 if(mp3info(&mp3, buffer)) { 48 if(mp3info(&mp3, buffer)) {
52 DEBUGF("id3 failure!"); 49 DEBUGF("id3 failure!");
53 good=0; 50 good=0;
@@ -86,6 +83,11 @@ void playtune(char *dir, char *file)
86 lcd_update(); 83 lcd_update();
87#endif 84#endif
88 85
86 snprintf(mfile, sizeof(mfile), "%s/%s", dir, file);
87#if !defined(SIMULATOR) || defined(MPEGPLAY)
88 mpeg_play(mfile);
89#endif
90
89 while(1) { 91 while(1) {
90 int key = button_get(); 92 int key = button_get();
91 93