Rename GESTrackTransition to GESTransition

diff --git a/android/ges.mk b/android/ges.mk
index e2567bf..3357602 100644 (file)
--- a/android/ges.mk
+++ b/android/ges.mk
@@ -31,7 +31,7 @@ LOCAL_SRC_FILES :=                            \
        ges-operation.c                 \
        ges-uri-source.c                        \
        ges-image-source.c              \
-       ges-track-transition.c                  \
+       ges-transition.c                        \
        ges-track-audio-transition.c            \
        ges-track-video-transition.c            \
        ges-video-test-source.c         \

diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml
index 5bd8fe6..75d16a5 100644 (file)
--- a/docs/libs/ges-docs.sgml
+++ b/docs/libs/ges-docs.sgml
@@ -68,7 +68,7 @@ platform as well as Windows. It is released under the GNU Library General Public
     <xi:include href="xml/ges-audio-test-source.xml"/>
     <xi:include href="xml/ges-video-test-source.xml"/>
     <xi:include href="xml/ges-text-overlay.xml"/>
-    <xi:include href="xml/ges-track-transition.xml"/>
+    <xi:include href="xml/ges-transition.xml"/>
     <xi:include href="xml/ges-track-video-transition.xml"/>
     <xi:include href="xml/ges-track-audio-transition.xml"/>
     <xi:include href="xml/ges-image-source.xml"/>

diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt
index b3c5837..cff36d9 100644 (file)
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -195,19 +195,19 @@ ges_image_source_get_type
 </SECTION>
 
 <SECTION>
-<FILE>ges-track-transition</FILE>
-<TITLE>GESTrackTransition</TITLE>
-GESTrackTransition
-GESTrackTransitionClass
+<FILE>ges-transition</FILE>
+<TITLE>GESTransition</TITLE>
+GESTransition
+GESTransitionClass
 <SUBSECTION Standard>
-GESTrackTransitionPrivate
-GES_IS_TRACK_TRANSITION
-GES_IS_TRACK_TRANSITION_CLASS
-GES_TRACK_TRANSITION
-GES_TRACK_TRANSITION_CLASS
-GES_TRACK_TRANSITION_GET_CLASS
-GES_TYPE_TRACK_TRANSITION
-ges_track_transition_get_type
+GESTransitionPrivate
+GES_IS_TRANSITION
+GES_IS_TRANSITION_CLASS
+GES_TRANSITION
+GES_TRANSITION_CLASS
+GES_TRANSITION_GET_CLASS
+GES_TYPE_TRANSITION
+ges_transition_get_type
 </SECTION>
 
 <SECTION>

diff --git a/docs/libs/ges.types b/docs/libs/ges.types
index a05aeb4..ee1b0ae 100644 (file)
--- a/docs/libs/ges.types
+++ b/docs/libs/ges.types
@@ -33,7 +33,7 @@ ges_operation_get_type
 ges_source_get_type
 ges_text_overlay_get_type
 ges_title_source_get_type
-ges_track_transition_get_type
+ges_transition_get_type
 %ges_track_type_get_type
 ges_video_test_source_get_type
 ges_track_video_transition_get_type

diff --git a/ges/Makefile.am b/ges/Makefile.am
index 79ce509..945c568 100644 (file)
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -35,7 +35,7 @@ libges_@GST_API_VERSION@_la_SOURCES =                 \
        ges-operation.c                 \
        ges-uri-source.c                        \
        ges-image-source.c              \
-       ges-track-transition.c                  \
+       ges-transition.c                        \
        ges-track-audio-transition.c            \
        ges-track-video-transition.c            \
        ges-video-test-source.c         \
@@ -91,7 +91,7 @@ libges_@GST_API_VERSION@include_HEADERS =     \
        ges-operation.h                 \
        ges-uri-source.h                        \
        ges-image-source.h              \
-       ges-track-transition.h                  \
+       ges-transition.h                        \
        ges-track-audio-transition.h            \
        ges-track-video-transition.h            \
        ges-video-test-source.h         \

diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c
index 23e75ac..151e760 100644 (file)
--- a/ges/ges-timeline.c
+++ b/ges/ges-timeline.c
@@ -754,7 +754,7 @@ _create_auto_transition_from_transitions (GESTimeline * timeline,
     else if (_START (maybe_transition) != _START (next) ||
         _DURATION (maybe_transition) != transition_duration)
       continue;
-    else if (GES_IS_TRACK_TRANSITION (maybe_transition))
+    else if (GES_IS_TRANSITION (maybe_transition))
       /* Use that transition */
       /* TODO We should make sure that the transition contains only
        * TrackElement-s in @track and if it is not the case properly unlink the

diff --git a/ges/ges-track-audio-transition.c b/ges/ges-track-audio-transition.c
index 0f5df04..64cac6e 100644 (file)
--- a/ges/ges-track-audio-transition.c
+++ b/ges/ges-track-audio-transition.c
@@ -30,7 +30,7 @@
 #include <gst/controller/gstdirectcontrolbinding.h>
 
 G_DEFINE_TYPE (GESTrackAudioTransition, ges_track_audio_transition,
-    GES_TYPE_TRACK_TRANSITION);
+    GES_TYPE_TRANSITION);
 
 struct _GESTrackAudioTransitionPrivate
 {

diff --git a/ges/ges-track-audio-transition.h b/ges/ges-track-audio-transition.h
index fd8f0bd..5f09732 100644 (file)
--- a/ges/ges-track-audio-transition.h
+++ b/ges/ges-track-audio-transition.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 #include <ges/ges-types.h>
-#include <ges/ges-track-transition.h>
+#include <ges/ges-transition.h>
 
 G_BEGIN_DECLS
 
@@ -52,7 +52,7 @@ typedef struct _GESTrackAudioTransitionPrivate GESTrackAudioTransitionPrivate;
  */
 
 struct _GESTrackAudioTransition {
-  GESTrackTransition parent;
+  GESTransition parent;
 
   /*< private >*/
   GESTrackAudioTransitionPrivate *priv;
@@ -62,7 +62,7 @@ struct _GESTrackAudioTransition {
 };
 
 struct _GESTrackAudioTransitionClass {
-  GESTrackTransitionClass parent_class;
+  GESTransitionClass parent_class;
 
   /* Padding for API extension */
   gpointer _ges_reserved[GES_PADDING];

diff --git a/ges/ges-track-video-transition.c b/ges/ges-track-video-transition.c
index 65a6641..1becdac 100644 (file)
--- a/ges/ges-track-video-transition.c
+++ b/ges/ges-track-video-transition.c
@@ -29,7 +29,7 @@
 #include <gst/controller/gstdirectcontrolbinding.h>
 
 G_DEFINE_TYPE (GESTrackVideoTransition, ges_track_video_transition,
-    GES_TYPE_TRACK_TRANSITION);
+    GES_TYPE_TRANSITION);
 
 static inline void
 ges_track_video_transition_set_border_internal (GESTrackVideoTransition * self,

diff --git a/ges/ges-track-video-transition.h b/ges/ges-track-video-transition.h
index d4b4d49..c0765d6 100644 (file)
--- a/ges/ges-track-video-transition.h
+++ b/ges/ges-track-video-transition.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 #include <ges/ges-types.h>
-#include <ges/ges-track-transition.h>
+#include <ges/ges-transition.h>
 
 G_BEGIN_DECLS
 
@@ -51,7 +51,7 @@ typedef struct _GESTrackVideoTransitionPrivate GESTrackVideoTransitionPrivate;
  */
 
 struct _GESTrackVideoTransition {
-  GESTrackTransition parent;
+  GESTransition parent;
 
   /*< private >*/
 
@@ -68,7 +68,7 @@ struct _GESTrackVideoTransition {
  */
 
 struct _GESTrackVideoTransitionClass {
-  GESTrackTransitionClass parent_class;
+  GESTransitionClass parent_class;
 
   /*< private >*/
   /* Padding for API extension */

diff --git a/ges/ges-transition-clip.c b/ges/ges-transition-clip.c
index 7152168..1ef9c7e 100644 (file)
--- a/ges/ges-transition-clip.c
+++ b/ges/ges-transition-clip.c
@@ -304,7 +304,7 @@ ges_tl_transition_create_track_element (GESClip * obj, GESTrackType type)
   GESTrackElement *res = NULL;
   GESTrackType supportedformats;
 
-  GST_DEBUG ("Creating a GESTrackTransition");
+  GST_DEBUG ("Creating a GESTransition");
 
   supportedformats = ges_clip_get_supported_formats (obj);
   if (type == GES_TRACK_TYPE_VIDEO) {

diff --git a/ges/ges-track-transition.c b/ges/ges-transition.c
similarity index 73%
rename from ges/ges-track-transition.c
rename to ges/ges-transition.c
index 891fb60..b600a09 100644 (file)
--- a/ges/ges-track-transition.c
+++ b/ges/ges-transition.c
@@ -19,7 +19,7 @@
  */
 
 /** 
- * SECTION:ges-track-transition
+ * SECTION:ges-transition
  * @short_description: base class for audio and video transitions
  *
  */
@@ -27,10 +27,9 @@
 #include <ges/ges.h>
 #include "ges-internal.h"
 
-G_DEFINE_ABSTRACT_TYPE (GESTrackTransition, ges_track_transition,
-    GES_TYPE_OPERATION);
+G_DEFINE_ABSTRACT_TYPE (GESTransition, ges_transition, GES_TYPE_OPERATION);
 
-struct _GESTrackTransitionPrivate
+struct _GESTransitionPrivate
 {
   /*  Dummy variable */
   void *nothing;
@@ -38,14 +37,14 @@ struct _GESTrackTransitionPrivate
 
 
 static void
-ges_track_transition_class_init (GESTrackTransitionClass * klass)
+ges_transition_class_init (GESTransitionClass * klass)
 {
-  g_type_class_add_private (klass, sizeof (GESTrackTransitionPrivate));
+  g_type_class_add_private (klass, sizeof (GESTransitionPrivate));
 }
 
 static void
-ges_track_transition_init (GESTrackTransition * self)
+ges_transition_init (GESTransition * self)
 {
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GES_TYPE_TRACK_TRANSITION, GESTrackTransitionPrivate);
+      GES_TYPE_TRANSITION, GESTransitionPrivate);
 }

diff --git a/ges/ges-track-transition.h b/ges/ges-transition.h
similarity index 57%
rename from ges/ges-track-transition.h
rename to ges/ges-transition.h
index 9875272..2932367 100644 (file)
--- a/ges/ges-track-transition.h
+++ b/ges/ges-transition.h
@@ -18,8 +18,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _GES_TRACK_TRANSITION
-#define _GES_TRACK_TRANSITION
+#ifndef _GES_TRANSITION
+#define _GES_TRANSITION
 
 #include <glib-object.h>
 #include <gst/gst.h>
@@ -29,50 +29,50 @@
 
 G_BEGIN_DECLS
 
-#define GES_TYPE_TRACK_TRANSITION ges_track_transition_get_type()
+#define GES_TYPE_TRANSITION ges_transition_get_type()
 
-#define GES_TRACK_TRANSITION(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_TRANSITION,\
-        GESTrackTransition))
+#define GES_TRANSITION(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRANSITION,\
+        GESTransition))
 
-#define GES_TRACK_TRANSITION_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_TRANSITION,\
-        GESTrackTransitionClass))
+#define GES_TRANSITION_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRANSITION,\
+        GESTransitionClass))
 
