Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6593/src
Modified Files:
display.h display_songs.c
Log Message:
* src/display_songs.c (tm_get_nr_of_tracks): speed up counting
of displayed tracks by using
gtk_tree_model_iter_n_children() instead of actually
counting. Thanks to Clarke Brunsdon for the patch.
Index: display.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.h,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- display.h 21 Sep 2006 15:03:13 -0000 1.116
+++ display.h 21 Oct 2006 10:21:53 -0000 1.117
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-21 23:12:28 jcs>
+/* Time-stamp: <2006-10-21 19:15:20 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -317,7 +317,7 @@
T_item item,
gboolean force_update);
void tm_add_track_to_track_model (Track *track, GtkTreeIter *into_iter);
-guint tm_get_nr_of_tracks(void);
+gint tm_get_nr_of_tracks(void);
void tm_rows_reordered(void);
gboolean tm_add_filelist (gchar *data, GtkTreePath *path,
GtkTreeViewDropPosition pos);
Index: display_songs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_songs.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- display_songs.c 21 Sep 2006 15:03:13 -0000 1.112
+++ display_songs.c 21 Oct 2006 10:21:53 -0000 1.113
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-23 23:52:48 jcs>
+/* Time-stamp: <2006-10-21 19:15:12 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -1149,25 +1149,18 @@
* currently in the track model Returns - the number of tracks displayed
* currently
*/
-guint
+gint
tm_get_nr_of_tracks(void)
{
- GtkTreeIter i;
- guint result = 0;
- gboolean valid = FALSE;
+ gint result = 0;
GtkTreeModel *tm = NULL;
- if((tm = gtk_tree_view_get_model(GTK_TREE_VIEW(track_treeview))))
+ tm = gtk_tree_view_get_model (GTK_TREE_VIEW(track_treeview));
+ if (tm)
{
- if((valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(tm),&i)))
- {
- result++;
- while((valid = gtk_tree_model_iter_next(tm,&i)))
- result++;
- }
+ result = gtk_tree_model_iter_n_children (tm, NULL);
}
- return(result);
-
+ return result;
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
