# HG changeset patch
# User nenolod
# Date 1150437495 25200
# Node ID feff5a622f06c406447ebd3a265728c1c672d358
# Parent  681b629322c43a694726e5cda53255761509bec2
[svn] - improvements

diff -r 681b629322c4 -r feff5a622f06 ChangeLog
--- a/ChangeLog	Thu Jun 15 22:23:39 2006 -0700
+++ b/ChangeLog	Thu Jun 15 22:58:15 2006 -0700
@@ -1,3 +1,13 @@
+2006-06-16 05:23:39 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1452]
+  - hook up fileinfo box stuff
+  
+
+  Changes:        Modified:
+  +38 -7          trunk/audacious/playlist.c  
+  +1 -1           trunk/audacious/ui_fileinfo.c  
+
+
 2006-06-16 05:15:56 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1450]
   - generic info box support
diff -r 681b629322c4 -r feff5a622f06 audacious/playlist.c
--- a/audacious/playlist.c	Thu Jun 15 22:23:39 2006 -0700
+++ b/audacious/playlist.c	Thu Jun 15 22:58:15 2006 -0700
@@ -2134,13 +2134,18 @@
     {
         if (entry->decoder != NULL && entry->decoder->file_info_box == NULL)
             fileinfo_show_for_tuple(tuple);
+        else if (entry->decoder != NULL && entry->decoder->file_info_box != NULL)
+            entry->decoder->file_info_box(path);
         else
             fileinfo_show_for_path(path);
         g_free(path);
     }
     else if (path != NULL)
     {
-        fileinfo_show_for_path(path);
+        if (entry != NULL && entry->decoder != NULL && entry->decoder->file_info_box != NULL)
+            entry->decoder->file_info_box(path);
+        else
+            fileinfo_show_for_path(path);
         g_free(path);
     }
 }
@@ -2165,13 +2170,18 @@
     {
         if (playlist_position->decoder != NULL && playlist_position->decoder->file_info_box == NULL)
             fileinfo_show_for_tuple(tuple);
+        else if (playlist_position->decoder != NULL && playlist_position->decoder->file_info_box != NULL)
+            playlist_position->decoder->file_info_box(path);
         else
             fileinfo_show_for_path(path);
         g_free(path);
     }
     else if (path != NULL)
     {
-        fileinfo_show_for_path(path);
+        if (playlist_position != NULL && playlist_position->decoder != NULL && playlist_position->decoder->file_info_box != NULL)
+            playlist_position->decoder->file_info_box(path);
+        else
+            fileinfo_show_for_path(path);
         g_free(path);
     }
 }
diff -r 681b629322c4 -r feff5a622f06 audacious/ui_fileinfo.c
--- a/audacious/ui_fileinfo.c	Thu Jun 15 22:23:39 2006 -0700
+++ b/audacious/ui_fileinfo.c	Thu Jun 15 22:58:15 2006 -0700
@@ -139,7 +139,7 @@
 	fileinfo_entry_set_text("entry_album", tuple->album_name);
 	fileinfo_entry_set_text("entry_comment", tuple->comment);
 	fileinfo_entry_set_text("entry_genre", tuple->genre);
-	fileinfo_entry_set_text("entry_location", tuple->file_path);
+	fileinfo_entry_set_text_free("entry_location", g_strdup_printf("%s/%s", tuple->file_path, tuple->file_name));
 
 	if (tuple->year != 0)
 		fileinfo_entry_set_text_free("entry_year", g_strdup_printf("%d", tuple->year));