Split id3.c/h into metadata.c/h and metadata/mp3.c. Updated all references. Moved mp3data.c/h from firmware to apps.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18814 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 7 insertions, 6 deletions

diff --git a/apps/recorder/albumart.c b/apps/recorder/albumart.c
index 29a1ed39e9..30a4e0c49f 100644
--- a/apps/recorder/albumart.c
+++ b/apps/recorder/albumart.c
@@ -23,7 +23,7 @@
 #include "sprintf.h"
 #include "system.h"
 #include "albumart.h"
-#include "id3.h"
+#include "metadata.h"
 #include "gwps.h"
 #include "buffering.h"
 #include "dircache.h"
diff --git a/apps/recorder/albumart.h b/apps/recorder/albumart.h
index e7033c19e9..52e7c74c02 100644
--- a/apps/recorder/albumart.h
+++ b/apps/recorder/albumart.h
@@ -25,7 +25,7 @@
 #ifdef HAVE_ALBUMART
 
 #include <stdbool.h>
-#include "id3.h"
+#include "metadata.h"
 #include "gwps.h"
 
 /* Look for albumart bitmap in the same dir as the track and in its parent dir.
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c
index c4f18e82ff..0b48c125d1 100644
--- a/apps/recorder/icons.c
+++ b/apps/recorder/icons.c
@@ -28,7 +28,7 @@
 
 #include "settings.h"
 
-#include "id3.h"
+#include "metadata.h"
 #include "icons.h"
 
 const unsigned char bitmap_icons_5x8[][5] =
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h
index dca5f29c90..767e0f2a14 100644
--- a/apps/recorder/icons.h
+++ b/apps/recorder/icons.h
@@ -24,6 +24,7 @@
 #ifndef PLUGIN
 
 #include <lcd.h>
+#include "metadata.h"
 
 #ifdef HAVE_LCD_BITMAP
 
@@ -88,7 +89,7 @@ enum Glyphs_4x8 {
 extern const unsigned char bitmap_glyphs_4x8[Glyph_4x8Last][4];
 
 #define BM_MPA_L3_M_WIDTH 6
-#ifdef ID3_H
+
 /* This enum is redundant but sort of in keeping with the style */
 enum rec_format_18x8 {
     Format_18x8_AIFF    = REC_FORMAT_AIFF,
@@ -98,7 +99,7 @@ enum rec_format_18x8 {
     Format_18x8Last     = REC_NUM_FORMATS
 };
 extern const unsigned char bitmap_formats_18x8[Format_18x8Last][18];
-#endif /* ID3_H */
+
 #endif /* CONFIG_CODEC == SWCODEC && defined (HAVE_RECORDING) */
 
 extern const unsigned char bitmap_icons_5x8[Icon5x8Last][5];
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c
index b1ea535470..da4e9b7255 100644
--- a/apps/recorder/pcm_record.c
+++ b/apps/recorder/pcm_record.c
@@ -30,7 +30,7 @@
 #include "general.h"
 #include "audio.h"
 #include "sound.h"
-#include "id3.h"
+#include "metadata.h"
 #ifdef HAVE_SPDIF_IN
 #include "spdif.h"
 #endif