shared: cleanup: make object name smaller

3 files changed, 72 insertions, 75 deletions

diff --git a/clutter-shared/clutter-shared-video-texture.c b/clutter-shared/clutter-shared-video-texture.c
index cf9926b..048266c 100644
--- a/clutter-shared/clutter-shared-video-texture.c
+++ b/clutter-shared/clutter-shared-video-texture.c
@@ -30,7 +30,7 @@
  * SECTION:clutter-gst-shared-video-texture
  * @short_description: Actor for playback of local or remote video files.
  *
- * #ClutterGstSharedVideoTexture is a #ClutterTexture that plays video files.
+ * #ClutterSharedVideoTexture is a #ClutterTexture that plays video files.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -49,7 +49,7 @@
 #include "clutter-shared-enum-types.h"
 #include "clutter-shared-video-texture.h"
 
-struct _ClutterGstSharedVideoTexturePrivate
+struct _ClutterSharedVideoTexturePrivate
 {
   GstRTSPServer *server;
   GstRTSPMediaFactoryURI *factory;
@@ -65,25 +65,24 @@ enum {
 
 static void clutter_media_init (ClutterMediaIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (ClutterGstSharedVideoTexture,
-                         clutter_gst_shared_video_texture,
+G_DEFINE_TYPE_WITH_CODE (ClutterSharedVideoTexture,
+                         clutter_shared_video_texture,
                          CLUTTER_GST_TYPE_VIDEO_TEXTURE,
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_MEDIA,
                                                 clutter_media_init));
 
 static void
-set_uri (ClutterGstSharedVideoTexture *video_texture,
+set_uri (ClutterSharedVideoTexture *video_texture,
          const gchar                  *uri,
          GParamSpec                   *pspec)
 {
-  ClutterGstSharedVideoTexturePrivate *priv = video_texture->priv;
-  GParamSpec *psr = g_param_spec_get_redirect_target (pspec);
+  ClutterSharedVideoTexturePrivate *priv = video_texture->priv;
   GValue value = { 0, };
 
   /* stop current playbin */
   g_value_init (&value, G_TYPE_STRING);
   g_value_set_string (&value, NULL);
-  G_OBJECT_CLASS (clutter_gst_shared_video_texture_parent_class)->set_property
+  G_OBJECT_CLASS (clutter_shared_video_texture_parent_class)->set_property
     (G_OBJECT (video_texture), PROP_URI, &value, pspec);
   g_value_unset (&value);
 
@@ -95,7 +94,7 @@ set_uri (ClutterGstSharedVideoTexture *video_texture,
   /* start playbin again */
   g_value_init (&value, G_TYPE_STRING);
   g_value_set_static_string (&value, "rtsp://127.0.0.1:8554/test");
-  G_OBJECT_CLASS (clutter_gst_shared_video_texture_parent_class)->set_property
+  G_OBJECT_CLASS (clutter_shared_video_texture_parent_class)->set_property
     (G_OBJECT (video_texture), PROP_URI, &value, pspec);
   g_value_unset (&value);
 }
@@ -110,36 +109,36 @@ clutter_media_init (ClutterMediaIface *iface)
  */
 
 static void
-clutter_gst_shared_video_texture_dispose (GObject *object)
+clutter_shared_video_texture_dispose (GObject *object)
 {
-  ClutterGstSharedVideoTexture        *self;
-  ClutterGstSharedVideoTexturePrivate *priv; 
+  ClutterSharedVideoTexture        *self;
+  ClutterSharedVideoTexturePrivate *priv; 
 
-  self = CLUTTER_GST_SHARED_VIDEO_TEXTURE(object); 
+  self = CLUTTER_SHARED_VIDEO_TEXTURE(object); 
   priv = self->priv;
 
-  G_OBJECT_CLASS (clutter_gst_shared_video_texture_parent_class)->dispose (object);
+  G_OBJECT_CLASS (clutter_shared_video_texture_parent_class)->dispose (object);
 }
 
 static void
-clutter_gst_shared_video_texture_finalize (GObject *object)
+clutter_shared_video_texture_finalize (GObject *object)
 {
-  ClutterGstSharedVideoTexture        *self;
-  ClutterGstSharedVideoTexturePrivate *priv; 
+  ClutterSharedVideoTexture        *self;
+  ClutterSharedVideoTexturePrivate *priv; 
 
-  self = CLUTTER_GST_SHARED_VIDEO_TEXTURE (object);
+  self = CLUTTER_SHARED_VIDEO_TEXTURE (object);
   priv = self->priv;
 
-  G_OBJECT_CLASS (clutter_gst_shared_video_texture_parent_class)->finalize (object);
+  G_OBJECT_CLASS (clutter_shared_video_texture_parent_class)->finalize (object);
 }
 
 static void
-clutter_gst_shared_video_texture_set_property (GObject      *object, 
+clutter_shared_video_texture_set_property (GObject      *object, 
 		  		               guint         property_id,
 				               const GValue *value, 
 				               GParamSpec   *pspec)
 {
-  ClutterGstSharedVideoTexture *video_texture = CLUTTER_GST_SHARED_VIDEO_TEXTURE (object);
+  ClutterSharedVideoTexture *video_texture = CLUTTER_SHARED_VIDEO_TEXTURE (object);
 
   switch (property_id)
     {
@@ -153,15 +152,15 @@ clutter_gst_shared_video_texture_set_property (GObject      *object,
 }
 
 static void
-clutter_gst_shared_video_texture_get_property (GObject    *object, 
+clutter_shared_video_texture_get_property (GObject    *object, 
 				               guint       property_id,
 				               GValue     *value, 
 				               GParamSpec *pspec)
 {
-  ClutterGstSharedVideoTexture *video_texture;
-  ClutterGstSharedVideoTexturePrivate *priv;
+  ClutterSharedVideoTexture *video_texture;
+  ClutterSharedVideoTexturePrivate *priv;
 
-  video_texture = CLUTTER_GST_SHARED_VIDEO_TEXTURE (object);
+  video_texture = CLUTTER_SHARED_VIDEO_TEXTURE (object);
   priv = video_texture->priv;
 
   switch (property_id)
@@ -175,26 +174,24 @@ clutter_gst_shared_video_texture_get_property (GObject    *object,
 }
 
 static gpointer
-do_loop (ClutterGstSharedVideoTextureClass * klass)
+do_loop (ClutterSharedVideoTextureClass * klass)
 {
   g_main_loop_run (klass->loop);
   return NULL;
 }
 
 static void
-clutter_gst_shared_video_texture_class_init (ClutterGstSharedVideoTextureClass *klass)
+clutter_shared_video_texture_class_init (ClutterSharedVideoTextureClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
-  ClutterTextureClass *texture_class = CLUTTER_TEXTURE_CLASS (klass);
   GError *error = NULL;
 
-  g_type_class_add_private (klass, sizeof (ClutterGstSharedVideoTexturePrivate));
+  g_type_class_add_private (klass, sizeof (ClutterSharedVideoTexturePrivate));
 
-  object_class->dispose      = clutter_gst_shared_video_texture_dispose;
-  object_class->finalize     = clutter_gst_shared_video_texture_finalize;
-  object_class->set_property = clutter_gst_shared_video_texture_set_property;
-  object_class->get_property = clutter_gst_shared_video_texture_get_property;
+  object_class->dispose      = clutter_shared_video_texture_dispose;
+  object_class->finalize     = clutter_shared_video_texture_finalize;
+  object_class->set_property = clutter_shared_video_texture_set_property;
+  object_class->get_property = clutter_shared_video_texture_get_property;
 
   g_object_class_override_property (object_class,
                                     PROP_URI, "uri");
@@ -209,16 +206,16 @@ clutter_gst_shared_video_texture_class_init (ClutterGstSharedVideoTextureClass *
 }
 
 static void
-clutter_gst_shared_video_texture_init (ClutterGstSharedVideoTexture *video_texture)
+clutter_shared_video_texture_init (ClutterSharedVideoTexture *video_texture)
 {
-  ClutterGstSharedVideoTexturePrivate *priv;
-  ClutterGstSharedVideoTextureClass *klass;
+  ClutterSharedVideoTexturePrivate *priv;
+  ClutterSharedVideoTextureClass *klass;
   GstRTSPMediaMapping *mapping;
 
   video_texture->priv = priv =
     G_TYPE_INSTANCE_GET_PRIVATE (video_texture,
-                                 CLUTTER_GST_TYPE_SHARED_VIDEO_TEXTURE,
-                                 ClutterGstSharedVideoTexturePrivate);
+                                 CLUTTER_TYPE_SHARED_VIDEO_TEXTURE,
+                                 ClutterSharedVideoTexturePrivate);
 
   priv->server = gst_rtsp_server_new ();
 
@@ -235,7 +232,7 @@ clutter_gst_shared_video_texture_init (ClutterGstSharedVideoTexture *video_textu
   /* don't need the ref to the mapper anymore */
   g_object_unref (mapping);
 
-  klass = CLUTTER_GST_SHARED_VIDEO_TEXTURE_GET_CLASS (video_texture);
+  klass = CLUTTER_SHARED_VIDEO_TEXTURE_GET_CLASS (video_texture);
 
   /* attach the server to the custom maincontext */
   if (gst_rtsp_server_attach (priv->server, klass->context) == 0)
@@ -243,7 +240,7 @@ clutter_gst_shared_video_texture_init (ClutterGstSharedVideoTexture *video_textu
 }
 
 /**
- * clutter_gst_shared_video_texture_new:
+ * clutter_shared_video_texture_new:
  *
  * Creates a video texture.
  *
@@ -255,9 +252,9 @@ clutter_gst_shared_video_texture_init (ClutterGstSharedVideoTexture *video_textu
  * Return value: the newly created video texture actor
  */
 ClutterActor*
-clutter_gst_shared_video_texture_new (void)
+clutter_shared_video_texture_new (void)
 {
-  return g_object_new (CLUTTER_GST_TYPE_SHARED_VIDEO_TEXTURE,
+  return g_object_new (CLUTTER_TYPE_SHARED_VIDEO_TEXTURE,
                        "disable-slicing", TRUE, 
                        NULL);
 }
diff --git a/clutter-shared/clutter-shared-video-texture.h b/clutter-shared/clutter-shared-video-texture.h
index 1af0046..c8763ed 100644
--- a/clutter-shared/clutter-shared-video-texture.h
+++ b/clutter-shared/clutter-shared-video-texture.h
@@ -3,8 +3,8 @@
  *
  * GStreamer integration library for Clutter.
  *
- * clutter-gst-video-texture.h - ClutterTexture using GStreamer to display a
- *                               video stream.
+ * clutter-video-texture.h - ClutterTexture using GStreamer to display a
+ *                           video stream.
  *
  * Authored By Matthew Allum  <mallum@openedhand.com>
  *
@@ -26,12 +26,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if !defined(__CLUTTER_GST_H_INSIDE__) && !defined(CLUTTER_GST_COMPILATION)
-#error "Only <clutter-gst/clutter-gst.h> can be included directly."
+#if !defined(__CLUTTER_SHARED_H_INSIDE__) && !defined(CLUTTER_SHARED_COMPILATION)
+#error "Only <clutter-shared/clutter-shared.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_GST_SHARED_VIDEO_TEXTURE_H__
-#define __CLUTTER_GST_SHARED_VIDEO_TEXTURE_H__
+#ifndef __CLUTTER_SHARED_VIDEO_TEXTURE_H__
+#define __CLUTTER_SHARED_VIDEO_TEXTURE_H__
 
 #include <glib-object.h>
 #include <clutter/clutter.h>
@@ -39,53 +39,53 @@
 
 G_BEGIN_DECLS
 
-#define CLUTTER_GST_TYPE_SHARED_VIDEO_TEXTURE clutter_gst_shared_video_texture_get_type()
+#define CLUTTER_TYPE_SHARED_VIDEO_TEXTURE clutter_shared_video_texture_get_type()
 
-#define CLUTTER_GST_SHARED_VIDEO_TEXTURE(obj) \
+#define CLUTTER_SHARED_VIDEO_TEXTURE(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-  CLUTTER_GST_TYPE_SHARED_VIDEO_TEXTURE, ClutterGstSharedVideoTexture))
+  CLUTTER_TYPE_SHARED_VIDEO_TEXTURE, ClutterSharedVideoTexture))
 
-#define CLUTTER_GST_SHARED_VIDEO_TEXTURE_CLASS(klass) \
+#define CLUTTER_SHARED_VIDEO_TEXTURE_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_CAST ((klass), \
-  CLUTTER_GST_TYPE_SHARED_VIDEO_TEXTURE, ClutterGstSharedVideoTextureClass))
+  CLUTTER_TYPE_SHARED_VIDEO_TEXTURE, ClutterSharedVideoTextureClass))
 
-#define CLUTTER_GST_IS_SHARED_VIDEO_TEXTURE(obj) \
+#define CLUTTER_IS_SHARED_VIDEO_TEXTURE(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-  CLUTTER_GST_TYPE_SHARED_VIDEO_TEXTURE))
+  CLUTTER_TYPE_SHARED_VIDEO_TEXTURE))
 
-#define CLUTTER_GST_IS_SHARED_VIDEO_TEXTURE_CLASS(klass) \
+#define CLUTTER_IS_SHARED_VIDEO_TEXTURE_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-  CLUTTER_GST_TYPE_SHARED_VIDEO_TEXTURE))
+  CLUTTER_TYPE_SHARED_VIDEO_TEXTURE))
 
-#define CLUTTER_GST_SHARED_VIDEO_TEXTURE_GET_CLASS(obj) \
+#define CLUTTER_SHARED_VIDEO_TEXTURE_GET_CLASS(obj) \
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-  CLUTTER_GST_TYPE_SHARED_VIDEO_TEXTURE, ClutterGstSharedVideoTextureClass))
+  CLUTTER_TYPE_SHARED_VIDEO_TEXTURE, ClutterSharedVideoTextureClass))
 
