Revision: 2039
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2039&view=rev
Author: teuf
Date: 2008-07-06 07:04:20 -0700 (Sun, 06 Jul 2008)
Log Message:
-----------
Remove inner functions to make MSVC8 compat easier
Modified Paths:
--------------
libgpod/trunk/ChangeLog
libgpod/trunk/src/itdb_itunesdb.c
libgpod/trunk/src/itdb_track.c
Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog 2008-07-06 14:04:05 UTC (rev 2038)
+++ libgpod/trunk/ChangeLog 2008-07-06 14:04:20 UTC (rev 2039)
@@ -1,5 +1,13 @@
2008-07-06 Christophe Fergeau <[EMAIL PROTECTED]>
+ * 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 <[EMAIL PROTECTED]>
+
+ 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
Modified: libgpod/trunk/src/itdb_itunesdb.c
===================================================================
--- libgpod/trunk/src/itdb_itunesdb.c 2008-07-06 14:04:05 UTC (rev 2038)
+++ libgpod/trunk/src/itdb_itunesdb.c 2008-07-06 14:04:20 UTC (rev 2039)
@@ -5437,7 +5437,17 @@
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_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;
Modified: libgpod/trunk/src/itdb_track.c
===================================================================
--- libgpod/trunk/src/itdb_track.c 2008-07-06 14:04:05 UTC (rev 2038)
+++ libgpod/trunk/src/itdb_track.c 2008-07-06 14:04:20 UTC (rev 2039)
@@ -52,21 +52,20 @@
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};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
