Now uses firmware/mpeg.c

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

2 files changed, 8 insertions, 74 deletions

diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index f6b22e243d..73d46bf9a4 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -73,7 +73,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall
 
 APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall
 
-FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c
+FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c usb.c mpeg.c
 
 APPS = main.c tree.c menu.c credits.c main_menu.c\
         playlist.c showtext.c wps.c settings.c
@@ -84,7 +84,7 @@ ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
    APPS += tetris.c sokoban.c bounce.c boxes.c icons.c bmp.c
 endif
 
-SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c mpeg.c \
+SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c \
         button-x11.c io.c thread.c $(APPS) $(MENUS) $(FIRMSRCS)
 
 ifdef MPEG_PLAY
@@ -212,9 +212,15 @@ $(OBJDIR)/id3.o: $(FIRMWAREDIR)/id3.c
 $(OBJDIR)/debug.o: $(FIRMWAREDIR)/debug.c
         $(CC) $(CFLAGS) -c $< -o $@
 
+$(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mpeg.c
+        $(CC) $(CFLAGS) -c $< -o $@
+
 $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c
         $(CC) $(APPCFLAGS) -c $< -o $@
 
+$(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c
+        $(CC) $(APPCFLAGS) -c $< -o $@
+
 
 # these ones are simulator-specific
 
diff --git a/uisimulator/x11/mpeg.c b/uisimulator/x11/mpeg.c
deleted file mode 100644
index 247a0d2efb..0000000000
--- a/uisimulator/x11/mpeg.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2002 Daniel Stenberg
- *
- * All files in this archive are subject to the GNU General Public License.
- * See the file COPYING in the source tree root for full license agreement.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * 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)
-{
-}
-
-void mpeg_bass(void)
-{
-}
-
-void mpeg_treble(void)
-{
-}
-
-void mpeg_stop(void)
-{
-}
-
-void mpeg_prev(void)
-{
-}
-
-void mpeg_next(void)
-{
-}
-
-#ifndef MPEGPLAY
-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;
-}