-typedef struct _ClutterGstSharedVideoTexture        ClutterGstSharedVideoTexture;
-typedef struct _ClutterGstSharedVideoTextureClass   ClutterGstSharedVideoTextureClass;
-typedef struct _ClutterGstSharedVideoTexturePrivate ClutterGstSharedVideoTexturePrivate;
+typedef struct _ClutterSharedVideoTexture        ClutterSharedVideoTexture;
+typedef struct _ClutterSharedVideoTextureClass   ClutterSharedVideoTextureClass;
+typedef struct _ClutterSharedVideoTexturePrivate ClutterSharedVideoTexturePrivate;
 
 /**
- * ClutterGstSharedVideoTexture:
+ * ClutterSharedVideoTexture:
  *
  * Subclass of #ClutterTexture that displays videos using GStreamer.
  *
- * The #ClutterGstSharedVideoTexture structure contains only private data and
+ * The #ClutterSharedVideoTexture structure contains only private data and
  * should not be accessed directly.
  */
-struct _ClutterGstSharedVideoTexture
+struct _ClutterSharedVideoTexture
 {
   /*< private >*/
-  ClutterGstVideoTexture               parent;
-  ClutterGstSharedVideoTexturePrivate *priv;
+  ClutterGstVideoTexture            parent;
+  ClutterSharedVideoTexturePrivate *priv;
 }; 
 
 /**
- * ClutterGstSharedVideoTextureClass:
+ * ClutterSharedVideoTextureClass:
  *
- * Base class for #ClutterGstSharedVideoTexture.
+ * Base class for #ClutterSharedVideoTexture.
  */
