changeset 561:2b9dc862967b trunk

[svn] Remove the elusive playlistwin visualiser that we do not use.

--- a/audacious/mainwin.c	Wed Feb 01 14:04:14 2006 -0800
+++ b/audacious/mainwin.c	Wed Feb 01 19:42:23 2006 -0800
@@ -568,16 +568,7 @@
 static void
 mainwin_vis_set_active_vis(gint new_vis)
 {
-    switch (new_vis) {
-    case MAINWIN_VIS_ACTIVE_MAINWIN:
-        playlistwin_vis_disable();
-        active_vis = mainwin_vis;
-        break;
-    case MAINWIN_VIS_ACTIVE_PLAYLISTWIN:
-        playlistwin_vis_enable();
-        active_vis = playlistwin_vis;
-        break;
-    }
+    active_vis = mainwin_vis;
 }
 
 static void
@@ -2337,10 +2328,8 @@
     GdkGC *gc;
     GdkColor pattern;
 
-    if (cfg.player_shaded) {
+    if (cfg.player_shaded)
         svis_clear_data(mainwin_svis);
-        vis_clear_data(playlistwin_vis);
-    }
 
     if (!cfg.show_wm_decorations) {
         nullmask = gdk_pixmap_new(mainwin->window, 20, 20, 1);

--- a/audacious/playback.c	Wed Feb 01 14:04:14 2006 -0800
+++ b/audacious/playback.c	Wed Feb 01 19:42:23 2006 -0800
@@ -92,7 +92,6 @@
         bmp_playback_stop();
 
     vis_clear_data(mainwin_vis);
-    vis_clear_data(playlistwin_vis);
     svis_clear_data(mainwin_svis);
     mainwin_disable_seekbar();
 

--- a/audacious/ui_playlist.c	Wed Feb 01 14:04:14 2006 -0800
+++ b/audacious/ui_playlist.c	Wed Feb 01 19:42:23 2006 -0800
@@ -85,7 +85,6 @@
 
 PlayList_List *playlistwin_list = NULL;
 PButton *playlistwin_shade, *playlistwin_close;
-Vis *playlistwin_vis;
 
 static gboolean playlistwin_resizing = FALSE;
 
@@ -111,7 +110,6 @@
 static SButton *playlistwin_sscroll_up, *playlistwin_sscroll_down;
 
 static GList *playlistwin_wlist = NULL;
-static gboolean playlistwin_vis_enabled = FALSE;
 
 static void plsort_menu_callback(gpointer cb_data, guint action,
                                            GtkWidget * w);
@@ -664,16 +662,6 @@
     widget_move(WIDGET(playlistwin_sscroll_up), width - 14, height - 35);
     widget_move(WIDGET(playlistwin_sscroll_down), width - 14, height - 30);
 
-    /* decide if we should show the mini visualizer */
-    if (playlistwin_get_width() >= 350) {
-        widget_move(WIDGET(playlistwin_vis), width - 223, height - 26);
-
-        if (playlistwin_vis_enabled)
-            widget_show(WIDGET(playlistwin_vis));
-    }
-    else
-        widget_hide(WIDGET(playlistwin_vis));
-
     g_object_unref(playlistwin_bg);
     playlistwin_bg = gdk_pixmap_new(playlistwin->window, width, height, -1);
     playlistwin_set_mask();
@@ -960,7 +948,6 @@
             widget_contains(WIDGET(playlistwin_time_min), x, y) ||
             widget_contains(WIDGET(playlistwin_time_sec), x, y) ||
             widget_contains(WIDGET(playlistwin_info), x, y) ||
-            widget_contains(WIDGET(playlistwin_vis), x, y) ||
             widget_contains(WIDGET(playlistwin_srew), x, y) ||
             widget_contains(WIDGET(playlistwin_splay), x, y) ||
             widget_contains(WIDGET(playlistwin_spause), x, y) ||
@@ -1100,22 +1087,6 @@
         gtk_selection_convert(widget, GDK_SELECTION_PRIMARY,
                               GDK_TARGET_STRING, event->time);
     }
-    else if (playlistwin_get_width() >= 350 && REGION_R(223, 151, 26, 10)) {
-        if (event->button == 1) {
-            cfg.vis_type++;
-            if (cfg.vis_type > VIS_OFF)
-                cfg.vis_type = VIS_ANALYZER;
-            mainwin_vis_set_type(cfg.vis_type);
-        }
-        else if (event->button == 3) {
-            gint mx, my;
-            GdkModifierType modmask;
-
-            gdk_window_get_pointer(NULL, &mx, &my, &modmask);
-            util_item_factory_popup(mainwin_vis_menu, mx, my, 3, event->time);
-            grab = FALSE;
-        }
-    }
     else if (event->button == 1 && event->type == GDK_BUTTON_PRESS &&
              !inside_sensitive_widgets(event->x, event->y) && event->y < 14) {
         gdk_window_raise(playlistwin->window);
@@ -1438,23 +1409,6 @@
 }
 
 void
-playlistwin_vis_enable(void)
-{
-    playlistwin_vis_enabled = TRUE;
-
-    if (playlistwin_get_width() >= 350)
-        widget_show(WIDGET(playlistwin_vis));
-}
-
-void
-playlistwin_vis_disable(void)
-{
-    playlistwin_vis_enabled = FALSE;
-    widget_hide(WIDGET(playlistwin_vis));
-    draw_playlist_window(TRUE);
-}
-
-void
 playlistwin_set_time(gint time, gint length, TimerMode mode)
 {
     gchar *text, sign;
@@ -1602,13 +1556,6 @@
                        playlistwin_get_width() - 143,
                        cfg.playlist_height - 28, 85, FALSE, SKIN_TEXT);
 
-    /* mini visualizer */
-    playlistwin_vis =
-        create_vis(&playlistwin_wlist, playlistwin_bg, playlistwin->window,
-                   playlistwin_gc, playlistwin_get_width() - 223,
-                   cfg.playlist_height - 26, 72);
-    widget_hide(WIDGET(playlistwin_vis));
-
     /* mini play control buttons at right bottom corner */
 
     /* rewind button */

--- a/audacious/ui_playlist.h	Wed Feb 01 14:04:14 2006 -0800
+++ b/audacious/ui_playlist.h	Wed Feb 01 19:42:23 2006 -0800
@@ -67,12 +67,9 @@
 void playlistwin_scroll(gint num);
 void playlistwin_scroll_up_pushed(void);
 void playlistwin_scroll_down_pushed(void);
-void playlistwin_vis_disable(void);
-void playlistwin_vis_enable(void);
 void playlistwin_select_playlist_to_load(const gchar * default_filename);
 
 extern GtkWidget *playlistwin;
-extern Vis *playlistwin_vis;
 extern PlayList_List *playlistwin_list;
 
 extern PButton *playlistwin_shade, *playlistwin_close;