changeset 1753:01df1ea5feae trunk

[svn] Mute while seeking for playback resume, tighten the loop. We want a responsive GUI ASAP.
author chainsaw
date Thu, 21 Sep 2006 13:24:48 -0700
parents be1c5774f675
children bb03a9e6180e
files ChangeLog audacious/main.c
diffstat 2 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Sep 20 01:13:06 2006 -0700
+++ b/ChangeLog	Thu Sep 21 13:24:48 2006 -0700
@@ -1,3 +1,12 @@
+2006-09-20 08:13:06 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2441]
+  - fix a memory leak in util_run_filebrowser()
+  
+
+  Changes:        Modified:
+  +8 -4           trunk/audacious/util.c  
+
+
 2006-09-20 08:08:15 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2439]
   - properly free the path to skin.hints once we locate it
--- a/audacious/main.c	Wed Sep 20 01:13:06 2006 -0700
+++ b/audacious/main.c	Thu Sep 21 13:24:48 2006 -0700
@@ -1133,15 +1133,19 @@
 	if (cfg.resume_playback_on_startup) {
 		if (cfg.resume_playback_on_startup_time != -1 && playlist_get_length() > 0) {
 			int i;
+			gint l=0, r=0;
 			while (gtk_events_pending()) gtk_main_iteration();
+			output_get_volume(&l, &r);
+			output_set_volume(0,0);
 			bmp_playback_initiate();
-			for (i = 0; i < 8; i++) {
-				g_usleep(10000);
+			for (i = 0; i < 20; i++) { /* Busy wait; loop is fairly tight to minimize duration of "frozen" GUI. Feel free to tune. --chainsaw */
+				g_usleep(1000);
 				if (!ip_data.playing)
 					break;
 			}
 			bmp_playback_seek(cfg.resume_playback_on_startup_time /
 					  1000);
+			output_set_volume(l, r);
 		}
 	}