Mercurial > audlegacy

changeset 2086:c547fe73f290 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - update widgetcore to new API
author nenolod
date Mon, 11 Dec 2006 04:28:00 -0800
parents 472be23d11a1
children bc47a2129067
files ChangeLog audacious/widgets/playlist_list.c audacious/widgets/playlist_slider.c
diffstat 3 files changed, 37 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Dec 11 04:19:56 2006 -0800
+++ b/ChangeLog	Mon Dec 11 04:28:00 2006 -0800
@@ -1,3 +1,12 @@
+2006-12-11 12:19:56 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3175]
+  - finish conversion to new API.
+  
+  trunk/audacious/playlist.c |  140 ++++++++++++++++++++++-----------------------
+  trunk/audacious/playlist.h |    8 +-
+  2 files changed, 75 insertions(+), 73 deletions(-)
+
+
 2006-12-11 12:08:43 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3173]
   - much closer now
--- a/audacious/widgets/playlist_list.c	Mon Dec 11 04:19:56 2006 -0800
+++ b/audacious/widgets/playlist_list.c	Mon Dec 11 04:28:00 2006 -0800
@@ -309,6 +309,7 @@
                               PlayList_List * pl)
 {
     gint nr, y;
+    Playlist *playlist = playlist_get_active();
 
     if (event->button == 1 && pl->pl_fheight &&
         widget_contains(&pl->pl_widget, event->x, event->y)) {
@@ -316,20 +317,20 @@
         y = event->y - pl->pl_widget.y;
         nr = (y / pl->pl_fheight) + pl->pl_first;
 
-        if (nr >= playlist_get_length())
-            nr = playlist_get_length() - 1;
+        if (nr >= playlist_get_length(playlist))
+            nr = playlist_get_length(playlist) - 1;
 
         if (!(event->state & GDK_CONTROL_MASK))
-            playlist_select_all(FALSE);
+            playlist_select_all(playlist, FALSE);
 
         if (event->state & GDK_SHIFT_MASK && pl->pl_prev_selected != -1) {
-            playlist_select_range(pl->pl_prev_selected, nr, TRUE);
+            playlist_select_range(playlist, pl->pl_prev_selected, nr, TRUE);
             pl->pl_prev_min = pl->pl_prev_selected;
             pl->pl_prev_max = nr;
             pl->pl_drag_pos = nr - pl->pl_first;
         }
         else {
-            if (playlist_select_invert(nr)) {
+            if (playlist_select_invert(playlist, nr)) {
                 if (event->state & GDK_CONTROL_MASK) {
                     if (pl->pl_prev_min == -1) {
                         pl->pl_prev_min = pl->pl_prev_selected;
@@ -354,7 +355,7 @@
              */
             gdk_pointer_ungrab(GDK_CURRENT_TIME);
             gdk_flush();
-            playlist_set_position(nr);
+            playlist_set_position(playlist, nr);
             if (!bmp_playback_get_playing())
                 bmp_playback_initiate();
         }
@@ -371,11 +372,12 @@
 {
     gint iy, length;
     gint ret;
+    Playlist *playlist = playlist_get_active();
 
     if (!widget_contains(WIDGET(pl), x, y) || !pl->pl_fheight)
         return -1;
 
-    if ((length = playlist_get_length()) == 0)
+    if ((length = playlist_get_length(playlist)) == 0)
         return -1;
     iy = y - pl->pl_widget.y;
 
@@ -454,15 +456,16 @@
                           guint ppos)
 {
     guint plist_length_int;
+    Playlist *playlist = playlist_get_active();
 
     PangoLayout *layout;
 
-    REQUIRE_STATIC_LOCK(playlist);
+    REQUIRE_STATIC_LOCK(playlists);
 
     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()) + !cfg.show_separator_in_pl + 1; /* cf.show_separator_in_pl will be 0 if false */
+            gint_count_digits(playlist_get_length_nolock(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);
@@ -508,6 +511,7 @@
 void
 playlist_list_draw(Widget * w)
 {
+    Playlist *playlist = playlist_get_active();
     PlayList_List *pl = PLAYLIST_LIST(w);
     GList *list;
     GdkGC *gc;
@@ -581,13 +585,13 @@
     pl->pl_fheight = (ascent + abs(descent));
     pl->pl_num_visible = height / pl->pl_fheight;
 
-    max_first = playlist_get_length() - pl->pl_num_visible;
+    max_first = playlist_get_length(playlist) - pl->pl_num_visible;
     max_first = MAX(max_first, 0);
 
     pl->pl_first = CLAMP(pl->pl_first, 0, max_first);
 
     PLAYLIST_LOCK();
-    list = playlist_get();
+    list = playlist->entries;
     list = g_list_nth(list, pl->pl_first);
 
     /* It sucks having to run the iteration twice but this is the only
@@ -641,7 +645,7 @@
 
         title = convert_title_text(title);
 
-        pos = playlist_get_queue_position(entry);
+        pos = playlist_get_queue_position(playlist, entry);
 
         tail[0] = 0;
         queuepos[0] = 0;
@@ -670,7 +674,7 @@
         else
             tail_width = width;
 
-        if (i == playlist_get_position_nolock())
+        if (i == playlist_get_position_nolock(playlist))
             gdk_gc_set_foreground(gc,
                                   skin_get_color(bmp_active_skin,
                                                  SKIN_PLEDIT_CURRENT));
@@ -766,7 +770,7 @@
 	gint x, y, plx, ply;
 
         if (cfg.show_numbers_in_pl) {
-            lpadding = gint_count_digits(playlist_get_length_nolock()) + 1;
+            lpadding = gint_count_digits(playlist_get_length_nolock(playlist)) + 1;
             lpadding = ((lpadding + 1) * width_approx_digits);
         }
         else {
@@ -775,7 +779,7 @@
 
         /* We already hold the mutex and have the playlist locked, so call
            the non-locking function. */
-        plength = playlist_get_length_nolock();
+        plength = playlist_get_length_nolock(playlist);
 
         x = pl->drag_motion_x;
         y = pl->drag_motion_y;
@@ -834,15 +838,15 @@
                           skin_get_color(bmp_active_skin,
                                          SKIN_PLEDIT_NORMAL));
 
-    if (cfg.show_numbers_in_pl) {
-
-        padding_plength = playlist_get_length_nolock();
+    if (cfg.show_numbers_in_pl)
+    {
+        padding_plength = playlist_get_length_nolock(playlist);
 
         if (padding_plength == 0) {
             padding_dwidth = 0;
         }
         else {
-            padding_dwidth = gint_count_digits(playlist_get_length_nolock());
+            padding_dwidth = gint_count_digits(playlist_get_length_nolock(playlist));
         }
 
         padding =
--- a/audacious/widgets/playlist_slider.c	Mon Dec 11 04:19:56 2006 -0800
+++ b/audacious/widgets/playlist_slider.c	Mon Dec 11 04:28:00 2006 -0800
@@ -36,13 +36,14 @@
     PlaylistSlider *ps = (PlaylistSlider *) w;
     GdkPixmap *obj;
     gint y, skinx;
+    Playlist *playlist = playlist_get_active();
 
     g_return_if_fail(ps != NULL);
     g_return_if_fail(ps->ps_list != NULL);
 
-    if (playlist_get_length() > ps->ps_list->pl_num_visible)
+    if (playlist_get_length(playlist) > ps->ps_list->pl_num_visible)
         y = (ps->ps_list->pl_first * (ps->ps_widget.height - 19)) /
-            (playlist_get_length() - ps->ps_list->pl_num_visible);
+            (playlist_get_length(playlist) - ps->ps_list->pl_num_visible);
     else
         y = 0;
 
@@ -76,10 +77,11 @@
 playlistslider_set_pos(PlaylistSlider * ps, gint y)
 {
     gint pos;
+    Playlist *playlist = playlist_get_active();
 
     y = CLAMP(y, 0, ps->ps_widget.height - 19);
 
-    pos = (y * (playlist_get_length() - ps->ps_list->pl_num_visible)) /
+    pos = (y * (playlist_get_length(playlist) - ps->ps_list->pl_num_visible)) /
         (ps->ps_widget.height - 19);
     playlistwin_set_toprow(pos);
 }