diff options
-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 | |||
7 | bookmark.c | 7 | bookmark.c |
8 | debug_menu.c | 8 | debug_menu.c |
9 | filetypes.c | 9 | filetypes.c |
10 | id3.c | ||
10 | language.c | 11 | language.c |
11 | main.c | 12 | main.c |
12 | menu.c | 13 | menu.c |
@@ -17,6 +18,9 @@ menus/theme_menu.c | |||
17 | menus/eq_menu.c | 18 | menus/eq_menu.c |
18 | buffering.c | 19 | buffering.c |
19 | voice_thread.c | 20 | voice_thread.c |
21 | replaygain.c | ||
22 | #else /* !SWCODEC */ | ||
23 | mpeg.c | ||
20 | #endif | 24 | #endif |
21 | menus/main_menu.c | 25 | menus/main_menu.c |
22 | menus/playback_menu.c | 26 | 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 @@ | |||
43 | #ifndef SIMULATOR | 43 | #ifndef SIMULATOR |
44 | #include "i2c.h" | 44 | #include "i2c.h" |
45 | #include "mas.h" | 45 | #include "mas.h" |
46 | #include "dac.h" | ||
47 | #include "system.h" | 46 | #include "system.h" |
48 | #include "usb.h" | 47 | #include "usb.h" |
49 | #include "file.h" | 48 | #include "file.h" |
@@ -2864,8 +2863,10 @@ void audio_init(void) | |||
2864 | #endif /* CONFIG_CODEC == MAS3587F */ | 2863 | #endif /* CONFIG_CODEC == MAS3587F */ |
2865 | 2864 | ||
2866 | #ifdef DEBUG | 2865 | #ifdef DEBUG |
2866 | #ifndef SIMULATOR | ||
2867 | dbg_timer_start(); | 2867 | dbg_timer_start(); |
2868 | dbg_cnt2us(0); | 2868 | dbg_cnt2us(0); |
2869 | #endif /* !SIMULATOR */ | ||
2869 | #endif /* DEBUG */ | 2870 | #endif /* DEBUG */ |
2870 | } | 2871 | } |
2871 | 2872 | ||
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 | |||
2 | events.c | 2 | events.c |
3 | backlight.c | 3 | backlight.c |
4 | buffer.c | 4 | buffer.c |
5 | id3.c | ||
6 | powermgmt.c | 5 | powermgmt.c |
7 | system.c | 6 | system.c |
8 | usb.c | 7 | usb.c |
@@ -189,7 +188,6 @@ sound.c | |||
189 | #ifndef BOOTLOADER | 188 | #ifndef BOOTLOADER |
190 | general.c | 189 | general.c |
191 | pcm_sampr.c | 190 | pcm_sampr.c |
192 | replaygain.c | ||
193 | pcm.c | 191 | pcm.c |
194 | #ifdef HAVE_RECORDING | 192 | #ifdef HAVE_RECORDING |
195 | enc_base.c | 193 | enc_base.c |
@@ -202,7 +200,6 @@ pcm_record.c | |||
202 | #else /* !SWCODEC */ | 200 | #else /* !SWCODEC */ |
203 | 201 | ||
204 | #ifndef BOOTLOADER | 202 | #ifndef BOOTLOADER |
205 | mpeg.c | ||
206 | #ifndef SIMULATOR | 203 | #ifndef SIMULATOR |
207 | drivers/mas.c | 204 | drivers/mas.c |
208 | #endif /* SIMULATOR */ | 205 | #endif /* SIMULATOR */ |