changeset 1312:f7244db08f40 trunk

[svn] - solve the blink issue
author nenolod
date Mon, 19 Jun 2006 14:06:54 -0700
parents 4ececb6a4acb
children 696315025220
files ChangeLog audacious/ui_fileinfo.c
diffstat 2 files changed, 17 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jun 19 10:52:13 2006 -0700
+++ b/ChangeLog	Mon Jun 19 14:06:54 2006 -0700
@@ -1,3 +1,12 @@
+2006-06-19 17:52:13 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [1534]
+  RMI support for timidity by nemo, for which he would like to credit giacomos amidi-plug detection code.
+
+  Changes:        Modified:
+  +26 -1          trunk/Plugins/Input/timidity/libtimidity/readmidi.c  
+  +32 -12         trunk/Plugins/Input/timidity/src/xmms-timidity.c  
+
+
 2006-06-19 09:29:23 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1532]
   - title streaming works again, but we aren't pushing back to the playlist quite yet
--- a/audacious/ui_fileinfo.c	Mon Jun 19 10:52:13 2006 -0700
+++ b/audacious/ui_fileinfo.c	Mon Jun 19 14:06:54 2006 -0700
@@ -172,7 +172,7 @@
 static gboolean
 filepopup_pointer_check_iter(gpointer unused)
 {
-	gint x, y, x_off = 3, y_off = 3, h, w, pos;
+	gint x, y, pos;
 	TitleInput *tuple;
 	static gint prev_x = 0, prev_y = 0, ctr = 0;
 	gboolean skip = FALSE;
@@ -210,13 +210,7 @@
 	    	}
 
 		tuple = playlist_get_tuple(pos);
-
-		gdk_window_get_pointer(NULL, &x, &y, NULL);
 		filepopup_show_for_tuple(tuple);
-		gtk_window_get_size(GTK_WINDOW(filepopup_win), &w, &h);
-		if (gdk_screen_width()-(w+3) < x) x_off = (w*-1)-3;
-		if (gdk_screen_height()-(h+3) < y) y_off = (h*-1)-3;
-		gtk_window_move(GTK_WINDOW(filepopup_win), x + x_off, y + y_off);
 	}
 
 	return TRUE;
@@ -352,6 +346,7 @@
 {
 	gchar *tmp;
 	GDir *d;
+	gint x, y, x_off = 3, y_off = 3, h, w;
 
 	if (tuple == NULL)
 		return;
@@ -393,6 +388,12 @@
 		g_dir_close(d);
 	}
 
+	gdk_window_get_pointer(NULL, &x, &y, NULL);
+	gtk_window_get_size(GTK_WINDOW(filepopup_win), &w, &h);
+	if (gdk_screen_width()-(w+3) < x) x_off = (w*-1)-3;
+	if (gdk_screen_height()-(h+3) < y) y_off = (h*-1)-3;
+	gtk_window_move(GTK_WINDOW(filepopup_win), x + x_off, y + y_off);
+
 	gtk_widget_show(filepopup_win);
 }