Rename GESTrackOperation to GESOperation

diff --git a/android/ges.mk b/android/ges.mk
index 050004a..e2567bf 100644 (file)
--- a/android/ges.mk
+++ b/android/ges.mk
@@ -28,7 +28,7 @@ LOCAL_SRC_FILES :=                            \
        ges-track.c                             \
        ges-track-element.c                     \
        ges-source.c                    \
-       ges-track-operation.c                   \
+       ges-operation.c                 \
        ges-uri-source.c                        \
        ges-image-source.c              \
        ges-track-transition.c                  \

diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml
index a71e7fe..5bd8fe6 100644 (file)
--- a/docs/libs/ges-docs.sgml
+++ b/docs/libs/ges-docs.sgml
@@ -46,7 +46,7 @@ platform as well as Windows. It is released under the GNU Library General Public
     <xi:include href="xml/ges-track-element.xml"/>
     <xi:include href="xml/ges-source.xml"/>
     <xi:include href="xml/ges-base-effect.xml"/>
-    <xi:include href="xml/ges-track-operation.xml"/>
+    <xi:include href="xml/ges-operation.xml"/>
     <xi:include href="xml/ges-base-transition-clip.xml"/>
     <xi:include href="xml/ges-asset.xml"/>
   </chapter>

diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt
index c073637..b3c5837 100644 (file)
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -145,19 +145,19 @@ ges_source_get_type
 </SECTION>
 
 <SECTION>
-<FILE>ges-track-operation</FILE>
-<TITLE>GESTrackOperation</TITLE>
-GESTrackOperation
-GESTrackOperationClass
+<FILE>ges-operation</FILE>
+<TITLE>GESOperation</TITLE>
+GESOperation
+GESOperationClass
 <SUBSECTION Standard>
-GESTrackOperationPrivate
-ges_track_operation_get_type
-GES_IS_TRACK_OPERATION
-GES_IS_TRACK_OPERATION_CLASS
-GES_TRACK_OPERATION
-GES_TRACK_OPERATION_CLASS
-GES_TRACK_OPERATION_GET_CLASS
-GES_TYPE_TRACK_OPERATION
+GESOperationPrivate
+ges_operation_get_type
+GES_IS_OPERATION
+GES_IS_OPERATION_CLASS
+GES_OPERATION
+GES_OPERATION_CLASS
+GES_OPERATION_GET_CLASS
+GES_TYPE_OPERATION
 </SECTION>
 
 <SECTION>

diff --git a/docs/libs/ges.types b/docs/libs/ges.types
index 456aa12..a05aeb4 100644 (file)
--- a/docs/libs/ges.types
+++ b/docs/libs/ges.types
@@ -29,7 +29,7 @@ ges_image_source_get_type
 ges_track_element_get_type
 ges_base_effect_get_type
 ges_effect_get_type
-ges_track_operation_get_type
+ges_operation_get_type
 ges_source_get_type
 ges_text_overlay_get_type
 ges_title_source_get_type

diff --git a/ges/Makefile.am b/ges/Makefile.am
index ba6e9c3..79ce509 100644 (file)
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -32,7 +32,7 @@ libges_@GST_API_VERSION@_la_SOURCES =                 \
        ges-track.c                             \
        ges-track-element.c                     \
        ges-source.c                    \
-       ges-track-operation.c                   \
+       ges-operation.c                 \
        ges-uri-source.c                        \
        ges-image-source.c              \
        ges-track-transition.c                  \
@@ -88,7 +88,7 @@ libges_@GST_API_VERSION@include_HEADERS =     \
        ges-track.h                             \
        ges-track-element.h                     \
        ges-source.h                    \
-       ges-track-operation.h                   \
+       ges-operation.h                 \
        ges-uri-source.h                        \
        ges-image-source.h              \
        ges-track-transition.h                  \

diff --git a/ges/ges-base-effect.c b/ges/ges-base-effect.c
index 4afaa20..59fb178 100644 (file)
--- a/ges/ges-base-effect.c
+++ b/ges/ges-base-effect.c
@@ -30,8 +30,7 @@
 #include "ges-track-element.h"
 #include "ges-base-effect.h"
 
-G_DEFINE_ABSTRACT_TYPE (GESBaseEffect, ges_base_effect,
-    GES_TYPE_TRACK_OPERATION);
+G_DEFINE_ABSTRACT_TYPE (GESBaseEffect, ges_base_effect, GES_TYPE_OPERATION);
 
 static GHashTable *ges_base_effect_get_props_hashtable (GESTrackElement * self);
 guint pspec_hash (gconstpointer key_spec);

diff --git a/ges/ges-base-effect.h b/ges/ges-base-effect.h
index 1ed53b5..ed66bdb 100644 (file)
--- a/ges/ges-base-effect.h
+++ b/ges/ges-base-effect.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 #include <ges/ges-types.h>
-#include <ges/ges-track-operation.h>
+#include <ges/ges-operation.h>
 
 G_BEGIN_DECLS
 
