changeset 2639:6a881c49db96

make use of ui_fileinfo
author Tomasz Mon <desowin@gmail.com>
date Fri, 23 May 2008 12:36:47 +0200
parents aa17ced2b4d6
children dd255ad225f3
files src/skins/ui_main.c src/skins/ui_playlist.c
diffstat 2 files changed, 6 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/src/skins/ui_main.c	Fri May 23 12:29:53 2008 +0200
+++ b/src/skins/ui_main.c	Fri May 23 12:36:47 2008 +0200
@@ -67,7 +67,6 @@
 #include "strings.h"
 #include "ui_credits.h"
 #include "ui_dock.h"
-#include "ui_fileinfo.h"
 #include "ui_jumptotrack.h"
 #include "ui_main_evlisteners.h"
 #include "ui_preferences.h"
@@ -1780,11 +1779,9 @@
         case MAINWIN_GENERAL_PLAYLOCATION:
             mainwin_show_add_url_window();
             break;
-#if 0
         case MAINWIN_GENERAL_FILEINFO:
-            ui_fileinfo_show_current(playlist);
+            aud_playlist_fileinfo_current(playlist);
             break;
-#endif
         case MAINWIN_GENERAL_FOCUSPLWIN:
             gtk_window_present(GTK_WINDOW(playlistwin));
             break;
@@ -1930,9 +1927,7 @@
                                          UI_SKINNED_MENUROW(mainwin_menurow)->always_selected );
             break;
         case MENUROW_FILEINFOBOX:
-#if 0
-            ui_fileinfo_show_current(aud_playlist_get_active());
-#endif
+            aud_playlist_fileinfo_current(aud_playlist_get_active());
             break;
         case MENUROW_SCALE:
             gtk_toggle_action_set_active(
@@ -2214,9 +2209,7 @@
 }
 
 static void mainwin_info_double_clicked_cb(void) {
-#if 0
-    ui_fileinfo_show_current(aud_playlist_get_active());
-#endif
+    aud_playlist_fileinfo_current(aud_playlist_get_active());
 }
 
 static void
@@ -2821,9 +2814,7 @@
 void
 action_current_track_info( void )
 {
-#if 0
-    ui_fileinfo_show_current(aud_playlist_get_active());
-#endif
+    aud_playlist_fileinfo_current(aud_playlist_get_active());
 }
 
 void
--- a/src/skins/ui_playlist.c	Fri May 23 12:29:53 2008 +0200
+++ b/src/skins/ui_playlist.c	Fri May 23 12:36:47 2008 +0200
@@ -51,9 +51,6 @@
 #endif
 #include "ui_dock.h"
 #include "ui_equalizer.h"
-#if 0
-#include "ui_fileinfo.h"
-#endif
 #include "ui_fileopener.h"
 #include "ui_main.h"
 #include "ui_manager.h"
@@ -709,20 +706,17 @@
 static void
 playlistwin_fileinfo(void)
 {
-#if 0
     Playlist *playlist = aud_playlist_get_active();
 
     /* Show the first selected file, or the current file if nothing is
      * selected */
     GList *list = aud_playlist_get_selected(playlist);
     if (list) {
-        ui_fileinfo_show(playlist, GPOINTER_TO_INT(list->data));
+        aud_playlist_fileinfo(playlist, GPOINTER_TO_INT(list->data));
         g_list_free(list);
     }
     else
-
-  ui_fileinfo_show_current(playlist);
-#endif
+        aud_playlist_fileinfo_current(playlist);
 }
 
 static void