Mercurial > audlegacy

changeset 1306:d44e5df149dc trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - not sure what all of that cur_dir stuff was, but I think somebody was smoking crack
author nenolod
date Sun, 18 Jun 2006 23:58:36 -0700
parents c81735c068c6
children 63d30ae1db33
files ChangeLog audacious/ui_fileinfo.c
diffstat 2 files changed, 39 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jun 18 23:53:16 2006 -0700
+++ b/ChangeLog	Sun Jun 18 23:58:36 2006 -0700
@@ -1,3 +1,12 @@
+2006-06-19 06:53:16 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1522]
+  - fix tuple building for FLAC files
+  
+
+  Changes:        Modified:
+  +1 -1           trunk/Plugins/Input/flac/tag.c  
+
+
 2006-06-19 06:26:41 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1520]
   - this p == tuple check really fucks things up if you move back to the previous tuple after the popup has gone away
--- a/audacious/ui_fileinfo.c	Sun Jun 18 23:53:16 2006 -0700
+++ b/audacious/ui_fileinfo.c	Sun Jun 18 23:58:36 2006 -0700
@@ -67,8 +67,6 @@
 GtkWidget *fileinfo_win;
 GtkWidget *filepopup_win;
 
-gchar *cur_dir;  /* only one album image per directory, no need to look again */
-
 static void
 fileinfo_entry_set_text(const char *entry, const char *text)
 {
@@ -321,29 +319,25 @@
 	if (tuple->track_number != 0)
 		fileinfo_entry_set_text_free("entry_track", g_strdup_printf("%d", tuple->track_number));
 
-	if (!cur_dir || strcmp(cur_dir,tuple->file_path) != 0)
+	d = g_dir_open(tuple->file_path, 0, NULL);
+	if (d)
 	{	
-		cur_dir = tuple->file_path;
-		d = g_dir_open(cur_dir,0,NULL);
-		if (d)
-		{	
-			const gchar *f = g_dir_read_name(d);
-			while(f)
+		const gchar *f = g_dir_read_name(d);
+		while(f)
+		{
+			/* ok. why did I not have strcasestr, thought glib had that one */
+			if (strstr(f,".jpg") || strstr(f,".jpeg") || strstr(f,".png") || strstr(f,".JPG") || strstr(f,".JPEG") || strstr(f,".PNG"))
 			{
-				/* ok. why did I not have strcasestr, thought glib had that one */
-				if (strstr(f,".jpg") || strstr(f,".jpeg") || strstr(f,".png") || strstr(f,".JPG") || strstr(f,".JPEG") || strstr(f,".PNG"))
-				{
-					tmp = g_strdup_printf("%s/%s", cur_dir, f);
-					fileinfo_entry_set_image("image_artwork", tmp);
-					f = NULL;
-				}
-				else
-				{
-					f = g_dir_read_name(d);
-				}
+				tmp = g_strdup_printf("%s/%s", tuple->file_path, f);
+				fileinfo_entry_set_image("image_artwork", tmp);
+				f = NULL;
 			}
-			g_dir_close(d);
+			else
+			{
+				f = g_dir_read_name(d);
+			}
 		}
+		g_dir_close(d);
 	}
 
 	gtk_widget_show(fileinfo_win);
@@ -372,29 +366,25 @@
 	if (tuple->track_number != 0)
 		filepopup_entry_set_text_free("label_track", g_strdup_printf("%d", tuple->track_number));
 
-	if (!cur_dir || strcmp(cur_dir,tuple->file_path)!=0)
+	d = g_dir_open(tuple->file_path, 0, NULL);
+	if (d)
 	{	
-		cur_dir = tuple->file_path;
-		d = g_dir_open(cur_dir,0,NULL);
-		if (d)
-		{	
-			const gchar *f = g_dir_read_name(d);
-			while(f)
+		const gchar *f = g_dir_read_name(d);
+		while(f)
+		{
+			/* ok. why did I not have strcasestr, thought glib had that one */
+			if (strstr(f,".jpg") || strstr(f,".jpeg") || strstr(f,".png") || strstr(f,".JPG") || strstr(f,".JPEG") || strstr(f,".PNG"))
 			{
-				/* ok. why did I not have strcasestr, thought glib had that one */
-				if (strstr(f,".jpg") || strstr(f,".jpeg") || strstr(f,".png") || strstr(f,".JPG") || strstr(f,".JPEG") || strstr(f,".PNG"))
-				{
-					tmp = g_strdup_printf("%s/%s", cur_dir, f);
-					filepopup_entry_set_image("image_artwork", tmp);
-					f = NULL;
-				}
-				else
-				{
-					f = g_dir_read_name(d);
-				}
+				tmp = g_strdup_printf("%s/%s", tuple->file_path, f);
+				filepopup_entry_set_image("image_artwork", tmp);
+				f = NULL;
 			}
-			g_dir_close(d);
+			else
+			{
+				f = g_dir_read_name(d);
+			}
 		}
+		g_dir_close(d);
 	}
 
 	gtk_widget_show(filepopup_win);