From 84dc8d2c7ea58e15b624a7fbc26d5c48ab6c9c0c Mon Sep 17 00:00:00 2001
From: Nils Wallménius <nils@rockbox.org>
Date: Sat, 12 Apr 2008 13:25:16 +0000
Subject: Move a function to gwps-common.c because it belongs there

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17084 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/gwps-common.c | 11 ++++++++++-
 firmware/export/id3.h  |  1 -
 firmware/id3.c         | 17 ++++-------------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 2e0afab1ee..8fc1f36484 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -698,6 +698,15 @@ static void draw_player_fullbar(struct gui_wps *gwps, char* buf, int buf_size)
 
 #endif /* HAVE_LCD_CHARCELL */
 
+static char* get_codectype(const struct mp3entry* id3)
+{
+    if (id3->codectype < AFMT_NUM_CODECS) {
+        return (char*)audio_formats[id3->codectype].label;
+    } else {
+        return NULL;
+    }
+}
+
 /* Extract a part from a path.
  *
  * buf      - buffer extract part to.
@@ -983,7 +992,7 @@ static char *get_token_value(struct gui_wps *gwps,
                 else
                     *intval = id3->codectype;
             }
-            return id3_get_codec(id3);
+            return get_codectype(id3);
 
         case WPS_TOKEN_FILE_FREQUENCY:
             snprintf(buf, buf_size, "%ld", id3->frequency);
diff --git a/firmware/export/id3.h b/firmware/export/id3.h
index 8b2d02ea30..8aaf76f73c 100644
--- a/firmware/export/id3.h
+++ b/firmware/export/id3.h
@@ -232,7 +232,6 @@ enum {
 bool get_mp3_metadata(int fd, struct mp3entry *entry, const char *filename);
 bool mp3info(struct mp3entry *entry, const char *filename);
 char* id3_get_num_genre(unsigned int genre_num);
-char* id3_get_codec(const struct mp3entry* id3);
 int getid3v2len(int fd);
 void adjust_mp3entry(struct mp3entry *entry, void *dest, const void *orig);
 void copy_mp3entry(struct mp3entry *dest, const struct mp3entry *orig);
diff --git a/firmware/id3.c b/firmware/id3.c
index d63acbb8aa..181ce97c6c 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -143,10 +143,10 @@ const int afmt_rec_format[AFMT_NUM_CODECS] =
 #endif /* CONFIG_CODEC == SWCODEC && defined (HAVE_RECORDING) */
 /****/
 
-unsigned long unsync(unsigned long b0,
-                     unsigned long b1,
-                     unsigned long b2,
-                     unsigned long b3)
+static unsigned long unsync(unsigned long b0,
+                            unsigned long b1,
+                            unsigned long b2,
+                            unsigned long b3)
 {
    return (((long)(b0 & 0x7F) << (3*7)) |
            ((long)(b1 & 0x7F) << (2*7)) |
@@ -199,15 +199,6 @@ static bool id3_is_genre_string(const char *string)
              string <= genres[sizeof(genres)/sizeof(char*) - 1] );
 }
 
-char* id3_get_codec(const struct mp3entry* id3)
-{
-    if (id3->codectype < AFMT_NUM_CODECS) {
-        return (char*)audio_formats[id3->codectype].label;
-    } else {
-        return NULL;
-    }
-}
-
 /*
     HOW TO ADD ADDITIONAL ID3 VERSION 2 TAGS
     Code and comments by Thomas Paul Diffenbach
-- 
cgit v1.2.3