* itdb_playlist.c: simplified API for itdb_spl_update() and

	  itdb_splr_eval()


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

3 files changed, 29 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d7a324..0296bc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2005-11-13  Jorg Schuler <jcsjcs at users.sourceforge.net>
+2005-11-19  Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* itdb_playlist.c: simplified API for itdb_spl_update() and
+	  itdb_splr_eval()
+
+2005-11-17  Jorg Schuler <jcsjcs at users.sourceforge.net>
 
         * configure.ac: check for version 2.4 of glib -- now we need to
 	  make sure that libgpod actually works with 2.4...
diff --git a/src/itdb.h b/src/itdb.h
index 4312c95..ee5a9af 100644
--- a/src/itdb.h
+++ b/src/itdb.h
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-13 14:58:18 jcs>
+/* Time-stamp: <2005-11-19 15:41:45 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -48,6 +48,12 @@
 
 G_BEGIN_DECLS
 
+/* G_GNUC_INTERNAL is defined in glib 2.6 */
+#ifndef G_GNUC_INTERNAL
+#define G_GNUC_INTERNAL
+#endif 
+
+
 /* one star is how much (track->rating) */
 #define ITDB_RATING_STEP 20
 
@@ -721,8 +727,8 @@ SPLRule *itdb_splr_new (void);
 void itdb_splr_add (Itdb_Playlist *pl, SPLRule *splr, gint pos);
 SPLRule *itdb_splr_add_new (Itdb_Playlist *pl, gint pos);
 void itdb_spl_copy_rules (Itdb_Playlist *dest, Itdb_Playlist *src);
-gboolean itdb_splr_eval (Itdb_iTunesDB *itdb, SPLRule *splr, Itdb_Track *track);
-void itdb_spl_update (Itdb_iTunesDB *itdb, Itdb_Playlist *spl);
+gboolean itdb_splr_eval (SPLRule *splr, Itdb_Track *track);
+void itdb_spl_update (Itdb_Playlist *spl);
 void itdb_spl_update_all (Itdb_iTunesDB *itdb);
 
 /* thumbnails functions */
diff --git a/src/itdb_playlist.c b/src/itdb_playlist.c
index e8a6f18..241ff11 100644
--- a/src/itdb_playlist.c
+++ b/src/itdb_playlist.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-10-16 01:30:04 jcs>
+/* Time-stamp: <2005-11-19 15:43:07 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -269,7 +269,8 @@ SPLActionType itdb_splr_get_action_type (const SPLRule *splr)
 
 
 /* function to evaluate a rule's truth against a track */
-gboolean itdb_splr_eval (Itdb_iTunesDB *itdb, SPLRule *splr, Itdb_Track *track)
+/* track->itdb must be set. */
+gboolean itdb_splr_eval (SPLRule *splr, Itdb_Track *track)
 {
     SPLFieldType ft;
     SPLActionType at;
@@ -281,8 +282,9 @@ gboolean itdb_splr_eval (Itdb_iTunesDB *itdb, SPLRule *splr, Itdb_Track *track)
     time_t t;
     guint64 mactime;
 
-    g_return_val_if_fail (splr != NULL, FALSE);
-    g_return_val_if_fail (track != NULL, FALSE);
+    g_return_val_if_fail (splr, FALSE);
+    g_return_val_if_fail (track, FALSE);
+    g_return_val_if_fail (track->itdb, FALSE);
 
     ft = itdb_splr_get_field_type (splr);
     at = itdb_splr_get_action_type (splr);
@@ -359,7 +361,7 @@ gboolean itdb_splr_eval (Itdb_iTunesDB *itdb, SPLRule *splr, Itdb_Track *track)
 	datecomp = track->time_played;
 	break;
     case SPLFIELD_PLAYLIST:
-	playcomp = itdb_playlist_by_id (itdb, splr->fromvalue);
+	playcomp = itdb_playlist_by_id (track->itdb, splr->fromvalue);
 	break;
     default: /* unknown field type */
 	g_return_val_if_fail (FALSE, FALSE);
@@ -573,13 +575,16 @@ void itdb_playlist_randomize (Itdb_Playlist *pl)
 }
 
 
-void itdb_spl_update (Itdb_iTunesDB *itdb, Itdb_Playlist *spl)
+void itdb_spl_update (Itdb_Playlist *spl)
 {
     GList *gl;
+    Itdb_iTunesDB *itdb;
     GList *sel_tracks = NULL;
 
     g_return_if_fail (spl);
-    g_return_if_fail (itdb);
+    g_return_if_fail (spl->itdb);
+
+    itdb = spl->itdb;
 
     /* we only can populate smart playlists */
     if (!spl->is_spl) return;
@@ -614,7 +619,7 @@ void itdb_spl_update (Itdb_iTunesDB *itdb, Itdb_Playlist *spl)
 	    for (gl=spl->splrules.rules; gl; gl=gl->next)
 	    {
 		SPLRule* splr = gl->data;
-		gboolean ruletruth = itdb_splr_eval (itdb, splr, t);
+		gboolean ruletruth = itdb_splr_eval (splr, t);
 		if (spl->splrules.match_operator == SPLMATCH_AND)
 		{
 		    if (!ruletruth)
@@ -786,7 +791,7 @@ void itdb_spl_update_all (Itdb_iTunesDB *itdb)
     void spl_update (Itdb_Playlist *playlist, Itdb_iTunesDB *itdb)
     {
 	g_return_if_fail (playlist);
-	itdb_spl_update (itdb, playlist);
+	itdb_spl_update (playlist);
     }
 
     g_return_if_fail (itdb);