From 6e978a862af167b8cbd600621ce98a4c0824618c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 30 Dec 2010 11:11:44 +0100
Subject: texture: small cleanups

---
 clutter-shared/clutter-shared-video-texture.c | 46 +++++++++++++++------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/clutter-shared/clutter-shared-video-texture.c b/clutter-shared/clutter-shared-video-texture.c
index 924ffbf..9c9e514 100644
--- a/clutter-shared/clutter-shared-video-texture.c
+++ b/clutter-shared/clutter-shared-video-texture.c
@@ -3,8 +3,8 @@
  *
  * GStreamer integration library for Clutter.
  *
- * clutter-gst-shared-video-texture.c - ClutterTexture using GStreamer to display a
- *                               video stream and share it to other remote hosts.
+ * clutter-shared-video-texture.c - ClutterTexture using GStreamer to display a
+ *                               video stream and share it with other remote hosts.
  *
  * Authored By Wim Taymans  <wim.taymans@collabora.co.uk>
  *
@@ -27,7 +27,7 @@
  */
 
 /**
- * SECTION:clutter-gst-shared-video-texture
+ * SECTION:clutter-shared-video-texture
  * @short_description: Actor for playback of local or remote video files.
  *
  * #ClutterSharedVideoTexture is a #ClutterTexture that plays video files.
@@ -42,7 +42,6 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <gst/gst.h>
-#include <gst/video/video.h>
 #include <gst/rtsp-server/rtsp-server.h>
 #include <clutter-gst/clutter-gst.h>
 
@@ -87,8 +86,8 @@ G_DEFINE_TYPE_WITH_CODE (ClutterSharedVideoTexture,
 
 static void
 set_uri (ClutterSharedVideoTexture *video_texture,
-         const gchar                  *uri,
-         GParamSpec                   *pspec)
+         const gchar               *uri,
+         GParamSpec                *pspec)
 {
   ClutterSharedVideoTexturePrivate *priv = video_texture->priv;
   GValue value = { 0, };
@@ -126,9 +125,9 @@ static void
 clutter_shared_video_texture_dispose (GObject *object)
 {
   ClutterSharedVideoTexture        *self;
-  ClutterSharedVideoTexturePrivate *priv; 
+  ClutterSharedVideoTexturePrivate *priv;
 
-  self = CLUTTER_SHARED_VIDEO_TEXTURE(object); 
+  self = CLUTTER_SHARED_VIDEO_TEXTURE(object);
   priv = self->priv;
 
   G_OBJECT_CLASS (clutter_shared_video_texture_parent_class)->dispose (object);
@@ -138,7 +137,7 @@ static void
 clutter_shared_video_texture_finalize (GObject *object)
 {
   ClutterSharedVideoTexture        *self;
-  ClutterSharedVideoTexturePrivate *priv; 
+  ClutterSharedVideoTexturePrivate *priv;
 
   self = CLUTTER_SHARED_VIDEO_TEXTURE (object);
   priv = self->priv;
@@ -147,10 +146,10 @@ clutter_shared_video_texture_finalize (GObject *object)
 }
 
 static void
-clutter_shared_video_texture_set_property (GObject      *object, 
-		  		               guint         property_id,
-				               const GValue *value, 
-				               GParamSpec   *pspec)
+clutter_shared_video_texture_set_property (GObject      *object,
+		                           guint         property_id,
+				           const GValue *value,
+				           GParamSpec   *pspec)
 {
   ClutterSharedVideoTexture *video_texture = CLUTTER_SHARED_VIDEO_TEXTURE (object);
 
@@ -166,10 +165,10 @@ clutter_shared_video_texture_set_property (GObject      *object,
 }
 
 static void
-clutter_shared_video_texture_get_property (GObject    *object, 
-				               guint       property_id,
-				               GValue     *value, 
-				               GParamSpec *pspec)
+clutter_shared_video_texture_get_property (GObject    *object,
+				           guint       property_id,
+				           GValue     *value,
+				           GParamSpec *pspec)
 {
   ClutterSharedVideoTexture *video_texture;
   ClutterSharedVideoTexturePrivate *priv;
@@ -220,7 +219,9 @@ clutter_shared_video_texture_class_init (ClutterSharedVideoTextureClass *klass)
 }
 
 static void
-entry_group_callback (AvahiEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata)
+entry_group_callback (AvahiEntryGroup       *g,
+                      AvahiEntryGroupState   state,
+                      AVAHI_GCC_UNUSED void *userdata)
 {
   ClutterSharedVideoTexture *video_texture = userdata;
   ClutterSharedVideoTexturePrivate *priv = video_texture->priv;
@@ -262,7 +263,8 @@ entry_group_callback (AvahiEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_
 }
 
 static void
-create_services (AvahiClient *c, ClutterSharedVideoTexture *video_texture)
+create_services (AvahiClient               *c,
+                 ClutterSharedVideoTexture *video_texture)
 {
   ClutterSharedVideoTexturePrivate *priv = video_texture->priv;
   int ret;
@@ -320,7 +322,9 @@ fail:
 
 
 static void
-client_callback (AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata)
+client_callback (AvahiClient            *c,
+                 AvahiClientState        state,
+                 AVAHI_GCC_UNUSED void  *userdata)
 {
   ClutterSharedVideoTexture *video_texture = userdata;
   ClutterSharedVideoTexturePrivate *priv = video_texture->priv;
@@ -425,6 +429,6 @@ ClutterActor*
 clutter_shared_video_texture_new (void)
 {
   return g_object_new (CLUTTER_TYPE_SHARED_VIDEO_TEXTURE,
-                       "disable-slicing", TRUE, 
+                       "disable-slicing", TRUE,
                        NULL);
 }
-- 
cgit v1.2.3