diff options
-rw-r--r-- | data/totem.ui | 2 | ||||
-rw-r--r-- | src/totem-object.c | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/data/totem.ui b/data/totem.ui index 177d82e14..6cda7addf 100644 --- a/data/totem.ui +++ b/data/totem.ui @@ -461,6 +461,8 @@ audio-volume-high-symbolic audio-volume-low-symbolic audio-volume-medium-symbolic</property> <property name="use_symbolic">True</property> + <signal name="value-changed" handler="volume_button_value_changed_cb"/> + <signal name="scroll-event" handler="volume_button_scroll_event_cb"/> <style> <class name="image-button"/> </style> diff --git a/src/totem-object.c b/src/totem-object.c index 82a502a38..21f00c7c8 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -125,6 +125,10 @@ G_MODULE_EXPORT gboolean seek_slider_pressed_cb (GtkWidget *widget, GdkE G_MODULE_EXPORT gboolean seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemObject *totem); G_MODULE_EXPORT gboolean seek_slider_scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data); +/* Volume */ +G_MODULE_EXPORT void volume_button_value_changed_cb (GtkScaleButton *button, gdouble value, TotemObject *totem); +G_MODULE_EXPORT gboolean volume_button_scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data); + enum { PROP_0, PROP_FULLSCREEN, @@ -2703,14 +2707,14 @@ update_current_time (BaconVideoWidget *bvw, } } -static void +void volume_button_value_changed_cb (GtkScaleButton *button, gdouble value, TotemObject *totem) { totem->muted = FALSE; bacon_video_widget_set_volume (totem->bvw, value); } -static gboolean +gboolean volume_button_scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, gpointer user_data) @@ -3939,10 +3943,6 @@ totem_callback_connect (TotemObject *totem) G_CALLBACK (seek_slider_changed_cb), totem); /* Volume */ - g_signal_connect (totem->volume, "value-changed", - G_CALLBACK (volume_button_value_changed_cb), totem); - g_signal_connect (totem->volume, "scroll-event", - G_CALLBACK (volume_button_scroll_event_cb), totem); item = gtk_scale_button_get_popup (GTK_SCALE_BUTTON (totem->volume)); g_signal_connect (G_OBJECT (item), "notify::visible", G_CALLBACK (volume_button_menu_shown_cb), totem); |