A step towards WPS

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1184 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 21 insertions, 2 deletions

diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 9681ad521e..d3b446f5c9 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -76,7 +76,7 @@ APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall
 FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c settings.c
 
 APPS = main.c tree.c play.c menu.c credits.c main_menu.c\
-        playlist.c showtext.c
+        playlist.c showtext.c wps.c
 
 MENUS = games_menu.c screensavers_menu.c settings_menu.c sound_menu.c
 
@@ -182,6 +182,9 @@ $(OBJDIR)/boxes.o: $(RECDIR)/boxes.c
 $(OBJDIR)/main.o: $(APPDIR)/main.c
         $(CC) $(APPCFLAGS) -c $< -o $@
 
+$(OBJDIR)/wps.o: $(APPDIR)/wps.c
+        $(CC) $(APPCFLAGS) -c $< -o $@
+
 $(OBJDIR)/bmp.o: $(RECDIR)/bmp.c
         $(CC) $(APPCFLAGS) -c $< -o $@
 
diff --git a/uisimulator/x11/mpeg.c b/uisimulator/x11/mpeg.c
index 0f3680d737..e1bce1e22c 100644
--- a/uisimulator/x11/mpeg.c
+++ b/uisimulator/x11/mpeg.c
@@ -16,11 +16,13 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-
+#include <stdbool.h>
 #include "debug.h"
+#include "id3.h"
 
 /* This file is for emulating some of the mpeg controlling functions of 
    the target */
+static struct mp3entry dummy;
 
 void mpeg_volume(void)
 {
@@ -43,6 +45,20 @@ void mpeg_play(char *tune)
 {
   DEBUGF("We instruct the MPEG thread to play %s for us\n",
          tune);
+  mp3info(&dummy, tune);
+}
+
+void mpeg_pause(void)
+{
+}
+
+void mpeg_resume(void)
+{
 }
 
 #endif
+
+struct mp3entry* mpeg_current_track(void)
+{
+    return &dummy;
+}