@@ -47,7 +47,7 @@ typedef struct _GESBaseEffectPrivate   GESBaseEffectPrivate;
 struct _GESBaseEffect
 {
   /*< private > */
-  GESTrackOperation parent;
+  GESOperation parent;
   GESBaseEffectPrivate *priv;
 
   /* Padding for API extension */
@@ -62,7 +62,7 @@ struct _GESBaseEffect
 struct _GESBaseEffectClass
 {
   /*< private > */
-  GESTrackOperationClass parent_class;
+  GESOperationClass parent_class;
   /* Padding for API extension */
   gpointer _ges_reserved[GES_PADDING];
 

diff --git a/ges/ges-track-operation.c b/ges/ges-operation.c
similarity index 74%
rename from ges/ges-track-operation.c
rename to ges/ges-operation.c
index 072493b..6728fde 100644 (file)
--- a/ges/ges-track-operation.c
+++ b/ges/ges-operation.c
@@ -19,36 +19,35 @@
  */
 
 /**
- * SECTION:ges-track-operation
+ * SECTION:ges-operation
  * @short_description: Base Class for effects and overlays
  */
 
 #include "ges-internal.h"
 #include "ges-track-element.h"
-#include "ges-track-operation.h"
+#include "ges-operation.h"
 
-G_DEFINE_ABSTRACT_TYPE (GESTrackOperation, ges_track_operation,
-    GES_TYPE_TRACK_ELEMENT);
+G_DEFINE_ABSTRACT_TYPE (GESOperation, ges_operation, GES_TYPE_TRACK_ELEMENT);
 
-struct _GESTrackOperationPrivate
+struct _GESOperationPrivate
 {
   /* Dummy variable */
   void *nothing;
 };
 
 static void
-ges_track_operation_class_init (GESTrackOperationClass * klass)
+ges_operation_class_init (GESOperationClass * klass)
 {
   GESTrackElementClass *track_class = GES_TRACK_ELEMENT_CLASS (klass);
 
-  g_type_class_add_private (klass, sizeof (GESTrackOperationPrivate));
+  g_type_class_add_private (klass, sizeof (GESOperationPrivate));
 
   track_class->gnlobject_factorytype = "gnloperation";
 }
 
 static void
-ges_track_operation_init (GESTrackOperation * self)
+ges_operation_init (GESOperation * self)
 {
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_TRACK_OPERATION, GESTrackOperationPrivate);
+      GES_TYPE_OPERATION, GESOperationPrivate);
 }

diff --git a/ges/ges-track-operation.h b/ges/ges-operation.h
similarity index 57%
rename from ges/ges-track-operation.h
rename to ges/ges-operation.h
index 0a5f743..a1c68b5 100644 (file)
--- a/ges/ges-track-operation.h
+++ b/ges/ges-operation.h
@@ -18,8 +18,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _GES_TRACK_OPERATION
-#define _GES_TRACK_OPERATION
+#ifndef _GES_OPERATION
+#define _GES_OPERATION
 
 #include <glib-object.h>
 #include <gst/gst.h>
@@ -28,46 +28,46 @@
 
 G_BEGIN_DECLS
 
-#define GES_TYPE_TRACK_OPERATION ges_track_operation_get_type()
+#define GES_TYPE_OPERATION ges_operation_get_type()
 
-#define GES_TRACK_OPERATION(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_OPERATION, GESTrackOperation))
+#define GES_OPERATION(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_OPERATION, GESOperation))
 
-#define GES_TRACK_OPERATION_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_OPERATION, GESTrackOperationClass))
+#define GES_OPERATION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_OPERATION, GESOperationClass))
 
-#define GES_IS_TRACK_OPERATION(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_OPERATION))
+#define GES_IS_OPERATION(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_OPERATION))
 
-#define GES_IS_TRACK_OPERATION_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_OPERATION))
+#define GES_IS_OPERATION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_OPERATION))
 
-#define GES_TRACK_OPERATION_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_OPERATION, GESTrackOperationClass))
+#define GES_OPERATION_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_OPERATION, GESOperationClass))
 
-typedef struct _GESTrackOperationPrivate GESTrackOperationPrivate;
+typedef struct _GESOperationPrivate GESOperationPrivate;
 
 /**
- * GESTrackOperation:
+ * GESOperation:
  *
  * Base class for overlays, transitions, and effects
  */
 
