Mercurial > audlegacy

changeset 2672:d992765e15ee trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - chase r4368.
author nenolod
date Tue, 10 Apr 2007 11:29:11 -0700
parents e9b379528fbc
children 82e24035fdf8
files ChangeLog src/audacious/build_stamp.c src/audacious/widgets/playlist_list.c
diffstat 3 files changed, 15 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Apr 10 11:27:26 2007 -0700
+++ b/ChangeLog	Tue Apr 10 11:29:11 2007 -0700
@@ -1,3 +1,12 @@
+2007-04-10 18:27:26 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4368]
+  - playlist_get_length_nolock() -> playlist_get_length(), no need for 
+    locking here.
+  
+  trunk/src/audacious/playlist.c |   16 ++--------------
+  1 file changed, 2 insertions(+), 14 deletions(-)
+
+
 2007-04-10 18:25:39 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [4366]
   - playlist_set_info() does not change the playlist and shouldn't block
--- a/src/audacious/build_stamp.c	Tue Apr 10 11:27:26 2007 -0700
+++ b/src/audacious/build_stamp.c	Tue Apr 10 11:29:11 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070410-4366";
+const gchar *svn_stamp = "20070410-4368";
--- a/src/audacious/widgets/playlist_list.c	Tue Apr 10 11:27:26 2007 -0700
+++ b/src/audacious/widgets/playlist_list.c	Tue Apr 10 11:29:11 2007 -0700
@@ -332,7 +332,7 @@
     if (cfg.show_numbers_in_pl) {
         gchar *pos_string = g_strdup_printf(cfg.show_separator_in_pl == TRUE ? "%d" : "%d.", ppos);
         plist_length_int =
-            gint_count_digits(playlist_get_length_nolock(playlist)) + !cfg.show_separator_in_pl + 1; /* cf.show_separator_in_pl will be 0 if false */
+            gint_count_digits(playlist_get_length(playlist)) + !cfg.show_separator_in_pl + 1; /* cf.show_separator_in_pl will be 0 if false */
 
         padding = plist_length_int;
         padding = ((padding + 1) * width_approx_digits);
@@ -626,7 +626,7 @@
 	gint x, y, plx, ply;
 
         if (cfg.show_numbers_in_pl) {
-            lpadding = gint_count_digits(playlist_get_length_nolock(playlist)) + 1;
+            lpadding = gint_count_digits(playlist_get_length(playlist)) + 1;
             lpadding = ((lpadding + 1) * width_approx_digits);
         }
         else {
@@ -635,7 +635,7 @@
 
         /* We already hold the mutex and have the playlist locked, so call
            the non-locking function. */
-        plength = playlist_get_length_nolock(playlist);
+        plength = playlist_get_length(playlist);
 
         x = pl->drag_motion_x;
         y = pl->drag_motion_y;
@@ -696,13 +696,13 @@
 
     if (cfg.show_numbers_in_pl)
     {
-        padding_plength = playlist_get_length_nolock(playlist);
+        padding_plength = playlist_get_length(playlist);
 
         if (padding_plength == 0) {
             padding_dwidth = 0;
         }
         else {
-            padding_dwidth = gint_count_digits(playlist_get_length_nolock(playlist));
+            padding_dwidth = gint_count_digits(playlist_get_length(playlist));
         }
 
         padding =