Updating branch refs/heads/master
         to 7c29c72c502c5886891c5b5472756073affd0a2c (commit)
       from 63047f84d98f4cc40335a0da03f5ecf0a850ff0b (commit)

commit 7c29c72c502c5886891c5b5472756073affd0a2c
Author: Ali Abdallah <al...@xfce.org>
Date:   Mon Jan 4 19:34:45 2010 +0100

    Fix seek backwards+add mouse wheel on the volume slider, patches by Enrico 
Troger.

 src/parole-player.c |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 8b2631b..467e6b3 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -145,6 +145,10 @@ void               parole_player_open_preferences_cb       
(GtkWidget *widget,
 void            parole_player_volume_value_changed_cb   (GtkRange *range, 
                                                         ParolePlayer *player);
 
+gboolean        parole_player_volume_scroll_event_cb   (GtkWidget *widget,
+                                                        GdkEventScroll *ev,
+                                                        ParolePlayer *player);
+
 void           parole_player_full_screen_activated_cb  (GtkWidget *widget,
                                                         ParolePlayer *player);
 
@@ -822,7 +826,7 @@ gboolean parole_player_scroll_event_cb (GtkWidget *widget, 
GdkEventScroll *ev, P
     }
     else if ( ev->direction == GDK_SCROLL_DOWN )
     {
-       parole_player_seekf_cb (NULL, player);
+       parole_player_seekb_cb (NULL, player);
         ret_val = TRUE;
     }
 
@@ -1314,6 +1318,25 @@ parole_player_change_volume (ParolePlayer *player, 
gdouble value)
     parole_player_set_volume_image (player, value);
 }
 
+gboolean
+parole_player_volume_scroll_event_cb (GtkWidget *widget, GdkEventScroll *ev, 
ParolePlayer *player)
+{
+    gboolean ret_val = FALSE;
+
+    if ( ev->direction == GDK_SCROLL_UP )
+    {
+       parole_player_volume_up (NULL, player);
+       ret_val = TRUE;
+    }
+    else if ( ev->direction == GDK_SCROLL_DOWN )
+    {
+       parole_player_volume_down (NULL, player);
+       ret_val = TRUE;
+    }
+
+    return ret_val;
+}
+
 void
 parole_player_volume_value_changed_cb (GtkRange *range, ParolePlayer *player)
 {
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to