diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2008-10-10 13:12:28 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2008-10-10 13:12:28 +0000 |
| commit | e76c69f3e4b9075db979145a60157d8cd968f537 (patch) | |
| tree | 84ac8d57c687d1fdd10d8f205aa83a048edfd875 | |
| parent | 98fa3913f9618a09269e9ab39abb9a53274f5676 (diff) | |
| download | rockbox-e76c69f3e4b9075db979145a60157d8cd968f537.tar.gz rockbox-e76c69f3e4b9075db979145a60157d8cd968f537.zip | |
Moved id3.c, mpeg.c and replaygain.c from firmware/ to apps/. This is the first step in separating the generic metadata code and the id3-specific code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18760 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/SOURCES | 4 | ||||
| -rw-r--r-- | apps/id3.c (renamed from firmware/id3.c) | 0 | ||||
| -rw-r--r-- | apps/mpeg.c (renamed from firmware/mpeg.c) | 3 | ||||
| -rw-r--r-- | apps/replaygain.c (renamed from firmware/replaygain.c) | 0 | ||||
| -rw-r--r-- | firmware/SOURCES | 3 |
5 files changed, 6 insertions, 4 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index eb09797719..7622b416f7 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -7,6 +7,7 @@ abrepeat.c bookmark.c debug_menu.c filetypes.c +id3.c language.c main.c menu.c @@ -17,6 +18,9 @@ menus/theme_menu.c menus/eq_menu.c buffering.c voice_thread.c +replaygain.c +#else /* !SWCODEC */ +mpeg.c #endif menus/main_menu.c menus/playback_menu.c diff --git a/firmware/id3.c b/apps/id3.c index c1541e30df..c1541e30df 100644 --- a/firmware/id3.c +++ b/apps/id3.c diff --git a/firmware/mpeg.c b/apps/mpeg.c index 2503ba11e0..2c65e46060 100644 --- a/firmware/mpeg.c +++ b/apps/mpeg.c @@ -43,7 +43,6 @@ #ifndef SIMULATOR #include "i2c.h" #include "mas.h" -#include "dac.h" #include "system.h" #include "usb.h" #include "file.h" @@ -2864,8 +2863,10 @@ void audio_init(void) #endif /* CONFIG_CODEC == MAS3587F */ #ifdef DEBUG +#ifndef SIMULATOR dbg_timer_start(); dbg_cnt2us(0); +#endif /* !SIMULATOR */ #endif /* DEBUG */ } diff --git a/firmware/replaygain.c b/apps/replaygain.c index e160a1b23d..e160a1b23d 100644 --- a/firmware/replaygain.c +++ b/apps/replaygain.c diff --git a/firmware/SOURCES b/firmware/SOURCES index 6717ccaf93..4ac32bf853 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -2,7 +2,6 @@ ata_idle_notify.c events.c backlight.c buffer.c -id3.c powermgmt.c system.c usb.c @@ -189,7 +188,6 @@ sound.c #ifndef BOOTLOADER general.c pcm_sampr.c -replaygain.c pcm.c #ifdef HAVE_RECORDING enc_base.c @@ -202,7 +200,6 @@ pcm_record.c #else /* !SWCODEC */ #ifndef BOOTLOADER -mpeg.c #ifndef SIMULATOR drivers/mas.c #endif /* SIMULATOR */ |