diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2002-06-04 21:45:51 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2002-06-04 21:45:51 +0000 |
| commit | 4bf52eae14be82230f7aff9010003725e84ce3e3 (patch) | |
| tree | c5b369366d9e98c94259f96571f565c8300f3022 /uisimulator | |
| parent | 7b344f802922be94ce238b4ca84a85208f8ec9b6 (diff) | |
| download | rockbox-4bf52eae14be82230f7aff9010003725e84ce3e3.tar.gz rockbox-4bf52eae14be82230f7aff9010003725e84ce3e3.zip | |
works with playlist code, now stubs mpeg_play() to be able to show some
better debug output
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@893 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
| -rw-r--r-- | uisimulator/x11/Makefile | 6 | ||||
| -rw-r--r-- | uisimulator/x11/mpeg.c | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index bda4136274..2b2dab1960 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile @@ -69,7 +69,8 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c -APPS = main.c tree.c play.c menu.c credits.c main_menu.c sound_menu.c +APPS = main.c tree.c play.c menu.c credits.c main_menu.c sound_menu.c \ + playlist.c ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) APPS += tetris.c screensaver.c icons.c bmp.c @@ -167,6 +168,9 @@ $(OBJDIR)/play.o: $(APPDIR)/play.c $(OBJDIR)/tree.o: $(APPDIR)/tree.c $(CC) $(CFLAGS) -c $< -o $@ +$(OBJDIR)/playlist.o: $(APPDIR)/playlist.c + $(CC) $(CFLAGS) -c $< -o $@ + $(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c $(CC) $(CFLAGS) -c $< -o $@ diff --git a/uisimulator/x11/mpeg.c b/uisimulator/x11/mpeg.c index 38cdb104e5..0f3680d737 100644 --- a/uisimulator/x11/mpeg.c +++ b/uisimulator/x11/mpeg.c @@ -17,6 +17,8 @@ * ****************************************************************************/ +#include "debug.h" + /* This file is for emulating some of the mpeg controlling functions of the target */ @@ -35,3 +37,12 @@ void mpeg_treble(void) void mpeg_stop(void) { } + +#ifndef MPEGPLAY +void mpeg_play(char *tune) +{ + DEBUGF("We instruct the MPEG thread to play %s for us\n", + tune); +} + +#endif |