GESTimelineOperation: New abstract class for operations

This is a new class for all timeline objects that both produce and
consume data.

The existing subclasses of it are now:
* GESTimelineOverlay
* GESTimelineTransition

diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml
index ec3c9cbc5cf1edf6091d989269e4e9266022e4ec..530daa509803aa79ad8ee37b6d952c6639c62c3d 100644 (file)
--- a/docs/libs/ges-docs.sgml
+++ b/docs/libs/ges-docs.sgml
@@ -38,6 +38,7 @@ platform as well as Windows. It is released under the GNU Library General Public
     <xi:include href="xml/ges-timeline-layer.xml"/>
     <xi:include href="xml/ges-timeline-object.xml"/>
     <xi:include href="xml/ges-timeline-source.xml"/>
+    <xi:include href="xml/ges-timeline-operation.xml"/>
     <xi:include href="xml/ges-timeline-overlay.xml"/>
     <xi:include href="xml/ges-track.xml"/>
     <xi:include href="xml/ges-track-object.xml"/>

diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt
index 66a070d7092f802a1c89c31f3d35b8ee4028346c..07ef695ae51f93d139d187dee4ee795c9dae098e 100644 (file)
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -353,6 +353,22 @@ GES_TIMELINE_FILE_SOURCE_GET_CLASS
 GES_TYPE_TIMELINE_FILE_SOURCE
 </SECTION>
 
+<SECTION>
+<FILE>ges-timeline-operation</FILE>
+<TITLE>GESTimelineOperation</TITLE>
+GESTimelineOperation
+<SUBSECTION Standard>
+GESTimelineOperationClass
+GESTimelineOperationPrivate
+GES_TIMELINE_OPERATION
+GES_IS_TIMELINE_OPERATION
+GES_TYPE_TIMELINE_OPERATION
+ges_timeline_operation_get_type
+GES_TIMELINE_OPERATION_CLASS
+GES_IS_TIMELINE_OPERATION_CLASS
+GES_TIMELINE_OPERATION_GET_CLASS
+</SECTION>
+
 <SECTION>
 <FILE>ges-timeline-overlay</FILE>
 <TITLE>GESTimelineOverlay</TITLE>

diff --git a/docs/libs/ges.types b/docs/libs/ges.types
index 3d79f519917d3c37c4f2a438762ea0aa06282ff4..ad02ea7195dcb85848c8b109eff906089de33300 100644 (file)
--- a/docs/libs/ges.types
+++ b/docs/libs/ges.types
@@ -10,6 +10,7 @@ ges_text_valign_get_type
 ges_timeline_get_type
 ges_timeline_layer_get_type
 ges_timeline_object_get_type
+ges_timeline_operation_get_type
 ges_timeline_overlay_get_type
 ges_timeline_pipeline_get_type
 ges_timeline_source_get_type

diff --git a/ges/Makefile.am b/ges/Makefile.am
index 5efb4f328123864749c561ec187bbb34e9adb9c6..4894192ef60b10d8aa3c8f47d20c4cfb385ebc68 100644 (file)
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -19,6 +19,7 @@ libges_@GST_MAJORMINOR@_la_SOURCES =          \
        ges-timeline-pipeline.c                 \
        ges-timeline-source.c                   \
        ges-timeline-file-source.c              \
+       ges-timeline-operation.c                \
        ges-timeline-transition.c               \
        ges-timeline-test-source.c              \
        ges-timeline-title-source.c             \
@@ -57,6 +58,7 @@ libges_@GST_MAJORMINOR@include_HEADERS =      \
        ges-timeline-pipeline.h                 \
        ges-timeline-source.h                   \
        ges-timeline-file-source.h              \
+       ges-timeline-operation.h                \
        ges-timeline-transition.h               \
        ges-timeline-test-source.h              \
        ges-timeline-title-source.h             \