-#define GES_IS_TRACK_TRANSITION(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_TRANSITION))
+#define GES_IS_TRANSITION(obj) \
+    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRANSITION))
 
-#define GES_IS_TRACK_TRANSITION_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_TRANSITION))
+#define GES_IS_TRANSITION_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRANSITION))
 
-#define GES_TRACK_TRANSITION_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_TRANSITION,\
-        GESTrackTransitionClass))
+#define GES_TRANSITION_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRANSITION,\
+        GESTransitionClass))
 
-typedef struct _GESTrackTransitionPrivate GESTrackTransitionPrivate;
+typedef struct _GESTransitionPrivate GESTransitionPrivate;
 
 /**
- * GESTrackTransition:
+ * GESTransition:
  *
  * Base class for media transitions.
  */
 
-struct _GESTrackTransition
+struct _GESTransition
 {
   /*< private >*/
   GESOperation parent;
 
-  GESTrackTransitionPrivate *priv;
+  GESTransitionPrivate *priv;
 
   /* Padding for API extension */
   gpointer _ges_reserved[GES_PADDING];
 };
 
 /**
- * GESTrackTransitionClass:
+ * GESTransitionClass:
  */
 
-struct _GESTrackTransitionClass {
+struct _GESTransitionClass {
   /*< private >*/
   GESOperationClass parent_class;
   
@@ -81,7 +81,7 @@ struct _GESTrackTransitionClass {
   gpointer _ges_reserved[GES_PADDING];
 };
 
-GType ges_track_transition_get_type (void);
+GType ges_transition_get_type (void);
 
 G_END_DECLS
 

diff --git a/ges/ges-types.h b/ges/ges-types.h
index 86b9fb5..5dcab52 100644 (file)
--- a/ges/ges-types.h
+++ b/ges/ges-types.h
@@ -107,8 +107,8 @@ typedef struct _GESUriSourceClass GESUriSourceClass;
 typedef struct _GESImageSource GESImageSource;
 typedef struct _GESImageSourceClass GESImageSourceClass;
 
-typedef struct _GESTrackTransition GESTrackTransition;
-typedef struct _GESTrackTransitionClass GESTrackTransitionClass;
+typedef struct _GESTransition GESTransition;
+typedef struct _GESTransitionClass GESTransitionClass;
 
 typedef struct _GESTrackAudioTransition GESTrackAudioTransition;
 typedef struct _GESTrackAudioTransitionClass

diff --git a/ges/ges.h b/ges/ges.h
index 302f8ed..e9db6de 100644 (file)
--- a/ges/ges.h
+++ b/ges/ges.h
@@ -66,7 +66,7 @@
 #include <ges/ges-audio-test-source.h>
 #include <ges/ges-title-source.h>
 #include <ges/ges-text-overlay.h>
-#include <ges/ges-track-transition.h>
+#include <ges/ges-transition.h>
 #include <ges/ges-track-video-transition.h>
 #include <ges/ges-track-audio-transition.h>
 #include <ges/ges-base-effect.h>