From 905ca7bdb575ee25c0dc253ca2a727f9614ac6c2 Mon Sep 17 00:00:00 2001 From: Sean Bartell Date: Sat, 25 Jun 2011 21:37:36 -0400 Subject: [PATCH 3/4] move metadata to rbcodec/ --- apps/SOURCES | 32 --------------------- lib/rbcodec/SOURCES | 30 +++++++++++++++++++ {apps => lib/rbcodec}/metadata/a52.c | 0 {apps => lib/rbcodec}/metadata/adx.c | 0 {apps => lib/rbcodec}/metadata/aiff.c | 0 {apps => lib/rbcodec}/metadata/ape.c | 0 {apps => lib/rbcodec}/metadata/asap.c | 0 {apps => lib/rbcodec}/metadata/asf.c | 0 {apps => lib/rbcodec}/metadata/au.c | 0 {apps => lib/rbcodec}/metadata/flac.c | 0 {apps => lib/rbcodec}/metadata/id3tags.c | 0 {apps => lib/rbcodec/metadata}/metadata.c | 0 {apps => lib/rbcodec/metadata}/metadata.h | 0 {apps => lib/rbcodec}/metadata/metadata_common.c | 0 {apps => lib/rbcodec}/metadata/metadata_common.h | 0 {apps => lib/rbcodec}/metadata/metadata_parsers.h | 0 {apps => lib/rbcodec}/metadata/mod.c | 0 {apps => lib/rbcodec}/metadata/monkeys.c | 0 {apps => lib/rbcodec}/metadata/mp3.c | 0 {apps => lib/rbcodec/metadata}/mp3data.c | 0 {apps => lib/rbcodec/metadata}/mp3data.h | 0 {apps => lib/rbcodec}/metadata/mp4.c | 0 {apps => lib/rbcodec}/metadata/mpc.c | 0 {apps => lib/rbcodec}/metadata/nsf.c | 0 {apps => lib/rbcodec}/metadata/ogg.c | 0 {apps => lib/rbcodec}/metadata/oma.c | 0 {apps => lib/rbcodec/metadata}/replaygain.c | 0 {apps => lib/rbcodec/metadata}/replaygain.h | 0 {apps => lib/rbcodec}/metadata/rm.c | 0 {apps => lib/rbcodec}/metadata/sid.c | 0 {apps => lib/rbcodec}/metadata/smaf.c | 0 {apps => lib/rbcodec}/metadata/spc.c | 0 {apps => lib/rbcodec}/metadata/tta.c | 0 {apps => lib/rbcodec}/metadata/vorbis.c | 0 {apps => lib/rbcodec}/metadata/vox.c | 0 {apps => lib/rbcodec}/metadata/wave.c | 0 {apps => lib/rbcodec}/metadata/wavpack.c | 0 lib/rbcodec/rbcodec.make | 2 +- lib/rbcodec/test/Makefile | 8 ++--- 39 files changed, 34 insertions(+), 38 deletions(-) rename {apps => lib/rbcodec}/metadata/a52.c (100%) rename {apps => lib/rbcodec}/metadata/adx.c (100%) rename {apps => lib/rbcodec}/metadata/aiff.c (100%) rename {apps => lib/rbcodec}/metadata/ape.c (100%) rename {apps => lib/rbcodec}/metadata/asap.c (100%) rename {apps => lib/rbcodec}/metadata/asf.c (100%) rename {apps => lib/rbcodec}/metadata/au.c (100%) rename {apps => lib/rbcodec}/metadata/flac.c (100%) rename {apps => lib/rbcodec}/metadata/id3tags.c (100%) rename {apps => lib/rbcodec/metadata}/metadata.c (100%) rename {apps => lib/rbcodec/metadata}/metadata.h (100%) rename {apps => lib/rbcodec}/metadata/metadata_common.c (100%) rename {apps => lib/rbcodec}/metadata/metadata_common.h (100%) rename {apps => lib/rbcodec}/metadata/metadata_parsers.h (100%) rename {apps => lib/rbcodec}/metadata/mod.c (100%) rename {apps => lib/rbcodec}/metadata/monkeys.c (100%) rename {apps => lib/rbcodec}/metadata/mp3.c (100%) rename {apps => lib/rbcodec/metadata}/mp3data.c (100%) rename {apps => lib/rbcodec/metadata}/mp3data.h (100%) rename {apps => lib/rbcodec}/metadata/mp4.c (100%) rename {apps => lib/rbcodec}/metadata/mpc.c (100%) rename {apps => lib/rbcodec}/metadata/nsf.c (100%) rename {apps => lib/rbcodec}/metadata/ogg.c (100%) rename {apps => lib/rbcodec}/metadata/oma.c (100%) rename {apps => lib/rbcodec/metadata}/replaygain.c (100%) rename {apps => lib/rbcodec/metadata}/replaygain.h (100%) rename {apps => lib/rbcodec}/metadata/rm.c (100%) rename {apps => lib/rbcodec}/metadata/sid.c (100%) rename {apps => lib/rbcodec}/metadata/smaf.c (100%) rename {apps => lib/rbcodec}/metadata/spc.c (100%) rename {apps => lib/rbcodec}/metadata/tta.c (100%) rename {apps => lib/rbcodec}/metadata/vorbis.c (100%) rename {apps => lib/rbcodec}/metadata/vox.c (100%) rename {apps => lib/rbcodec}/metadata/wave.c (100%) rename {apps => lib/rbcodec}/metadata/wavpack.c (100%) diff --git a/apps/SOURCES b/apps/SOURCES index 8083d05..8a34534 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -26,7 +26,6 @@ menus/audiohw_eq_menu.c menus/eq_menu.c buffering.c voice_thread.c -replaygain.c #else /* !SWCODEC */ mpeg.c #endif @@ -42,7 +41,6 @@ menus/sound_menu.c menus/time_menu.c #endif misc.c -mp3data.c onplay.c playlist.c playlist_catalog.c @@ -183,36 +181,6 @@ usb_keymaps.c #ifndef USB_NONE gui/usb_screen.c #endif -metadata.c -metadata/id3tags.c -metadata/mp3.c -#if CONFIG_CODEC == SWCODEC -metadata/metadata_common.c -metadata/aiff.c -metadata/ape.c -metadata/asf.c -metadata/adx.c -metadata/flac.c -metadata/monkeys.c -metadata/mp4.c -metadata/mpc.c -metadata/ogg.c -metadata/sid.c -metadata/mod.c -metadata/spc.c -metadata/vorbis.c -metadata/wave.c -metadata/wavpack.c -metadata/a52.c -metadata/asap.c -metadata/rm.c -metadata/nsf.c -metadata/oma.c -metadata/smaf.c -metadata/au.c -metadata/vox.c -metadata/tta.c -#endif #ifdef HAVE_TAGCACHE tagcache.c #endif diff --git a/lib/rbcodec/SOURCES b/lib/rbcodec/SOURCES index c684ab1..d544fe0 100644 --- a/lib/rbcodec/SOURCES +++ b/lib/rbcodec/SOURCES @@ -1,6 +1,36 @@ +metadata/metadata.c +metadata/id3tags.c +metadata/mp3.c +metadata/mp3data.c #if CONFIG_CODEC == SWCODEC dsp/dsp.c dsp/eq.c +metadata/metadata_common.c +metadata/replaygain.c +metadata/aiff.c +metadata/ape.c +metadata/asf.c +metadata/adx.c +metadata/flac.c +metadata/monkeys.c +metadata/mp4.c +metadata/mpc.c +metadata/ogg.c +metadata/sid.c +metadata/mod.c +metadata/spc.c +metadata/vorbis.c +metadata/wave.c +metadata/wavpack.c +metadata/a52.c +metadata/asap.c +metadata/rm.c +metadata/nsf.c +metadata/oma.c +metadata/smaf.c +metadata/au.c +metadata/vox.c +metadata/tta.c # if defined(CPU_COLDFIRE) dsp/dsp_cf.S dsp/eq_cf.S diff --git a/apps/metadata/a52.c b/lib/rbcodec/metadata/a52.c similarity index 100% rename from apps/metadata/a52.c rename to lib/rbcodec/metadata/a52.c diff --git a/apps/metadata/adx.c b/lib/rbcodec/metadata/adx.c similarity index 100% rename from apps/metadata/adx.c rename to lib/rbcodec/metadata/adx.c diff --git a/apps/metadata/aiff.c b/lib/rbcodec/metadata/aiff.c similarity index 100% rename from apps/metadata/aiff.c rename to lib/rbcodec/metadata/aiff.c diff --git a/apps/metadata/ape.c b/lib/rbcodec/metadata/ape.c similarity index 100% rename from apps/metadata/ape.c rename to lib/rbcodec/metadata/ape.c diff --git a/apps/metadata/asap.c b/lib/rbcodec/metadata/asap.c similarity index 100% rename from apps/metadata/asap.c rename to lib/rbcodec/metadata/asap.c diff --git a/apps/metadata/asf.c b/lib/rbcodec/metadata/asf.c similarity index 100% rename from apps/metadata/asf.c rename to lib/rbcodec/metadata/asf.c diff --git a/apps/metadata/au.c b/lib/rbcodec/metadata/au.c similarity index 100% rename from apps/metadata/au.c rename to lib/rbcodec/metadata/au.c diff --git a/apps/metadata/flac.c b/lib/rbcodec/metadata/flac.c similarity index 100% rename from apps/metadata/flac.c rename to lib/rbcodec/metadata/flac.c diff --git a/apps/metadata/id3tags.c b/lib/rbcodec/metadata/id3tags.c similarity index 100% rename from apps/metadata/id3tags.c rename to lib/rbcodec/metadata/id3tags.c diff --git a/apps/metadata.c b/lib/rbcodec/metadata/metadata.c similarity index 100% rename from apps/metadata.c rename to lib/rbcodec/metadata/metadata.c diff --git a/apps/metadata.h b/lib/rbcodec/metadata/metadata.h similarity index 100% rename from apps/metadata.h rename to lib/rbcodec/metadata/metadata.h diff --git a/apps/metadata/metadata_common.c b/lib/rbcodec/metadata/metadata_common.c similarity index 100% rename from apps/metadata/metadata_common.c rename to lib/rbcodec/metadata/metadata_common.c diff --git a/apps/metadata/metadata_common.h b/lib/rbcodec/metadata/metadata_common.h similarity index 100% rename from apps/metadata/metadata_common.h rename to lib/rbcodec/metadata/metadata_common.h diff --git a/apps/metadata/metadata_parsers.h b/lib/rbcodec/metadata/metadata_parsers.h similarity index 100% rename from apps/metadata/metadata_parsers.h rename to lib/rbcodec/metadata/metadata_parsers.h diff --git a/apps/metadata/mod.c b/lib/rbcodec/metadata/mod.c similarity index 100% rename from apps/metadata/mod.c rename to lib/rbcodec/metadata/mod.c diff --git a/apps/metadata/monkeys.c b/lib/rbcodec/metadata/monkeys.c similarity index 100% rename from apps/metadata/monkeys.c rename to lib/rbcodec/metadata/monkeys.c diff --git a/apps/metadata/mp3.c b/lib/rbcodec/metadata/mp3.c similarity index 100% rename from apps/metadata/mp3.c rename to lib/rbcodec/metadata/mp3.c diff --git a/apps/mp3data.c b/lib/rbcodec/metadata/mp3data.c similarity index 100% rename from apps/mp3data.c rename to lib/rbcodec/metadata/mp3data.c diff --git a/apps/mp3data.h b/lib/rbcodec/metadata/mp3data.h similarity index 100% rename from apps/mp3data.h rename to lib/rbcodec/metadata/mp3data.h diff --git a/apps/metadata/mp4.c b/lib/rbcodec/metadata/mp4.c similarity index 100% rename from apps/metadata/mp4.c rename to lib/rbcodec/metadata/mp4.c diff --git a/apps/metadata/mpc.c b/lib/rbcodec/metadata/mpc.c similarity index 100% rename from apps/metadata/mpc.c rename to lib/rbcodec/metadata/mpc.c diff --git a/apps/metadata/nsf.c b/lib/rbcodec/metadata/nsf.c similarity index 100% rename from apps/metadata/nsf.c rename to lib/rbcodec/metadata/nsf.c diff --git a/apps/metadata/ogg.c b/lib/rbcodec/metadata/ogg.c similarity index 100% rename from apps/metadata/ogg.c rename to lib/rbcodec/metadata/ogg.c diff --git a/apps/metadata/oma.c b/lib/rbcodec/metadata/oma.c similarity index 100% rename from apps/metadata/oma.c rename to lib/rbcodec/metadata/oma.c diff --git a/apps/replaygain.c b/lib/rbcodec/metadata/replaygain.c similarity index 100% rename from apps/replaygain.c rename to lib/rbcodec/metadata/replaygain.c diff --git a/apps/replaygain.h b/lib/rbcodec/metadata/replaygain.h similarity index 100% rename from apps/replaygain.h rename to lib/rbcodec/metadata/replaygain.h diff --git a/apps/metadata/rm.c b/lib/rbcodec/metadata/rm.c similarity index 100% rename from apps/metadata/rm.c rename to lib/rbcodec/metadata/rm.c diff --git a/apps/metadata/sid.c b/lib/rbcodec/metadata/sid.c similarity index 100% rename from apps/metadata/sid.c rename to lib/rbcodec/metadata/sid.c diff --git a/apps/metadata/smaf.c b/lib/rbcodec/metadata/smaf.c similarity index 100% rename from apps/metadata/smaf.c rename to lib/rbcodec/metadata/smaf.c diff --git a/apps/metadata/spc.c b/lib/rbcodec/metadata/spc.c similarity index 100% rename from apps/metadata/spc.c rename to lib/rbcodec/metadata/spc.c diff --git a/apps/metadata/tta.c b/lib/rbcodec/metadata/tta.c similarity index 100% rename from apps/metadata/tta.c rename to lib/rbcodec/metadata/tta.c diff --git a/apps/metadata/vorbis.c b/lib/rbcodec/metadata/vorbis.c similarity index 100% rename from apps/metadata/vorbis.c rename to lib/rbcodec/metadata/vorbis.c diff --git a/apps/metadata/vox.c b/lib/rbcodec/metadata/vox.c similarity index 100% rename from apps/metadata/vox.c rename to lib/rbcodec/metadata/vox.c diff --git a/apps/metadata/wave.c b/lib/rbcodec/metadata/wave.c similarity index 100% rename from apps/metadata/wave.c rename to lib/rbcodec/metadata/wave.c diff --git a/apps/metadata/wavpack.c b/lib/rbcodec/metadata/wavpack.c similarity index 100% rename from apps/metadata/wavpack.c rename to lib/rbcodec/metadata/wavpack.c diff --git a/lib/rbcodec/rbcodec.make b/lib/rbcodec/rbcodec.make index 6da96ab..79b76b8 100644 --- a/lib/rbcodec/rbcodec.make +++ b/lib/rbcodec/rbcodec.make @@ -10,7 +10,7 @@ RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec RBCODEC_LIB = $(BUILDDIR)/lib/rbcodec/librbcodec.a RBCODEC_SRC := $(call preprocess, $(RBCODEC_DIR)/SOURCES) RBCODEC_OBJ := $(call c2obj, $(RBCODEC_SRC)) -INCLUDES += -I$(RBCODEC_DIR) -I$(RBCODEC_DIR)/dsp +INCLUDES += -I$(RBCODEC_DIR) -I$(RBCODEC_DIR)/dsp -I$(RBCODEC_DIR)/metadata OTHER_SRC += $(RBCODEC_SRC) $(BUILDDIR)/lib/rbcodec/%.o: $(RBCODEC_DIR)/%.c diff --git a/lib/rbcodec/test/Makefile b/lib/rbcodec/test/Makefile index 69ffce0..57ce377 100644 --- a/lib/rbcodec/test/Makefile +++ b/lib/rbcodec/test/Makefile @@ -11,7 +11,7 @@ APP_TYPE = sdl-app SOFTWARECODECS = yes INCLUDES = -I$(shell pwd) -INCLUDES += -I$(APPSDIR) -I$(APPSDIR)/gui -I$(APPSDIR)/metadata +INCLUDES += -I$(APPSDIR) -I$(APPSDIR)/gui INCLUDES += -I$(ROOTDIR)/firmware/export -I$(ROOTDIR)/firmware/include \ -I$(ROOTDIR)/firmware/target/hosted/sdl @@ -29,12 +29,10 @@ WARBLE_LDFLAGS = -lm -ldl $(shell sdl-config --libs) include $(ROOTDIR)/tools/functions.make include ../rbcodec.make -SRC = $(ROOTDIR)/apps/metadata.c $(ROOTDIR)/apps/replaygain.c \ - $(ROOTDIR)/firmware/common/strlcpy.c \ +SRC = $(ROOTDIR)/firmware/common/strlcpy.c \ $(ROOTDIR)/firmware/common/unicode.c \ - $(ROOTDIR)/firmware/common/structec.c $(ROOTDIR)/apps/mp3data.c \ + $(ROOTDIR)/firmware/common/structec.c \ $(ROOTDIR)/apps/fixedpoint.c $(ROOTDIR)/uisimulator/common/io.c -SRC += $(wildcard $(ROOTDIR)/apps/metadata/*.c) OBJ := $(SRC:.c=.o) OBJ := $(OBJ:.S=.o) -- 1.7.6