[gtpd-cvs] [gtkpod] Revert "Don't track count of saved files anymore."

[Javier Kohen]

commit 43abe6dabf230ac062e19dd9eba7aa69cf8e9461
Author: Javier Kohen <jko...@users.sourceforge.net>
Date:   Mon Mar 7 21:42:45 2011 +0100

    Revert "Don't track count of saved files anymore."
    
    This reverts commit 63c1dab53811675bf084d1b9194987d35b204c53.

 libgtkpod/file.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/libgtkpod/file.c b/libgtkpod/file.c
index df13135..7efa915 100644
--- a/libgtkpod/file.c
+++ b/libgtkpod/file.c
@@ -304,8 +304,8 @@ add_playlist_by_filename(iTunesDB *itdb, gchar *plfile, 
Playlist *plitem, gint p
  \*------------------------------------------------------------------*/
 
 
-static gboolean add_directory_by_name_internal(GTime *last_save_time, iTunesDB 
*itdb, gchar *name, Playlist *plitem, gboolean descend, AddTrackFunc 
addtrackfunc, gpointer data) {
-    gboolean result = FALSE;
+static gint add_directory_by_name_internal(GTime *last_save_time, iTunesDB 
*itdb, gchar *name, Playlist *plitem, gboolean descend, gint *filecount, 
AddTrackFunc addtrackfunc, gpointer data) {
+    gint result = 0;
 
     g_return_val_if_fail (itdb, 0);
     g_return_val_if_fail (name, 0);
@@ -320,7 +320,7 @@ static gboolean add_directory_by_name_internal(GTime 
*last_save_time, iTunesDB *
                 if (next != NULL) {
                     gchar *nextfull = g_build_filename(name, next, NULL);
                     if (descend || !g_file_test(nextfull, G_FILE_TEST_IS_DIR)) 
{
-                       result |= 
add_directory_by_name_internal(last_save_time, itdb, nextfull, plitem, descend, 
addtrackfunc, data);
+                       result += 
add_directory_by_name_internal(last_save_time, itdb, nextfull, plitem, descend, 
filecount, addtrackfunc, data);
                     }
                     g_free(nextfull);
                 }
@@ -333,9 +333,10 @@ static gboolean add_directory_by_name_internal(GTime 
*last_save_time, iTunesDB *
     }
     else {
         if (add_track_by_filename(itdb, name, plitem, descend, addtrackfunc, 
data)) {
+            *filecount = *filecount + 1;
             gp_save_if_needed(last_save_time, itdb);
         }
-        result = TRUE;
+        result += *filecount;
     }
     return result;
 }
@@ -357,9 +358,10 @@ static gboolean add_directory_by_name_internal(GTime 
*last_save_time, iTunesDB *
  */
 /* */
 gint add_directory_by_name(iTunesDB *itdb, gchar *name, Playlist *plitem, 
gboolean descend, AddTrackFunc addtrackfunc, gpointer data) {
-    /* Uses internal method to pass around the last save time. */
+    /* Uses internal method so that a count parameter can be added for saving 
purposes. */
+    gint filecount = 0;
     GTime last_save_time = (GTime) time(NULL);
-    return add_directory_by_name_internal(&last_save_time, itdb, name, plitem, 
descend, addtrackfunc, data);
+    return add_directory_by_name_internal(&last_save_time, itdb, name, plitem, 
descend, &filecount, addtrackfunc, data);
 }
 
 /*------------------------------------------------------------------*\

------------------------------------------------------------------------------
What You Don't Know About Data Connectivity CAN Hurt You
This paper provides an overview of data connectivity, details
its effect on application quality, and explores various alternative
solutions. http://p.sf.net/sfu/progress-d2d
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2