Remove inner functions to make MSVC8 compat easier

git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@2039 f01d2545-417e-4e96-918e-98f8d0dbbcb6

3 files changed, 28 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index bfc9b95..02916e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-07-06  Christophe Fergeau <teuf@gnome.org>
 
+	* src/itdb_itunesdb.c
+	* src/itdb_track.c: get rid of inner functions since it is a gcc
+	specific extension and MSVC8 doesn't like that
+
+2008-07-05  Christophe Fergeau <teuf@gnome.org>
+
+	Patch from: Songbird (http://getsongbird.com/)
+
 	* src/db-artwork-parser.c
 	* src/db-parse-context.c
 	* src/db-parse-context.h: get rid of unused argument to
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index a6ef6d2..6bbba84 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -5437,7 +5437,17 @@ gboolean itdb_shuffle_write (Itdb_iTunesDB *itdb, GError **error)
     return result;
 }
 
-
+/* helper function */
+static gboolean haystack (gchar *filetype, gchar **desclist)
+{
+    gchar **dlp;
+    if (!filetype || !desclist) return FALSE;
+    for (dlp=desclist; *dlp; ++dlp)
+    {
+        if (strstr (filetype, *dlp)) return TRUE;
+    }
+    return FALSE;
+}
 /**
  * itdb_shuffle_write_file:
  * @itdb: the #Itdb_iTunesDB to write to disk
@@ -5452,18 +5462,6 @@ gboolean itdb_shuffle_write (Itdb_iTunesDB *itdb, GError **error)
 gboolean itdb_shuffle_write_file (Itdb_iTunesDB *itdb,
 				  const gchar *filename, GError **error)
 {
-    auto gboolean haystack (gchar *filetype, gchar **desclist);
-    gboolean haystack (gchar *filetype, gchar **desclist)
-    {
-	gchar **dlp;
-	if (!filetype || !desclist) return FALSE;
-	for (dlp=desclist; *dlp; ++dlp)
-	{
-	    if (strstr (filetype, *dlp)) return TRUE;
-	}
-	return FALSE;
-    }
-
     FExport *fexp;
     GList *gl;
     WContents *cts;
diff --git a/src/itdb_track.c b/src/itdb_track.c
index ff8ff4f..c7ed9e6 100644
--- a/src/itdb_track.c
+++ b/src/itdb_track.c
@@ -52,21 +52,20 @@ Itdb_Track *itdb_track_new (void)
     return track;
 }
 
-/* Attempt to set some of the unknowns to reasonable defaults */
-static void itdb_track_set_defaults (Itdb_Track *tr)
+static gboolean haystack (gchar *filetype, gchar **desclist)
 {
-    auto gboolean haystack (gchar *filetype, gchar **desclist);
-    gboolean haystack (gchar *filetype, gchar **desclist)
+    gchar **dlp;
+    if (!filetype || !desclist) return FALSE;
+    for (dlp=desclist; *dlp; ++dlp)
     {
-	gchar **dlp;
-	if (!filetype || !desclist) return FALSE;
-	for (dlp=desclist; *dlp; ++dlp)
-	{
 	    if (strstr (filetype, *dlp)) return TRUE;
-	}
-	return FALSE;
     }
+    return FALSE;
+}
 
+/* Attempt to set some of the unknowns to reasonable defaults */
+static void itdb_track_set_defaults (Itdb_Track *tr)
+{
     gchar *mp3_desc[] = {"MPEG", "MP3", "mpeg", "mp3", NULL};
     gchar *mp4_desc[] = {"AAC", "MP4", "aac", "mp4", NULL};
     gchar *audible_subdesc[] = {"Audible", "audible", "Book", "book", NULL};