devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Now uses firmware/mpeg.c

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1269 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-06-30 14:37:40 +00:00
parent cb30e5422f
commit adbce88570
2 changed files with 8 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

10
uisimulator/x11/Makefile
View file

@ -73,7 +73,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall
APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -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\ APPS = main.c tree.c menu.c credits.c main_menu.c\
playlist.c showtext.c wps.c settings.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 APPS += tetris.c sokoban.c bounce.c boxes.c icons.c bmp.c
endif 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) button-x11.c io.c thread.c $(APPS) $(MENUS) $(FIRMSRCS)
ifdef MPEG_PLAY ifdef MPEG_PLAY
@ -212,9 +212,15 @@ $(OBJDIR)/id3.o: $(FIRMWAREDIR)/id3.c
$(OBJDIR)/debug.o: $(FIRMWAREDIR)/debug.c $(OBJDIR)/debug.o: $(FIRMWAREDIR)/debug.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mpeg.c
$(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c
$(CC) $(APPCFLAGS) -c $< -o $@ $(CC) $(APPCFLAGS) -c $< -o $@
$(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c
$(CC) $(APPCFLAGS) -c $< -o $@
# these ones are simulator-specific # these ones are simulator-specific

72
uisimulator/x11/mpeg.c
View file

@ -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;
}