This is an automated email from the git hooks/post-receive script. bluesabre pushed a commit to branch master in repository apps/parole.
commit 16278ed47b721ec67951d3d217f2fe9262be7edd Author: Sean Davis <[email protected]> Date: Wed Jun 18 01:11:16 2014 -0400 parole_clutter_apply_texture --- src/parole-clutter.c | 4 ++-- src/parole-clutter.h | 3 ++- src/parole-player.c | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/parole-clutter.c b/src/parole-clutter.c index 6e6416f..07813d1 100644 --- a/src/parole-clutter.c +++ b/src/parole-clutter.c @@ -348,9 +348,9 @@ void parole_clutter_set_video_dimensions (ParoleClutter *clutter, gint w, gint h clutter->priv->video_h = h; } -ClutterActor *parole_clutter_get_texture (ParoleClutter *clutter) +void parole_clutter_apply_texture (ParoleClutter *clutter, GstElement **element) { - return clutter->priv->texture; + g_object_set (*element, "texture", clutter->priv->texture, NULL); } GtkWidget *parole_clutter_get_embed_widget (ParoleClutter *clutter) diff --git a/src/parole-clutter.h b/src/parole-clutter.h index b15fbc4..30fe92e 100644 --- a/src/parole-clutter.h +++ b/src/parole-clutter.h @@ -35,7 +35,8 @@ GtkWidget *parole_clutter_new (gpointer conf_obj); GtkWidget *parole_clutter_get (void); GtkWidget *parole_clutter_get_embed_widget (ParoleClutter *clutter); -ClutterActor *parole_clutter_get_texture (ParoleClutter *clutter); +void parole_clutter_apply_texture (ParoleClutter *clutter, + GstElement **element); void parole_clutter_set_video_dimensions (ParoleClutter *clutter, diff --git a/src/parole-player.c b/src/parole-player.c index 7a80b38..a151a1c 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -3550,18 +3550,16 @@ parole_player_init (ParolePlayer *player) { GtkWidget *clutterbox; GstElement *video_sink; - ClutterActor *texture; player->priv->clutter = parole_clutter_new(player->priv->conf); clutterbox = parole_clutter_get_embed_widget(PAROLE_CLUTTER(player->priv->clutter)); - texture = parole_clutter_get_texture (PAROLE_CLUTTER(player->priv->clutter)); gtk_box_pack_start (GTK_BOX (player->priv->videobox), clutterbox, TRUE, TRUE, 0); video_sink = parole_gst_video_sink (PAROLE_GST(player->priv->gst)); - g_object_set (video_sink, "texture", texture, NULL); + parole_clutter_apply_texture (PAROLE_CLUTTER(player->priv->clutter), &video_sink); gtk_widget_show (clutterbox); } -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list [email protected] https://mail.xfce.org/mailman/listinfo/xfce4-commits