-struct _ClutterGstSharedVideoTextureClass 
+struct _ClutterSharedVideoTextureClass 
 {
   /*< private >*/
   ClutterGstVideoTextureClass parent_class;
@@ -104,9 +104,9 @@ struct _ClutterGstSharedVideoTextureClass
   void (* _clutter_reserved6) (void);
 }; 
 
-GType               clutter_gst_shared_video_texture_get_type            (void) G_GNUC_CONST;
-ClutterActor *      clutter_gst_shared_video_texture_new                 (void);
+GType               clutter_shared_video_texture_get_type            (void) G_GNUC_CONST;
+ClutterActor *      clutter_shared_video_texture_new                 (void);
 
 G_END_DECLS
 
-#endif /* __CLUTTER_GST_SHARED_VIDEO_TEXTURE_H__ */
+#endif /* __CLUTTER_SHARED_VIDEO_TEXTURE_H__ */
diff --git a/examples/shared-video-player.c b/examples/shared-video-player.c
index 3577082..ab6c54d 100644
--- a/examples/shared-video-player.c
+++ b/examples/shared-video-player.c
@@ -319,7 +319,7 @@ main (int argc, char *argv[])
 
   app = g_new0(VideoApp, 1);
   app->stage = stage;
-  app->vtexture = clutter_gst_shared_video_texture_new ();
+  app->vtexture = clutter_shared_video_texture_new ();
 
   if (app->vtexture == NULL)
     g_error("failed to create vtexture");