From cb6c1079caae85c1c3dd178ab4df937d45c13569 Mon Sep 17 00:00:00 2001 From: Sean Bartell Date: Fri, 24 Jun 2011 01:25:21 -0400 Subject: [PATCH 1/2] Build librbcodec with DSP and metadata. --- apps/SOURCES | 53 --------------------- apps/fracmul.h | 2 +- apps/plugins/lrcplayer.c | 2 +- lib/rbcodec/SOURCES | 53 +++++++++++++++++++++ {apps => lib/rbcodec/dsp}/dsp.c | 0 {apps => lib/rbcodec/dsp}/dsp.h | 0 {apps => lib/rbcodec/dsp}/dsp_arm.S | 0 {apps => lib/rbcodec/dsp}/dsp_arm_v6.S | 0 {apps => lib/rbcodec/dsp}/dsp_asm.h | 0 {apps => lib/rbcodec/dsp}/dsp_cf.S | 0 {apps => lib/rbcodec/dsp}/eq.c | 0 {apps => lib/rbcodec/dsp}/eq.h | 0 {apps => lib/rbcodec/dsp}/eq_arm.S | 0 {apps => lib/rbcodec/dsp}/eq_cf.S | 0 {apps => lib/rbcodec/dsp}/eqs/Acoustic.cfg | 0 {apps => lib/rbcodec/dsp}/eqs/Bass.cfg | 0 {apps => lib/rbcodec/dsp}/eqs/Classical.cfg | 0 {apps => lib/rbcodec/dsp}/eqs/Default.cfg | 0 {apps => lib/rbcodec/dsp}/eqs/Disco.cfg | 0 {apps => lib/rbcodec/dsp}/eqs/Electronic.cfg | 0 {apps => lib/rbcodec/dsp}/eqs/Hip-Hop.cfg | 0 {apps => lib/rbcodec/dsp}/eqs/Jazz.cfg | 0 {apps => lib/rbcodec/dsp}/eqs/Lounge.cfg | 0 {apps => lib/rbcodec/dsp}/eqs/Pop.cfg | 0 {apps => lib/rbcodec/dsp}/eqs/R&B.cfg | 0 {apps => lib/rbcodec/dsp}/eqs/Rock.cfg | 0 {apps => lib/rbcodec/dsp}/eqs/Vocal.cfg | 0 {apps => lib/rbcodec/dsp}/tdspeed.c | 0 {apps => lib/rbcodec/dsp}/tdspeed.h | 0 {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/ay.c | 0 {apps => lib/rbcodec}/metadata/flac.c | 0 {apps => lib/rbcodec}/metadata/gbs.c | 0 {apps => lib/rbcodec}/metadata/hes.c | 0 {apps => lib/rbcodec}/metadata/id3tags.c | 0 {apps => lib/rbcodec}/metadata/kss.c | 0 {apps => lib/rbcodec/metadata}/metadata.c | 2 +- {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/sgc.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/vgm.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 | 19 +++++++ lib/rbcodec/test/Makefile | 14 +++--- tools/buildzip.pl | 2 +- tools/database/SOURCES | 11 ++--- tools/database/database.make | 4 +- tools/root.make | 9 +++- uisimulator/uisimulator.make | 2 +- 77 files changed, 98 insertions(+), 75 deletions(-) create mode 100644 lib/rbcodec/SOURCES rename {apps => lib/rbcodec/dsp}/dsp.c (100%) rename {apps => lib/rbcodec/dsp}/dsp.h (100%) rename {apps => lib/rbcodec/dsp}/dsp_arm.S (100%) rename {apps => lib/rbcodec/dsp}/dsp_arm_v6.S (100%) rename {apps => lib/rbcodec/dsp}/dsp_asm.h (100%) rename {apps => lib/rbcodec/dsp}/dsp_cf.S (100%) rename {apps => lib/rbcodec/dsp}/eq.c (100%) rename {apps => lib/rbcodec/dsp}/eq.h (100%) rename {apps => lib/rbcodec/dsp}/eq_arm.S (100%) rename {apps => lib/rbcodec/dsp}/eq_cf.S (100%) rename {apps => lib/rbcodec/dsp}/eqs/Acoustic.cfg (100%) rename {apps => lib/rbcodec/dsp}/eqs/Bass.cfg (100%) rename {apps => lib/rbcodec/dsp}/eqs/Classical.cfg (100%) rename {apps => lib/rbcodec/dsp}/eqs/Default.cfg (100%) rename {apps => lib/rbcodec/dsp}/eqs/Disco.cfg (100%) rename {apps => lib/rbcodec/dsp}/eqs/Electronic.cfg (100%) rename {apps => lib/rbcodec/dsp}/eqs/Hip-Hop.cfg (100%) rename {apps => lib/rbcodec/dsp}/eqs/Jazz.cfg (100%) rename {apps => lib/rbcodec/dsp}/eqs/Lounge.cfg (100%) rename {apps => lib/rbcodec/dsp}/eqs/Pop.cfg (100%) rename {apps => lib/rbcodec/dsp}/eqs/R&B.cfg (100%) rename {apps => lib/rbcodec/dsp}/eqs/Rock.cfg (100%) rename {apps => lib/rbcodec/dsp}/eqs/Vocal.cfg (100%) rename {apps => lib/rbcodec/dsp}/tdspeed.c (100%) rename {apps => lib/rbcodec/dsp}/tdspeed.h (100%) 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/ay.c (100%) rename {apps => lib/rbcodec}/metadata/flac.c (100%) rename {apps => lib/rbcodec}/metadata/gbs.c (100%) rename {apps => lib/rbcodec}/metadata/hes.c (100%) rename {apps => lib/rbcodec}/metadata/id3tags.c (100%) rename {apps => lib/rbcodec}/metadata/kss.c (100%) rename {apps => lib/rbcodec/metadata}/metadata.c (99%) 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/sgc.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/vgm.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%) create mode 100644 lib/rbcodec/rbcodec.make diff --git a/apps/SOURCES b/apps/SOURCES index 26e53d1..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 @@ -169,28 +167,13 @@ pcmbuf.c codec_thread.c playback.c codecs.c -dsp.c #ifndef HAVE_HARDWARE_BEEP beep.c #endif -#ifdef HAVE_PITCHSCREEN -tdspeed.c -#endif #ifdef HAVE_RECORDING enc_config.c recorder/pcm_record.c #endif -eq.c -#if defined(CPU_COLDFIRE) -dsp_cf.S -eq_cf.S -#elif defined(CPU_ARM) -dsp_arm.S -#if ARM_ARCH >= 6 -dsp_arm_v6.S -#endif -eq_arm.S -#endif #endif #ifdef USB_ENABLE_HID usb_keymaps.c @@ -198,42 +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 -metadata/ay.c -metadata/gbs.c -metadata/hes.c -metadata/sgc.c -metadata/vgm.c -metadata/kss.c -#endif #ifdef HAVE_TAGCACHE tagcache.c #endif diff --git a/apps/fracmul.h b/apps/fracmul.h index 6aaedaf..a805a8b 100644 --- a/apps/fracmul.h +++ b/apps/fracmul.h @@ -4,7 +4,7 @@ #include #include "gcc_extensions.h" -/** FRACTIONAL MULTIPLICATION - TAKEN FROM apps/dsp.h +/** FRACTIONAL MULTIPLICATION - TAKEN FROM lib/rbcodec/dsp/dsp.h * Multiply two fixed point numbers with 31 fractional bits: * FRACMUL(x, y) * diff --git a/apps/plugins/lrcplayer.c b/apps/plugins/lrcplayer.c index a124863..1484bc2 100644 --- a/apps/plugins/lrcplayer.c +++ b/apps/plugins/lrcplayer.c @@ -1103,7 +1103,7 @@ static void load_lrc_file(void) /******************************* * read lyrics from id3 *******************************/ -/* taken from apps/metadata/mp3.c */ +/* taken from lib/rbcodec/metadata/mp3.c */ static unsigned long unsync(unsigned long b0, unsigned long b1, unsigned long b2, unsigned long b3) { diff --git a/lib/rbcodec/SOURCES b/lib/rbcodec/SOURCES new file mode 100644 index 0000000..0fca649 --- /dev/null +++ b/lib/rbcodec/SOURCES @@ -0,0 +1,53 @@ +metadata/metadata.c +metadata/id3tags.c +metadata/mp3.c +metadata/mp3data.c +#if CONFIG_CODEC == SWCODEC +dsp/dsp.c +dsp/eq.c +# ifdef HAVE_PITCHSCREEN +dsp/tdspeed.c +# endif +metadata/replaygain.c +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 +metadata/ay.c +metadata/gbs.c +metadata/hes.c +metadata/sgc.c +metadata/vgm.c +metadata/kss.c +# if defined(CPU_COLDFIRE) +dsp/dsp_cf.S +dsp/eq_cf.S +# elif defined(CPU_ARM) +dsp/dsp_arm.S +dsp/eq_arm.S +# if ARM_ARCH >= 6 +dsp/dsp_arm_v6.S +# endif +# endif +#endif diff --git a/apps/dsp.c b/lib/rbcodec/dsp/dsp.c similarity index 100% rename from apps/dsp.c rename to lib/rbcodec/dsp/dsp.c diff --git a/apps/dsp.h b/lib/rbcodec/dsp/dsp.h similarity index 100% rename from apps/dsp.h rename to lib/rbcodec/dsp/dsp.h diff --git a/apps/dsp_arm.S b/lib/rbcodec/dsp/dsp_arm.S similarity index 100% rename from apps/dsp_arm.S rename to lib/rbcodec/dsp/dsp_arm.S diff --git a/apps/dsp_arm_v6.S b/lib/rbcodec/dsp/dsp_arm_v6.S similarity index 100% rename from apps/dsp_arm_v6.S rename to lib/rbcodec/dsp/dsp_arm_v6.S diff --git a/apps/dsp_asm.h b/lib/rbcodec/dsp/dsp_asm.h similarity index 100% rename from apps/dsp_asm.h rename to lib/rbcodec/dsp/dsp_asm.h diff --git a/apps/dsp_cf.S b/lib/rbcodec/dsp/dsp_cf.S similarity index 100% rename from apps/dsp_cf.S rename to lib/rbcodec/dsp/dsp_cf.S diff --git a/apps/eq.c b/lib/rbcodec/dsp/eq.c similarity index 100% rename from apps/eq.c rename to lib/rbcodec/dsp/eq.c diff --git a/apps/eq.h b/lib/rbcodec/dsp/eq.h similarity index 100% rename from apps/eq.h rename to lib/rbcodec/dsp/eq.h diff --git a/apps/eq_arm.S b/lib/rbcodec/dsp/eq_arm.S similarity index 100% rename from apps/eq_arm.S rename to lib/rbcodec/dsp/eq_arm.S diff --git a/apps/eq_cf.S b/lib/rbcodec/dsp/eq_cf.S similarity index 100% rename from apps/eq_cf.S rename to lib/rbcodec/dsp/eq_cf.S diff --git a/apps/eqs/Acoustic.cfg b/lib/rbcodec/dsp/eqs/Acoustic.cfg similarity index 100% rename from apps/eqs/Acoustic.cfg rename to lib/rbcodec/dsp/eqs/Acoustic.cfg diff --git a/apps/eqs/Bass.cfg b/lib/rbcodec/dsp/eqs/Bass.cfg similarity index 100% rename from apps/eqs/Bass.cfg rename to lib/rbcodec/dsp/eqs/Bass.cfg diff --git a/apps/eqs/Classical.cfg b/lib/rbcodec/dsp/eqs/Classical.cfg similarity index 100% rename from apps/eqs/Classical.cfg rename to lib/rbcodec/dsp/eqs/Classical.cfg diff --git a/apps/eqs/Default.cfg b/lib/rbcodec/dsp/eqs/Default.cfg similarity index 100% rename from apps/eqs/Default.cfg rename to lib/rbcodec/dsp/eqs/Default.cfg diff --git a/apps/eqs/Disco.cfg b/lib/rbcodec/dsp/eqs/Disco.cfg similarity index 100% rename from apps/eqs/Disco.cfg rename to lib/rbcodec/dsp/eqs/Disco.cfg diff --git a/apps/eqs/Electronic.cfg b/lib/rbcodec/dsp/eqs/Electronic.cfg similarity index 100% rename from apps/eqs/Electronic.cfg rename to lib/rbcodec/dsp/eqs/Electronic.cfg diff --git a/apps/eqs/Hip-Hop.cfg b/lib/rbcodec/dsp/eqs/Hip-Hop.cfg similarity index 100% rename from apps/eqs/Hip-Hop.cfg rename to lib/rbcodec/dsp/eqs/Hip-Hop.cfg diff --git a/apps/eqs/Jazz.cfg b/lib/rbcodec/dsp/eqs/Jazz.cfg similarity index 100% rename from apps/eqs/Jazz.cfg rename to lib/rbcodec/dsp/eqs/Jazz.cfg diff --git a/apps/eqs/Lounge.cfg b/lib/rbcodec/dsp/eqs/Lounge.cfg similarity index 100% rename from apps/eqs/Lounge.cfg rename to lib/rbcodec/dsp/eqs/Lounge.cfg diff --git a/apps/eqs/Pop.cfg b/lib/rbcodec/dsp/eqs/Pop.cfg similarity index 100% rename from apps/eqs/Pop.cfg rename to lib/rbcodec/dsp/eqs/Pop.cfg diff --git a/apps/eqs/R&B.cfg b/lib/rbcodec/dsp/eqs/R&B.cfg similarity index 100% rename from apps/eqs/R&B.cfg rename to lib/rbcodec/dsp/eqs/R&B.cfg diff --git a/apps/eqs/Rock.cfg b/lib/rbcodec/dsp/eqs/Rock.cfg similarity index 100% rename from apps/eqs/Rock.cfg rename to lib/rbcodec/dsp/eqs/Rock.cfg diff --git a/apps/eqs/Vocal.cfg b/lib/rbcodec/dsp/eqs/Vocal.cfg similarity index 100% rename from apps/eqs/Vocal.cfg rename to lib/rbcodec/dsp/eqs/Vocal.cfg diff --git a/apps/tdspeed.c b/lib/rbcodec/dsp/tdspeed.c similarity index 100% rename from apps/tdspeed.c rename to lib/rbcodec/dsp/tdspeed.c diff --git a/apps/tdspeed.h b/lib/rbcodec/dsp/tdspeed.h similarity index 100% rename from apps/tdspeed.h rename to lib/rbcodec/dsp/tdspeed.h 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/ay.c b/lib/rbcodec/metadata/ay.c similarity index 100% rename from apps/metadata/ay.c rename to lib/rbcodec/metadata/ay.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/gbs.c b/lib/rbcodec/metadata/gbs.c similarity index 100% rename from apps/metadata/gbs.c rename to lib/rbcodec/metadata/gbs.c diff --git a/apps/metadata/hes.c b/lib/rbcodec/metadata/hes.c similarity index 100% rename from apps/metadata/hes.c rename to lib/rbcodec/metadata/hes.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/kss.c b/lib/rbcodec/metadata/kss.c similarity index 100% rename from apps/metadata/kss.c rename to lib/rbcodec/metadata/kss.c diff --git a/apps/metadata.c b/lib/rbcodec/metadata/metadata.c similarity index 99% rename from apps/metadata.c rename to lib/rbcodec/metadata/metadata.c index efe18a7..e3f97bd 100644 --- a/apps/metadata.c +++ b/lib/rbcodec/metadata/metadata.c @@ -29,7 +29,7 @@ #include "cuesheet.h" #include "metadata.h" -#include "metadata/metadata_parsers.h" +#include "metadata_parsers.h" #if CONFIG_CODEC == SWCODEC 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/sgc.c b/lib/rbcodec/metadata/sgc.c similarity index 100% rename from apps/metadata/sgc.c rename to lib/rbcodec/metadata/sgc.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/vgm.c b/lib/rbcodec/metadata/vgm.c similarity index 100% rename from apps/metadata/vgm.c rename to lib/rbcodec/metadata/vgm.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 new file mode 100644 index 0000000..afa289b --- /dev/null +++ b/lib/rbcodec/rbcodec.make @@ -0,0 +1,19 @@ +# __________ __ ___. +# Open \______ \ ____ ____ | | _\_ |__ _______ ___ +# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / +# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < +# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ +# \/ \/ \/ \/ \/ + +RBCODEC_LIB = $(RBCODEC_BLD)/librbcodec.a +RBCODEC_SRC := $(call preprocess, $(RBCODEC_DIR)/SOURCES) +RBCODEC_OBJ := $(call c2obj, $(RBCODEC_SRC)) +INCLUDES += -I$(RBCODEC_DIR) -I$(RBCODEC_DIR)/dsp -I$(RBCODEC_DIR)/metadata +OTHER_SRC += $(RBCODEC_SRC) + +$(RBCODEC_BLD)/%.o: $(RBCODEC_DIR)/%.c + $(SILENT)mkdir -p $(dir $@) + $(call PRINTS,CC $<)$(CC) $(CFLAGS) $(RBCODEC_CFLAGS) -c $< -o $@ + +$(RBCODEC_LIB): $(RBCODEC_OBJ) + $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null diff --git a/lib/rbcodec/test/Makefile b/lib/rbcodec/test/Makefile index 100daee..cf31e3d 100644 --- a/lib/rbcodec/test/Makefile +++ b/lib/rbcodec/test/Makefile @@ -6,12 +6,14 @@ ROOTDIR = $(shell readlink -e ../../..) BUILDDIR = $(shell pwd)/build APPSDIR = $(ROOTDIR)/apps TOOLSDIR = $(ROOTDIR)/tools +RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec +RBCODEC_BLD = $(BUILDDIR)/lib/rbcodec DEPFILE = $(BUILDDIR)/make.dep APP_TYPE = sdl-app INCLUDES = -I$(shell pwd) INCLUDES += -I$(APPSDIR) -I$(APPSDIR)/codecs -I$(APPSDIR)/codecs/lib \ - -I$(APPSDIR)/gui -I$(APPSDIR)/metadata + -I$(APPSDIR)/gui INCLUDES += -I$(ROOTDIR)/firmware/export -I$(ROOTDIR)/firmware/include \ -I$(ROOTDIR)/firmware/target/hosted/sdl @@ -29,14 +31,12 @@ WARBLE_LDFLAGS = -lm -ldl $(shell sdl-config --libs) include $(ROOTDIR)/tools/functions.make include $(APPSDIR)/codecs/codecs.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 += $(ROOTDIR)/apps/dsp.c $(ROOTDIR)/apps/eq.c $(ROOTDIR)/apps/tdspeed.c -SRC += $(wildcard $(ROOTDIR)/apps/metadata/*.c) OBJ := $(SRC:.c=.o) OBJ := $(OBJ:.S=.o) @@ -55,7 +55,7 @@ dep $(DEPFILE): -include $(DEPFILE) -warble: $(WARBLE_OBJS) $(OBJ) +warble: $(WARBLE_OBJS) $(OBJ) $(RBCODEC_LIB) $(call PRINTS,LD $@)$(CC) $(LDFLAGS) $^ -o $@ $(WARBLE_LDFLAGS) $(BUILDDIR)/%.o: %.c diff --git a/tools/buildzip.pl b/tools/buildzip.pl index ed937d4..b30ff50 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl @@ -438,7 +438,7 @@ sub buildzip { if($swcodec) { glob_mkdir("$temp_dir/eqs"); - glob_copy("$ROOT/apps/eqs/*.cfg", "$temp_dir/eqs/"); # equalizer presets + glob_copy("$ROOT/lib/rbcodec/dsp/eqs/*.cfg", "$temp_dir/eqs/"); # equalizer presets } glob_mkdir("$temp_dir/wps"); diff --git a/tools/database/SOURCES b/tools/database/SOURCES index 0abfce6..aabfc52 100644 --- a/tools/database/SOURCES +++ b/tools/database/SOURCES @@ -1,11 +1,6 @@ database.c ../../apps/fixedpoint.c -../../apps/metadata.c -#if CONFIG_CODEC == SWCODEC -../../apps/replaygain.c -#endif ../../apps/misc.c -../../apps/mp3data.c ../../apps/tagcache.c ../../firmware/common/crc32.c ../../firmware/common/filefuncs.c @@ -16,7 +11,9 @@ database.c ../../firmware/logf.c ../../uisimulator/common/io.c #if CONFIG_CODEC != SWCODEC -../../apps/metadata/id3tags.c -../../apps/metadata/mp3.c +../../lib/rbcodec/metadata/id3tags.c +../../lib/rbcodec/metadata/metadata.c +../../lib/rbcodec/metadata/mp3.c +../../lib/rbcodec/metadata/mp3data.c #endif /* Caution. metadata files do not add!! */ diff --git a/tools/database/database.make b/tools/database/database.make index 920aceb..c9d4b3c 100644 --- a/tools/database/database.make +++ b/tools/database/database.make @@ -15,7 +15,7 @@ createsrc = $(shell cat $(1) > $(3); echo "\#if CONFIG_CODEC == SWCODEC" >> $(3) echo "\#endif" >> $(3); \ echo $(3)) -METADATAS := $(subst $(ROOTDIR), ../.., $(wildcard $(ROOTDIR)/apps/metadata/*.c)) +METADATAS := $(subst $(ROOTDIR), ../.., $(wildcard $(ROOTDIR)/lib/rbcodec/metadata/*.c)) SRCFILE := $(call createsrc, $(TOOLSDIR)/database/SOURCES, \ $(METADATAS), \ @@ -28,6 +28,8 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \ -I$(ROOTDIR)/firmware/include \ -I$(ROOTDIR)/apps \ -I$(ROOTDIR)/apps/recorder \ + -I$(ROOTDIR)/lib/rbcodec \ + -I$(ROOTDIR)/lib/rbcodec/metadata \ -I$(APPSDIR) \ -I$(BUILDDIR) \ diff --git a/tools/root.make b/tools/root.make index f97588f..234e4c0 100644 --- a/tools/root.make +++ b/tools/root.make @@ -86,7 +86,10 @@ else ifneq (,$(findstring checkwps,$(APPSDIR))) else ifneq (,$(findstring database,$(APPSDIR))) include $(APPSDIR)/database.make else + RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec + RBCODEC_BLD = $(BUILDDIR)/lib/rbcodec include $(APPSDIR)/apps.make + include $(RBCODEC_DIR)/rbcodec.make include $(APPSDIR)/lang/lang.make ifdef SOFTWARECODECS @@ -181,18 +184,20 @@ $(LINKROM): $(ROMLDS) $(call PRINTS,PP $(@F)) $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) -$(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKRAM) +$(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKRAM) $$(RBCODEC_LIB) $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ -L$(BUILDDIR)/firmware -lfirmware \ -L$(BUILDDIR)/lib -lskin_parser \ + -L$(RBCODEC_BLD) -lrbcodec \ -L$(BUILDDIR)/apps/codecs $(VOICESPEEXLIB:lib%.a=-l%) \ -lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \ -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map -$(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKROM) +$(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LINKROM) $$(RBCODEC_LIB) $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ $(VOICESPEEXLIB) $(FIRMLIB) -lgcc $(GLOBAL_LDOPTS) \ -L$(BUILDDIR)/lib -lskin_parser \ + -L$(RBCODEC_BLD) -lrbcodec \ -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map $(BUILDDIR)/rockbox.bin : $(BUILDDIR)/rockbox.elf diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make index d30a9db..0e43138 100644 --- a/uisimulator/uisimulator.make +++ b/uisimulator/uisimulator.make @@ -30,7 +30,7 @@ $(SIMLIB): $$(SIMOBJ) $(UIBMP) $(SILENT)$(shell rm -f $@) $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null -$(BUILDDIR)/$(BINARY): $$(OBJ) $(SIMLIB) $(VOICESPEEXLIB) $(FIRMLIB) $(SKINLIB) +$(BUILDDIR)/$(BINARY): $$(OBJ) $(SIMLIB) $(VOICESPEEXLIB) $(FIRMLIB) $(SKINLIB) $(RBCODEC_LIB) $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) $(GLOBAL_LDOPTS) $(BUILDDIR)/uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c -- 1.7.6