diff --git a/ges/ges-timeline-operation.c b/ges/ges-timeline-operation.c
new file mode 100644 (file)
index 0000000..3dd3bb3
--- /dev/null
+++ b/ges/ges-timeline-operation.c
@@ -0,0 +1,51 @@
+/* GStreamer Editing Services
+ * Copyright (C) 2009 Edward Hervey <edward.hervey@collabora.co.uk>
+ *               2009 Nokia Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * SECTION:ges-timeline-operation
+ * @short_description: Base Class for operations in a #GESTimelineLayer
+ *
+ * Operations are any kind of object that both outputs AND consumes data.
+ */
+
+#include "ges.h"
+#include "ges-internal.h"
+#include "ges-timeline-operation.h"
+
+G_DEFINE_ABSTRACT_TYPE (GESTimelineOperation, ges_timeline_operation,
+    GES_TYPE_TIMELINE_OBJECT);
+
+struct _GESTimelineOperationPrivate
+{
+  void *nada;
+};
+
+static void
+ges_timeline_operation_class_init (GESTimelineOperationClass * klass)
+{
+  g_type_class_add_private (klass, sizeof (GESTimelineOperationPrivate));
+}
+
+static void
+ges_timeline_operation_init (GESTimelineOperation * self)
+{
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+      GES_TYPE_TIMELINE_OPERATION, GESTimelineOperationPrivate);
+}

diff --git a/ges/ges-timeline-operation.h b/ges/ges-timeline-operation.h
new file mode 100644 (file)
index 0000000..96e9ad1
--- /dev/null
+++ b/ges/ges-timeline-operation.h
@@ -0,0 +1,82 @@
+/* GStreamer Editing Services
+ * Copyright (C) 2010 Edward Hervey <edward.hervey@collabora.co.uk>
+ *               2010 Nokia Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _GES_TIMELINE_OPERATION
+#define _GES_TIMELINE_OPERATION
+
+#include <glib-object.h>
+#include <gst/gst.h>
+#include <ges/ges-types.h>
+#include <ges/ges-timeline-object.h>
+
+G_BEGIN_DECLS
+
+#define GES_TYPE_TIMELINE_OPERATION ges_timeline_operation_get_type()
+
+#define GES_TIMELINE_OPERATION(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TIMELINE_OPERATION, GESTimelineOperation))
+
+#define GES_TIMELINE_OPERATION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TIMELINE_OPERATION, GESTimelineOperationClass))
+
+#define GES_IS_TIMELINE_OPERATION(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TIMELINE_OPERATION))
+
+#define GES_IS_TIMELINE_OPERATION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TIMELINE_OPERATION))
+
+#define GES_TIMELINE_OPERATION_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_OPERATION, GESTimelineOperationClass))
+
+typedef struct _GESTimelineOperationPrivate GESTimelineOperationPrivate;
+
+/**
+ * GESTimelineOperation:
+ *
+ * The GESTimelineOperation subclass. Subclasses can access these fields.
+ */
+struct _GESTimelineOperation {
+  /*< private >*/
+  GESTimelineObject parent;
+
+  GESTimelineOperationPrivate *priv;
+
+  /* Padding for API extension */
+  gpointer _ges_reserved[GES_PADDING];
+};
+
+/**
+ * GESTimelineOperationClass:
+ */
+struct _GESTimelineOperationClass {
+  /*< private >*/
+  GESTimelineObjectClass parent_class;
+
+  /*< private >*/
+  /* Padding for API extension */
+  gpointer _ges_reserved[GES_PADDING];
+};
+
+GType ges_timeline_operation_get_type (void);
+
+G_END_DECLS
+
+#endif /* _GES_TIMELINE_OPERATION */
+

diff --git a/ges/ges-timeline-overlay.c b/ges/ges-timeline-overlay.c
index 23ebc51da779c30bcbf09fedbd90755d96ee68a6..09b4dab505f775fded6b4b514d6f47855928d858 100644 (file)
--- a/ges/ges-timeline-overlay.c
+++ b/ges/ges-timeline-overlay.c
@@ -31,11 +31,11 @@
  */
 
 #include "ges-internal.h"
-#include "ges-timeline-object.h"
+#include "ges-timeline-operation.h"
 #include "ges-timeline-overlay.h"
 
