← Back to branch summary

~ubuntu-branches/ubuntu/lucid/audacious-plugins/lucid

« back to all changes in this revision

Viewing changes to src/skins/ui_equalizer.c

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Moog, Bhavani Shankar, Andreas Moog
  • Date: 2009-07-23 13:02:52 UTC
  • mfrom: (1.1.11 upstream) (2.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090723130252-88k8ejg21lwmh5ma
Tags: 2.1-1ubuntu1
https://launchpad.net/bugs/399617
https://launchpad.net/bugs/403387
[ Bhavani Shankar ]
* Merge from debian unstable, remaining changes: LP: #399617
  - debian/control:
    + audacious-plugins-extra depends on audacious-plugins
    + audacious-plugins suggests timidiy for midi playback
    + Move PulseAudio from description of extra to main package.
  - debian/rules:
    + Install pulse_audio.so in audacious-plugins dir.
    + Add --disable-arts to ./configure
* Remove debian/patches/cuesheet.patch as its already superceeded in 
  debian.

[ Andreas Moog ]
* install /usr/lib/audacious/General/gtkui.so to audacious-plugins.
* Fixes also: LP: #403387

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/skins/ui_equalizer.c
103
103
    g_free(preset);
104
104
}
105
105
 
 
106
void equalizerwin_set_shape (void)
 
107
{
 
108
    if (config.show_wm_decorations)
 
109
        gtk_widget_shape_combine_mask (equalizerwin, 0, 0, 0);
 
110
    else
 
111
        gtk_widget_shape_combine_mask (equalizerwin, skin_get_mask
 
112
         (aud_active_skin, config.equalizer_shaded ? SKIN_MASK_EQ_SHADE :
 
113
         SKIN_MASK_EQ), 0, 0);
 
114
}
 
115
 
106
116
void
107
117
equalizerwin_set_scaled(gboolean ds)
108
118
{
109
119
    gint height;
 
120
    GList * list;
 
121
    SkinnedWindow * skinned;
 
122
    GtkFixed * fixed;
 
123
    GtkFixedChild * child;
110
124
 
111
125
    if (config.equalizer_shaded)
112
126
        height = 14;
120
134
        dock_window_resize(GTK_WINDOW(equalizerwin), 275, height);
121
135
    }
122
136
 
123
 
    GList *iter;
124
 
    for (iter = GTK_FIXED (SKINNED_WINDOW(equalizerwin)->normal)->children; iter; iter = g_list_next (iter)) {
125
 
        GtkFixedChild *child_data = (GtkFixedChild *) iter->data;
126
 
        GtkWidget *child = child_data->widget;
127
 
        g_signal_emit_by_name(child, "toggle-scaled");
128
 
    }
129
 
    gtk_widget_shape_combine_mask(equalizerwin, skin_get_mask(aud_active_skin, SKIN_MASK_EQ + config.equalizer_shaded), 0, 0);
 
137
    skinned = (SkinnedWindow *) equalizerwin;
 
138
    fixed = (GtkFixed *) skinned->normal;
 
139
 
 
140
    for (list = fixed->children; list; list = list->next)
 
141
    {
 
142
        child = (GtkFixedChild *) list->data;
 
143
        g_signal_emit_by_name ((GObject *) child->widget, "toggle-scaled");
 
144
    }
 
145
 
 
146
    fixed = (GtkFixed *) skinned->shaded;
 
147
 
 
148
    for (list = fixed->children; list; list = list->next)
 
149
    {
 
150
        child = (GtkFixedChild *) list->data;
 
151
        g_signal_emit_by_name ((GObject *) child->widget, "toggle-scaled");
 
152
    }
 
153
 
 
154
    equalizerwin_set_shape ();
130
155
}
131
156
 
132
157
void
143
168
                   116 * EQUALIZER_SCALE_FACTOR);
144
169
    }
145
170
 