-struct _GESTrackOperation {
+struct _GESOperation {
   /*< private >*/
   GESTrackElement parent;
 
-  GESTrackOperationPrivate *priv;
+  GESOperationPrivate *priv;
 
   /* Padding for API extension */
   gpointer _ges_reserved[GES_PADDING];
 };
 
 /**
- * GESTrackOperationClass:
+ * GESOperationClass:
  */
 
-struct _GESTrackOperationClass {
+struct _GESOperationClass {
   /*< private >*/
   GESTrackElementClass parent_class;
 
@@ -76,8 +76,8 @@ struct _GESTrackOperationClass {
   gpointer _ges_reserved[GES_PADDING];
 };
 
-GType ges_track_operation_get_type (void);
+GType ges_operation_get_type (void);
 
 G_END_DECLS
 
-#endif /* _GES_TRACK_OPERATION */
+#endif /* _GES_OPERATION */

diff --git a/ges/ges-text-overlay.c b/ges/ges-text-overlay.c
index ea42d0a..46e6111 100644 (file)
--- a/ges/ges-text-overlay.c
+++ b/ges/ges-text-overlay.c
@@ -30,7 +30,7 @@
 #include "ges-title-source.h"
 #include "ges-text-overlay.h"
 
-G_DEFINE_TYPE (GESTextOverlay, ges_text_overlay, GES_TYPE_TRACK_OPERATION);
+G_DEFINE_TYPE (GESTextOverlay, ges_text_overlay, GES_TYPE_OPERATION);
 
 struct _GESTextOverlayPrivate
 {

diff --git a/ges/ges-text-overlay.h b/ges/ges-text-overlay.h
index 7368503..a648108 100644 (file)
--- a/ges/ges-text-overlay.h
+++ b/ges/ges-text-overlay.h
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 #include <ges/ges-types.h>
 #include <ges/ges-title-source.h>
-#include <ges/ges-track-operation.h>
+#include <ges/ges-operation.h>
 
 G_BEGIN_DECLS
 #define GES_TYPE_TEXT_OVERLAY ges_text_overlay_get_type()
@@ -45,7 +45,7 @@ typedef struct _GESTextOverlayPrivate GESTextOverlayPrivate;
  */
 struct _GESTextOverlay
 {
-  GESTrackOperation parent;
+  GESOperation parent;
 
   /*< private > */
   GESTextOverlayPrivate *priv;
@@ -56,7 +56,7 @@ struct _GESTextOverlay
 
 struct _GESTextOverlayClass
 {
-  GESTrackOperationClass parent_class;
+  GESOperationClass parent_class;
 
   /*< private > */
 

diff --git a/ges/ges-track-transition.c b/ges/ges-track-transition.c
index c2406fc..891fb60 100644 (file)
--- a/ges/ges-track-transition.c
+++ b/ges/ges-track-transition.c
@@ -28,7 +28,7 @@
 #include "ges-internal.h"
 
 G_DEFINE_ABSTRACT_TYPE (GESTrackTransition, ges_track_transition,
-    GES_TYPE_TRACK_OPERATION);
+    GES_TYPE_OPERATION);
 
 struct _GESTrackTransitionPrivate
 {

diff --git a/ges/ges-track-transition.h b/ges/ges-track-transition.h
index 8d2eb5f..9875272 100644 (file)
--- a/ges/ges-track-transition.h
+++ b/ges/ges-track-transition.h
@@ -25,7 +25,7 @@
 #include <gst/gst.h>
 #include <gst/controller/gstinterpolationcontrolsource.h>
 #include <ges/ges-types.h>
-#include <ges/ges-track-operation.h>
+#include <ges/ges-operation.h>
 
 G_BEGIN_DECLS
 
@@ -60,7 +60,7 @@ typedef struct _GESTrackTransitionPrivate GESTrackTransitionPrivate;
 struct _GESTrackTransition
 {
   /*< private >*/
-  GESTrackOperation parent;
+  GESOperation parent;
 
   GESTrackTransitionPrivate *priv;
 
@@ -74,7 +74,7 @@ struct _GESTrackTransition
 
 struct _GESTrackTransitionClass {
   /*< private >*/
-  GESTrackOperationClass parent_class;
+  GESOperationClass parent_class;
   
   /*< private >*/
   /* Padding for API extension */

diff --git a/ges/ges-types.h b/ges/ges-types.h
index 262964d..86b9fb5 100644 (file)
--- a/ges/ges-types.h
+++ b/ges/ges-types.h
@@ -92,8 +92,8 @@ typedef struct _GESTrackElementClass GESTrackElementClass;
 typedef struct _GESSource GESSource;
 typedef struct _GESSourceClass GESSourceClass;
 
-typedef struct _GESTrackOperation GESTrackOperation;
-typedef struct _GESTrackOperationClass GESTrackOperationClass;
+typedef struct _GESOperation GESOperation;
+typedef struct _GESOperationClass GESOperationClass;
 
 typedef struct _GESBaseEffect GESBaseEffect;
 typedef struct _GESBaseEffectClass GESBaseEffectClass;

diff --git a/ges/ges.h b/ges/ges.h
index 8012170..302f8ed 100644 (file)
--- a/ges/ges.h
+++ b/ges/ges.h
@@ -58,7 +58,7 @@
 #include <ges/ges-track.h>
 #include <ges/ges-track-element.h>
 #include <ges/ges-source.h>
-#include <ges/ges-track-operation.h>
+#include <ges/ges-operation.h>
 
 #include <ges/ges-uri-source.h>
 #include <ges/ges-image-source.h>