changeset 3246:2127f7108033

- fixed some cases where the playlist wasn't redrawn - removed two g_cond_signal(cond_scan) calls to fix gui freezes
author mf0102 <0102@gmx.at>
date Sat, 04 Aug 2007 16:48:06 +0200
parents 75a62e429534
children e21930ccd5a8
files src/audacious/playlist.c src/audacious/ui_playlist.c src/audacious/ui_skinned_playlist_slider.c
diffstat 3 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/playlist.c	Sat Aug 04 14:28:19 2007 +0200
+++ b/src/audacious/playlist.c	Sat Aug 04 16:48:06 2007 +0200
@@ -1175,9 +1175,8 @@
 
     if (restart_playing)
         playback_initiate();
-    else {
-        playlistwin_update_list(playlist);
-    }
+
+    playlistwin_update_list(playlist);
 }
 
 void
@@ -1411,7 +1410,7 @@
         /* Shuffling and this is our first manual jump. */
         playlist_position_before_jump = playlist->position;
     }
-		
+
     playlist->position = node->data;
     PLAYLIST_UNLOCK(playlist->mutex);
     playlist_check_pos_current(playlist);
@@ -1443,7 +1442,7 @@
         playlist->position = playlist_position_before_jump;
         playlist_position_before_jump = NULL;
     }
-		
+
     plist_pos_list = find_playlist_position_list(playlist);
 
     if (cfg.no_playlist_advance) {
--- a/src/audacious/ui_playlist.c	Sat Aug 04 14:28:19 2007 +0200
+++ b/src/audacious/ui_playlist.c	Sat Aug 04 16:48:06 2007 +0200
@@ -996,7 +996,8 @@
     if (event->direction == GDK_SCROLL_UP)
         playlistwin_scroll(-cfg.scroll_pl_by);
 
-    g_cond_signal(cond_scan);
+    // deactivating this fixed a gui freeze when scrolling. -- mf0102
+    //g_cond_signal(cond_scan);
 
 }
 
@@ -1239,6 +1240,7 @@
             if (!playback_get_playing())
                 playback_initiate();
         }
+        refresh = TRUE;
         break;
     case GDK_3:
         if (event->state & GDK_CONTROL_MASK)
@@ -1287,7 +1289,8 @@
     }
 
     if (refresh) {
-        g_cond_signal(cond_scan);
+        // fixes keyboard scrolling gui freeze for me. -- mf0102
+        //g_cond_signal(cond_scan);
         playlistwin_update_list(playlist_get_active());
     }
 
--- a/src/audacious/ui_skinned_playlist_slider.c	Sat Aug 04 14:28:19 2007 +0200
+++ b/src/audacious/ui_skinned_playlist_slider.c	Sat Aug 04 16:48:06 2007 +0200
@@ -296,7 +296,6 @@
         }
         gtk_widget_queue_draw(widget);
     }
-
     return TRUE;
 }