diff src/skins/ui_equalizer.c @ 3159:1ffcad5f406c

import new skins plugin

--- a/src/skins/ui_equalizer.c	Fri May 01 16:59:54 2009 -0400
+++ b/src/skins/ui_equalizer.c	Fri May 22 23:18:48 2009 +0900
@@ -114,7 +114,7 @@
         height = 116;
 
     if (config.scaled) {
-        dock_window_resize(GTK_WINDOW(equalizerwin), 275 * config.scale_factor, 
+        dock_window_resize(GTK_WINDOW(equalizerwin), 275 * config.scale_factor,
             height * config.scale_factor);
     } else {
         dock_window_resize(GTK_WINDOW(equalizerwin), 275, height);
@@ -371,7 +371,7 @@
     ui_skinned_toggle_button_setup(equalizerwin_on, SKINNED_WINDOW(equalizerwin)->normal,
                                    14, 18, 25, 12, 10, 119, 128, 119, 69, 119, 187, 119, SKIN_EQMAIN);
     g_signal_connect(equalizerwin_on, "clicked", equalizerwin_on_pushed, NULL);
-    equalizerwin_activate(aud_cfg->equalizer_active);
+    ui_skinned_button_set_inside (equalizerwin_on, aud_cfg->equalizer_active);
 
     equalizerwin_auto = ui_skinned_button_new();
     ui_skinned_toggle_button_setup(equalizerwin_auto, SKINNED_WINDOW(equalizerwin)->normal,
@@ -408,12 +408,14 @@
     equalizerwin_graph = ui_skinned_equalizer_graph_new(SKINNED_WINDOW(equalizerwin)->normal, 86, 17);
 
     equalizerwin_preamp = ui_skinned_equalizer_slider_new(SKINNED_WINDOW(equalizerwin)->normal, 21, 38);
-    equalizerwin_set_preamp(aud_cfg->equalizer_preamp);
+    ui_skinned_equalizer_slider_set_position (equalizerwin_preamp,
+     aud_cfg->equalizer_preamp);
 
     for (i = 0; i < AUD_EQUALIZER_NBANDS; i++) {
         equalizerwin_bands[i] =
             ui_skinned_equalizer_slider_new(SKINNED_WINDOW(equalizerwin)->normal, 78 + (i * 18), 38);
-        equalizerwin_set_band(i, aud_cfg->equalizer_bands[i]);
+        ui_skinned_equalizer_slider_set_position (equalizerwin_bands [i],
+         aud_cfg->equalizer_bands [i]);
     }
 
     equalizerwin_volume =
@@ -490,22 +492,7 @@
     equalizerwin_create_widgets();
 }
 
-
-void
-equalizerwin_show(gboolean show)
-{
-    GtkAction *action = gtk_action_group_get_action(
-      toggleaction_group_others , "show equalizer" );
-    gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(action) , show );
-
-    if (show)
-        equalizerwin_real_show();
-    else
-        equalizerwin_real_hide();
-}
-
-void
-equalizerwin_real_show(void)
+static void equalizerwin_real_show (void)
 {
     gtk_window_move(GTK_WINDOW(equalizerwin), config.equalizer_x, config.equalizer_y);
     if (config.scaled && config.eq_scaled_linked)
@@ -514,26 +501,40 @@
     else
         gtk_widget_set_size_request(equalizerwin, 275,
                                     (config.equalizer_shaded ? 14 : 116));
-    config.equalizer_visible = TRUE;
     ui_skinned_button_set_inside(mainwin_eq, TRUE);
     gtk_widget_show_all(equalizerwin);
 
     gtk_window_present(GTK_WINDOW(equalizerwin));
 }
 
-void
-equalizerwin_real_hide(void)
+static void equalizerwin_real_hide (void)
 {
-    /*
-     * This function should only be called from the
-     * main menu signal handler
-     */
     gtk_widget_hide(equalizerwin);
-    config.equalizer_visible = FALSE;
     ui_skinned_button_set_inside(mainwin_eq, FALSE);
     gtk_widget_queue_draw(mainwin_eq);
 }
 
+void
+equalizerwin_show(gboolean show)
+{
+    GtkAction * a;
+
+    a = gtk_action_group_get_action (toggleaction_group_others, "show equalizer");
+
+    if (a && gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (a)) != show)
+        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (a), show);
+    else
+    {
+        config.equalizer_visible = show;
+        aud_cfg->equalizer_visible = show;
+
+        if (show)
+           equalizerwin_real_show ();
+        else
+           equalizerwin_real_hide ();
+    }
+ }
+
 static EqualizerPreset *
 equalizerwin_find_preset(GList * list, const gchar * name)
 {
@@ -1007,7 +1008,7 @@
     if (select_row_func)
         g_signal_connect(view, "row-activated", G_CALLBACK(select_row_func), NULL);
 
-        
+
     gtk_box_pack_start(GTK_BOX(bbox), button_action, TRUE, TRUE, 0);
 
     gtk_widget_grab_default(button_action);
@@ -1069,6 +1070,7 @@
 {
     g_return_if_fail(band >= 0 && band < AUD_EQUALIZER_NBANDS);
     ui_skinned_equalizer_slider_set_position(equalizerwin_bands[band], value);
+    equalizerwin_eq_changed();
 }
 
 gfloat
@@ -1191,7 +1193,7 @@
         gtk_window_present(GTK_WINDOW(equalizerwin_save_window));
         return;
     }
-     
+
     equalizerwin_create_list_window(equalizer_presets,
                                     Q_("Save preset"),
                                     &equalizerwin_save_window,
@@ -1294,7 +1296,7 @@
         gtk_window_present(GTK_WINDOW(equalizerwin_delete_window));
         return;
     }
-    
+
     equalizerwin_create_list_window(equalizer_presets,
                                     Q_("Delete preset"),
                                     &equalizerwin_delete_window,
@@ -1311,7 +1313,7 @@
         gtk_window_present(GTK_WINDOW(equalizerwin_delete_auto_window));
         return;
     }
-    
+
     equalizerwin_create_list_window(equalizer_auto_presets,
                                     Q_("Delete auto-preset"),
                                     &equalizerwin_delete_auto_window,