[Xfce4-commits] <parole:master> Get if stream has video before deciding to reset the screen saver counter, problem was in the order of calls

[Ali Abdallah]

Updating branch refs/heads/master
         to 6fe4225ab1f4f1aa045a3c09f79dc8bbd9793ba9 (commit)
       from 80a358e16a7933529c70e5982bc7ad0774109580 (commit)

commit 6fe4225ab1f4f1aa045a3c09f79dc8bbd9793ba9
Author: Ali Abdallah <ali at ali-xfce.org>
Date:   Sat Oct 24 10:51:59 2009 +0200

    Get if stream has video before deciding to reset the screen saver counter, problem was in the order of calls

 parole/parole-builder.c |    4 ----
 parole/parole-gst.c     |    6 +++++-
 parole/parole-player.c  |    8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/parole/parole-builder.c b/parole/parole-builder.c
index 43179ea..f3330bf 100644
--- a/parole/parole-builder.c
+++ b/parole/parole-builder.c
@@ -58,12 +58,8 @@ GtkBuilder *parole_builder_new_from_string (const gchar *ui, gsize length)
 
     /*
      * Set the locale before loading the GtkBuilder interface definition
-     * probably this will be fixed in libxfce4util's side so keep a version 
-     * check.
      */
-#if LIBXFCE4UTIL_CHECK_VERSION (4, 6, 1)
     xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-#endif
     
     gtk_builder_add_from_string (builder, ui, length, &error);
     
diff --git a/parole/parole-gst.c b/parole/parole-gst.c
index fd6bc89..57dd8af 100644
--- a/parole/parole-gst.c
+++ b/parole/parole-gst.c
@@ -433,6 +433,8 @@ parole_gst_set_video_color_balance (ParoleGst *gst)
 		  "saturation", &saturation_value,
 		  NULL);
     
+    TRACE ("Setting video color balance");
+    
     g_object_set (G_OBJECT (video_sink),
 		  "brightness", brightness_value,
 		  "contrast", contrast_value,
@@ -448,6 +450,7 @@ parole_gst_set_video_color_balance (ParoleGst *gst)
 static void
 parole_gst_set_x_overlay (ParoleGst *gst)
 {
+    
     GstElement *video_sink;
     
     g_object_get (G_OBJECT (gst->priv->playbin),
@@ -460,6 +463,7 @@ parole_gst_set_x_overlay (ParoleGst *gst)
 				  GDK_WINDOW_XWINDOW (GTK_WIDGET (gst)->window));
     
     gst_object_unref (video_sink);
+    
 }
 
 static gboolean
@@ -1313,7 +1317,7 @@ parole_gst_construct (GObject *object)
     g_object_set (G_OBJECT (gst->priv->playbin),
 		  "video-sink", gst->priv->video_sink,
 		  NULL);
-
+    
     /*
      * Listen to the bus events.
      */
diff --git a/parole/parole-player.c b/parole/parole-player.c
index 548325b..8ebbd31 100644
--- a/parole/parole-player.c
+++ b/parole/parole-player.c
@@ -682,15 +682,15 @@ parole_player_media_state_cb (ParoleGst *gst, const ParoleStream *stream, Parole
     
     PAROLE_DEBUG_ENUM ("State callback", state, ENUM_GTYPE_MEDIA_STATE);
     
+    g_object_get (G_OBJECT (stream),
+		  "has-video", &has_video,
+		  NULL);
+    
     if ( state == PAROLE_MEDIA_STATE_PLAYING && has_video )
 	parole_screen_saver_inhibit (player->priv->screen_saver);
     else
 	parole_screen_saver_uninhibit (player->priv->screen_saver);
 
-    g_object_get (G_OBJECT (stream),
-		  "has-video", &has_video,
-		  NULL);
-    
     if ( state == PAROLE_MEDIA_STATE_PLAYING )
     {
 	parole_player_playing (player, stream);