146
 
    gtk_widget_shape_combine_mask(equalizerwin, skin_get_mask(aud_active_skin, SKIN_MASK_EQ + config.equalizer_shaded), 0, 0);
 
171
    equalizerwin_set_shape ();
147
172
}
148
173
 
149
174
static void
170
195
        aud_cfg->equalizer_bands[i] = equalizerwin_get_band(i);
171
196
 
172
197
    aud_hook_call("equalizer changed", NULL);
173
 
    gtk_widget_queue_draw(equalizerwin_graph);
174
198
}
175
199
 
176
200
static void
232
256
    return FALSE;
233
257
}
234
258
 
235
 
static gboolean
236
 
equalizerwin_keypress(GtkWidget * widget,
237
 
                      GdkEventKey * event,
238
 
                      gpointer data)
239
 
{
240
 
    if (event->keyval == GDK_Tab && event->state & GDK_CONTROL_MASK) {
241
 
        if (config.playlist_visible)
242
 
            gtk_window_present(GTK_WINDOW(playlistwin));
243
 
        else if (config.player_visible)
244
 
            gtk_window_present(GTK_WINDOW(mainwin));
245
 
        return TRUE;
246
 
    }
247
 
    if (!config.equalizer_shaded) {
248
 
        gtk_widget_event(mainwin, (GdkEvent *) event);
249
 
        return TRUE;
250
 
    }
251
 
 
252
 
    switch (event->keyval) {
253
 
    case GDK_Left:
254
 
    case GDK_KP_Left:
255
 
        mainwin_set_balance_diff(-4);
256
 
        break;
257
 
    case GDK_Right:
258
 
    case GDK_KP_Right:
259
 
        mainwin_set_balance_diff(4);
260
 
        break;
261
 
    default:
262
 
        gtk_widget_event(mainwin, (GdkEvent *) event);
263
 
        break;
264
 
    }
265
 
 
266
 
    return FALSE;
267
 
}
268
 
 
269
259
static void
270
260
equalizerwin_close_cb(void)
271
261
{
467
457
 
468
458
    gtk_widget_set_app_paintable(equalizerwin, TRUE);
469
459
 
470
 
    if (config.equalizer_x != -1 && config.save_window_position)
 
460
    if (config.save_window_position)
471
461
        gtk_window_move(GTK_WINDOW(equalizerwin),
472
462
                        config.equalizer_x, config.equalizer_y);
473
463
 
475
465
                     G_CALLBACK(equalizerwin_delete), NULL);
476
466
    g_signal_connect(equalizerwin, "button_press_event",
477
467
                     G_CALLBACK(equalizerwin_press), NULL);
478
 
    g_signal_connect(equalizerwin, "key_press_event",
479
 
                     G_CALLBACK(equalizerwin_keypress), NULL);
 
468
    g_signal_connect ((GObject *) equalizerwin, "key-press-event", (GCallback)
 
469
     mainwin_keypress, 0);
480
470
}
481
471
 
482
472
void
494
484
 
495
485
static void equalizerwin_real_show (void)
496
486
{
497
 
    gtk_window_move(GTK_WINDOW(equalizerwin), config.equalizer_x, config.equalizer_y);
498
487
    if (config.scaled && config.eq_scaled_linked)
499
488
        gtk_widget_set_size_request(equalizerwin, 275 * config.scale_factor,
500
489
                                    ((config.equalizer_shaded ? 14 : 116) * config.scale_factor));
509
498
 
510
499
static void equalizerwin_real_hide (void)
511
500
{
 
501
    if (config.save_window_position)
 
502
        gtk_window_get_position ((GtkWindow *) equalizerwin,
 
503
         & config.equalizer_x, & config.equalizer_y);
 
504
 
512
505
    gtk_widget_hide(equalizerwin);
513
506
    ui_skinned_button_set_inside(mainwin_eq, FALSE);
514
 
    gtk_widget_queue_draw(mainwin_eq);
515
507
}
516
508
 
517
509
void