-G_DEFINE_TYPE (GESTimelineOverlay, ges_timeline_overlay,
-    GES_TYPE_TIMELINE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE (GESTimelineOverlay, ges_timeline_overlay,
+    GES_TYPE_TIMELINE_OPERATION);
 
 struct _GESTimelineOverlayPrivate
 {

diff --git a/ges/ges-timeline-overlay.h b/ges/ges-timeline-overlay.h
index 1db3d720c42cac50dd828c5e6169178a3ae7334a..9be209f30bdaf3d0e497499306a0fc67de0eb0c7 100644 (file)
--- a/ges/ges-timeline-overlay.h
+++ b/ges/ges-timeline-overlay.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 #include <ges/ges-types.h>
-#include <ges/ges-timeline-object.h>
+#include <ges/ges-timeline-operation.h>
 
 G_BEGIN_DECLS
 
@@ -52,8 +52,7 @@ typedef struct _GESTimelineOverlayPrivate GESTimelineOverlayPrivate;
 
 struct _GESTimelineOverlay {
   /*< private >*/
-
-  GESTimelineObject parent;
+  GESTimelineOperation parent;
 
   GESTimelineOverlayPrivate *priv;
 
@@ -67,7 +66,7 @@ struct _GESTimelineOverlay {
  */
 
 struct _GESTimelineOverlayClass {
-  GESTimelineObjectClass parent_class;
+  GESTimelineOperationClass parent_class;
 
   /*< private >*/
   /* Padding for API extension */

diff --git a/ges/ges-timeline-transition.c b/ges/ges-timeline-transition.c
index 892128fc3d322d2acef11355aa7a35610c2a5df2..650acc4cb9816cf70cedd1761edeb8a01134eb31 100644 (file)
--- a/ges/ges-timeline-transition.c
+++ b/ges/ges-timeline-transition.c
@@ -54,7 +54,7 @@ enum
 };
 
 G_DEFINE_TYPE (GESTimelineTransition, ges_timeline_transition,
-    GES_TYPE_TIMELINE_OBJECT);
+    GES_TYPE_TIMELINE_OPERATION);
 
 static GESTrackObject *ges_tl_transition_create_track_object (GESTimelineObject
     * self, GESTrack * track);

diff --git a/ges/ges-timeline-transition.h b/ges/ges-timeline-transition.h
index 6e42f4b84baecfc8b1dd960f1f73127de519856d..97843de76e6357c51ea08acb768d7041e39aec5b 100644 (file)
--- a/ges/ges-timeline-transition.h
+++ b/ges/ges-timeline-transition.h
@@ -52,7 +52,7 @@ typedef struct _GESTimelineTransitionPrivate GESTimelineTransitionPrivate;
  */
 struct _GESTimelineTransition {
   /*< private >*/
-  GESTimelineObject parent;
+  GESTimelineOperation parent;
 
   /*< public >*/
   GESVideoTransitionType vtype;
@@ -71,7 +71,7 @@ struct _GESTimelineTransition {
 
 struct _GESTimelineTransitionClass {
   /*< private >*/
-  GESTimelineObjectClass parent_class;
+  GESTimelineOperationClass parent_class;
 
   /* Padding for API extension */
   gpointer _ges_reserved[GES_PADDING];

diff --git a/ges/ges-types.h b/ges/ges-types.h
index 387327089ec2f35b7161c063e56f0eccf3ef2079..479129b2be01ce26989c8106374cba1465ea0f97 100644 (file)
--- a/ges/ges-types.h
+++ b/ges/ges-types.h
@@ -41,6 +41,9 @@ typedef struct _GESTimelineLayerClass GESTimelineLayerClass;
 typedef struct _GESTimelineObject GESTimelineObject;
 typedef struct _GESTimelineObjectClass GESTimelineObjectClass;
 
+typedef struct _GESTimelineOperation GESTimelineOperation;
+typedef struct _GESTimelineOperationClass GESTimelineOperationClass;
+
 typedef struct _GESTimelinePipeline GESTimelinePipeline;
 typedef struct _GESTimelinePipelineClass GESTimelinePipelineClass;
 

diff --git a/ges/ges.h b/ges/ges.h
index 8be9a34f65799851a31969864acfea680f32160f..6a17ca11114bba5a705b07c9b5c706720fdcfeb7 100644 (file)
--- a/ges/ges.h
+++ b/ges/ges.h
@@ -33,11 +33,12 @@
 #include <ges/ges-timeline-object.h>
 #include <ges/ges-timeline-pipeline.h>
 #include <ges/ges-timeline-source.h>
-#include <ges/ges-timeline-transition.h>
 #include <ges/ges-timeline-test-source.h>
 #include <ges/ges-timeline-title-source.h>
+#include <ges/ges-timeline-operation.h>
 #include <ges/ges-timeline-overlay.h>
 #include <ges/ges-timeline-text-overlay.h>
+#include <ges/ges-timeline-transition.h>
 #include <ges/ges-track.h>
 #include <ges/ges-track-object.h>
 #include <ges/ges-track-source.h>