diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-07-08 10:12:39 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-07-08 10:12:39 +0000 |
| commit | 4242a34ad6f569d2a135e272c8beb95af2aea127 (patch) | |
| tree | d779ca10bc00d9353adfe63f6365ecf5702ba9d4 /uisimulator/x11 | |
| parent | c685b35611e9be2a761d863de8d7c5124576a12d (diff) | |
| download | rockbox-4242a34ad6f569d2a135e272c8beb95af2aea127.tar.gz rockbox-4242a34ad6f569d2a135e272c8beb95af2aea127.zip | |
Patch #961687 by Eric Lassauge, MP3 playback using libmad in the X11 simulator
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4849 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/x11')
| -rw-r--r-- | uisimulator/x11/Makefile | 13 | ||||
| -rw-r--r-- | uisimulator/x11/oss_sound.c | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 8076686f52..36e814e121 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile @@ -101,6 +101,14 @@ else endif COMMONSRCS = io.c +ifeq ($(HAVE_MPEG_PLAY),1) + SOUNDSRC = mpegplay.c oss_sound.c + LDFLAGS += $(SOUND_LDFLAGS) + CFLAGS += $(SOUND_CFLAGS) -DHAVE_MPEG_PLAY +else + SOUNDSRC = +endif + FIRMSRCS = $(LCDSRSC) id3.c debug.c usb.c mpeg.c mp3_playback.c power.c\ powermgmt.c panic.c mp3data.c sprintf.c buffer.c timefuncs.c @@ -117,7 +125,7 @@ endif SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c stubs.c \ button-x11.c thread.c sim_icons.c $(APPS) $(MENUS) $(FIRMSRCS) \ - $(COMMONSRCS) lcd-common.c fmradio.c + $(COMMONSRCS) $(SOUNDSRC) lcd-common.c fmradio.c ROCKSRC := $(wildcard $(APPDIR)/plugins/*.c) ROCKS := $(ROCKSRC:$(APPDIR)/plugins/%.c=$(OBJDIR)/%.rock) @@ -321,6 +329,9 @@ $(OBJDIR)/lcd-player.o: $(DRIVERS)/lcd-player.c $(OBJDIR)/radio.o: $(RECDIR)/radio.c $(CC) $(APPCFLAGS) -c $< -o $@ +$(OBJDIR)/mpegplay.o: $(SIMCOMMON)/mpegplay.c + $(CC) $(CFLAGS) -c $< -o $@ + # these ones are simulator-specific $(OBJDIR)/%.o: %.c diff --git a/uisimulator/x11/oss_sound.c b/uisimulator/x11/oss_sound.c index e69c403acd..51d85470e7 100644 --- a/uisimulator/x11/oss_sound.c +++ b/uisimulator/x11/oss_sound.c @@ -21,7 +21,7 @@ #include <stdio.h> #include <fcntl.h> -#include <linux/soundcard.h> +#include <sys/soundcard.h> #include "../common/sound.h" /* We want to use the "real" open in this file */ @@ -39,7 +39,7 @@ int init_sound(sound_t* sound) { } int config_sound(sound_t* sound, int sound_freq, int channels) { - int format=AFMT_U16_LE; + int format=AFMT_S16_NE; int setting=0x000C000D; // 12 fragments size 8kb ? WHAT IS THIS? sound->freq=sound_freq; |