1 files changed, 51 insertions, 43 deletions

diff --git a/uisimulator/play.c b/uisimulator/play.c
index f9877134eb..735597962e 100644
--- a/uisimulator/play.c
+++ b/uisimulator/play.c
@@ -26,6 +26,7 @@
 #include <button.h>
 #include "kernel.h"
 #include "tree.h"
+#include "debug.h"
 
 #include "id3.h"
 
@@ -33,63 +34,70 @@
 #include "x11/mpegplay.h"
 #endif
 
-#define LINE_Y      8 /* initial line */
-#define LINE_HEIGTH 8 /* line height in pixels */
+#define LINE_Y      1 /* initial line */
 
 void playtune(char *dir, char *file)
 {
-  char buffer[256];
-  int fd;
-  mp3entry mp3;
-  bool good=1;
+    char buffer[256];
+    int fd;
+    mp3entry mp3;
+    bool good=1;
 
-  sprintf(buffer, "%s/%s", dir, file);
+    sprintf(buffer, "%s/%s", dir, file);
 
-  if(mp3info(&mp3, buffer)) {
-    debugf("id3 failure!");
-    good=0;
-  }
+    if(mp3info(&mp3, buffer)) {
+        DEBUGF("id3 failure!");
+        good=0;
+    }
+    lcd_clear_display();
 #ifdef HAVE_LCD_BITMAP
-  lcd_clear_display();
-  if(!good) {
-    lcd_puts(0, 0, "[no id3 info]", 0);
-  }
-  else {
-    lcd_puts(0, 0, "[id3 info]", 0);
-    lcd_puts(0, LINE_Y, mp3.title?mp3.title:"", 0);
-    lcd_puts(0, LINE_Y+1*LINE_HEIGTH, mp3.album?mp3.album:"", 0);
-    lcd_puts(0, LINE_Y+2*LINE_HEIGTH, mp3.artist?mp3.artist:"", 0);
+    lcd_setmargins(0,0);
+    lcd_setfont(0);
+#endif
+
+    if(!good) {
+        lcd_puts(0, 0, "[no id3 info]");
+    }
+    else {
+#ifdef HAVE_LCD_BITMAP
+        lcd_puts(0, 0, "[id3 info]");
+        lcd_puts(0, LINE_Y, mp3.title?mp3.title:"");
+        lcd_puts(0, LINE_Y+1, mp3.album?mp3.album:"");
+        lcd_puts(0, LINE_Y+2, mp3.artist?mp3.artist:"");
     
-    sprintf(buffer, "%d ms", mp3.length);
-    lcd_puts(0, LINE_Y+3*LINE_HEIGTH, buffer, 0);
+        sprintf(buffer, "%d ms", mp3.length);
+        lcd_puts(0, LINE_Y+3, buffer);
     
-    sprintf(buffer, "%d kbits", mp3.bitrate);
-    lcd_puts(0, LINE_Y+4*LINE_HEIGTH, buffer, 0);
+        sprintf(buffer, "%d kbits", mp3.bitrate);
+        lcd_puts(0, LINE_Y+4, buffer);
     
-    sprintf(buffer, "%d Hz", mp3.frequency);
-    lcd_puts(0, LINE_Y+5*LINE_HEIGTH, buffer, 0);
-  }
-  lcd_update();
+        sprintf(buffer, "%d Hz", mp3.frequency);
+        lcd_puts(0, LINE_Y+5, buffer);
+#else
+        lcd_puts(0, 0, mp3.artist?mp3.artist:"<no artist>");
+        lcd_puts(0, 1, mp3.title?mp3.title:"<no title>");
 #endif
+    }
+    lcd_update();
 
 #ifdef MPEG_PLAY
-  sprintf(buffer, "%s/%s", dir, file);
-  mpeg_play(buffer);
-  return;
+    sprintf(buffer, "%s/%s", dir, file);
+    mpeg_play(buffer);
+    return;
 #endif
 
-  while(1) {
-    int key = button_get();
+    while(1) {
+        int key = button_get();
 
-    if(!key) {
-      sleep(30);
-      continue;
-    }
-    switch(key) {
-    case BUTTON_OFF:
-    case BUTTON_LEFT:
-      return;
-      break;
+        if(!key) {
+            sleep(30);
+            continue;
+        }
+        switch(key) {
+            case BUTTON_OFF:
+            case BUTTON_LEFT:
+                return;
+                break;
+        }
     }
-  }
 }