Updating branch refs/heads/master
to 8eafe683a40b8cfa8d6f9bb1208316419b87531c (commit)
from 886834ac12f79fcd9704be0609769ea9999498ba (commit)
commit 8eafe683a40b8cfa8d6f9bb1208316419b87531c
Author: Sean Davis <[email protected]>
Date: Sun Jul 29 08:40:31 2012 -0400
Set default subtitle font to Sans Bold 20. Added Page Up/Down shortcuts
for seeking 10 minutes.
src/parole-conf.c | 2 +-
src/parole-player.c | 38 +++++++++++++++++++++++++++++++++++++-
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/src/parole-conf.c b/src/parole-conf.c
index fccc674..2fb96e6 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -261,7 +261,7 @@ parole_conf_class_init (ParoleConfClass *klass)
PROP_SUBTITLE_FONT,
g_param_spec_string ("subtitle-font",
NULL, NULL,
- "Sans 12",
+ "Sans Bold 20",
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
diff --git a/src/parole-player.c b/src/parole-player.c
index 1926b7d..e607760 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -138,6 +138,10 @@ void parole_player_seekf_cb
(GtkWidget *widget, ParolePlayer *player);
void parole_player_seekb_cb (GtkWidget *widget, ParolePlayer
*player);
+void parole_player_seekf_long_cb (GtkWidget *widget,
ParolePlayer *player);
+
+void parole_player_seekb_long_cb (GtkWidget *widget,
ParolePlayer *player);
+
gboolean parole_player_scroll_event_cb (GtkWidget *widget,
GdkEventScroll *ev,
ParolePlayer *player);
@@ -1307,6 +1311,28 @@ void parole_player_seekb_cb (GtkWidget *widget,
ParolePlayer *player)
parole_gst_seek (PAROLE_GST (player->priv->gst), seek);
}
+void parole_player_seekf_long_cb (GtkWidget *widget, ParolePlayer *player)
+{
+ gdouble seek;
+
+ seek = parole_gst_get_stream_position (PAROLE_GST (player->priv->gst) )
+ +
+ 600;
+
+ parole_gst_seek (PAROLE_GST (player->priv->gst), seek);
+}
+
+void parole_player_seekb_long_cb (GtkWidget *widget, ParolePlayer *player)
+{
+ gdouble seek;
+
+ seek = parole_gst_get_stream_position (PAROLE_GST (player->priv->gst) )
+ -
+ 600;
+
+ parole_gst_seek (PAROLE_GST (player->priv->gst), seek);
+}
+
gboolean parole_player_scroll_event_cb (GtkWidget *widget, GdkEventScroll *ev,
ParolePlayer *player)
{
gboolean ret_val = FALSE;
@@ -1987,7 +2013,7 @@ parole_player_handle_key_press (GdkEventKey *ev,
ParolePlayer *player)
parole_player_play_pause_clicked (NULL, player);
ret_val = TRUE;
break;
- case GDK_Right:
+ case GDK_Right:
/* Media seekable ?*/
if ( GTK_WIDGET_SENSITIVE (player->priv->range) )
parole_player_seekf_cb (NULL, player);
@@ -1998,6 +2024,16 @@ parole_player_handle_key_press (GdkEventKey *ev,
ParolePlayer *player)
parole_player_seekb_cb (NULL, player);
ret_val = TRUE;
break;
+ case GDK_Page_Down:
+ if ( GTK_WIDGET_SENSITIVE (player->priv->range) )
+ parole_player_seekb_long_cb (NULL, player);
+ ret_val = TRUE;
+ break;
+ case GDK_Page_Up:
+ if ( GTK_WIDGET_SENSITIVE (player->priv->range) )
+ parole_player_seekf_long_cb (NULL, player);
+ ret_val = TRUE;
+ break;
case GDK_s:
case GDK_S:
parole_player_stop_clicked (NULL, player);
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
