check in GESTrackVideoTransition, empty subclass of TrackTransition

diff --git a/ges/Makefile.am b/ges/Makefile.am
index b0abec0..e53c3b3 100644 (file)
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -26,6 +26,7 @@ libges_@GST_MAJORMINOR@_la_SOURCES =          \
        ges-track-filesource.c                  \
        ges-track-transition.c                  \
        ges-track-audio-transition.c                    \
+       ges-track-video-transition.c                    \
        ges-track-background-source.c                   \
        ges-track-video-background-source.c                     \
        ges-track-audio-background-source.c                     \
@@ -56,6 +57,7 @@ libges_@GST_MAJORMINOR@include_HEADERS =      \
        ges-track-filesource.h                  \
        ges-track-transition.h                  \
        ges-track-audio-transition.h                    \
+       ges-track-video-transition.h                    \
        ges-track-background-source.h                   \
        ges-track-video-background-source.h                     \
        ges-track-audio-background-source.h                     \

diff --git a/ges/ges-track-video-transition.c b/ges/ges-track-video-transition.c
new file mode 100644 (file)
index 0000000..f133940
--- /dev/null
+++ b/ges/ges-track-video-transition.c
@@ -0,0 +1,105 @@
+/* GStreamer Editing Services
+ * Copyright (C) 2010 Brandon Lewis <brandon.lewis@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.
+ */
+
+/**
+ * SECTION:ges-track-video-transition
+ * @short_description: implements video crossfade transitino
+ */
+
+#include "ges-internal.h"
+#include "ges-track-object.h"
+#include "ges-track-video-transition.h"
+
+G_DEFINE_TYPE (GESTrackVideoTransition, ges_track_video_transition,
+    GES_TYPE_TRACK_TRANSITION);
+
+enum
+{
+  PROP_0,
+};
+
+static void ges_track_video_transition_dispose (GObject * object);
+
+static void ges_track_video_transition_finalize (GObject * object);
+
+static void ges_track_video_transition_get_property (GObject * object, guint
+    property_id, GValue * value, GParamSpec * pspec);
+
+static void ges_track_video_transition_set_property (GObject * object, guint
+    property_id, const GValue * value, GParamSpec * pspec);
+
+static void
+ges_track_video_transition_class_init (GESTrackVideoTransitionClass * klass)
+{
+  GObjectClass *object_class;
+  GESTrackTransitionClass *bg_class;
+
+  object_class = G_OBJECT_CLASS (klass);
+  bg_class = GES_TRACK_TRANSITION_CLASS (klass);
+
+  object_class->get_property = ges_track_video_transition_get_property;
+  object_class->set_property = ges_track_video_transition_set_property;
+  object_class->dispose = ges_track_video_transition_dispose;
+  object_class->finalize = ges_track_video_transition_finalize;
+
+}
+
+static void
+ges_track_video_transition_init (GESTrackVideoTransition * self)
+{
+}
+
+static void
+ges_track_video_transition_dispose (GObject * object)
+{
+  G_OBJECT_CLASS (ges_track_video_transition_parent_class)->dispose (object);
+}
+
+static void
+ges_track_video_transition_finalize (GObject * object)
+{
+  G_OBJECT_CLASS (ges_track_video_transition_parent_class)->finalize (object);
+}
+
+static void
+ges_track_video_transition_get_property (GObject * object,
+    guint property_id, GValue * value, GParamSpec * pspec)
+{
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+  }
+}
+
+static void
+ges_track_video_transition_set_property (GObject * object,
+    guint property_id, const GValue * value, GParamSpec * pspec)
+{
+  switch (property_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+  }
+}
+
+GESTrackVideoTransition *
+ges_track_video_transition_new (void)
+{
+  return g_object_new (GES_TYPE_TRACK_VIDEO_TRANSITION, NULL);
+}

diff --git a/ges/ges-track-video-transition.h b/ges/ges-track-video-transition.h
new file mode 100644 (file)
index 0000000..defabfd
--- /dev/null
+++ b/ges/ges-track-video-transition.h
@@ -0,0 +1,78 @@
+/* GStreamer Editing Services
+ * Copyright (C) 2010 Brandon Lewis <brandon.lewis@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_TRACK_VIDEO_TRANSITION
+#define _GES_TRACK_VIDEO_TRANSITION
+
+#include <glib-object.h>
+#include <ges/ges-types.h>
+#include <ges/ges-track-transition.h>
+
+G_BEGIN_DECLS
+
+#define GES_TYPE_TRACK_VIDEO_TRANSITION ges_track_video_transition_get_type()
+
+#define GES_TRACK_VIDEO_TRANSITION(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_VIDEO_TRANSITION, GESTrackVideoTransition))
+
+#define GES_TRACK_VIDEO_TRANSITION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_VIDEO_TRANSITION, GESTrackVideoTransitionClass))
+
+#define GES_IS_TRACK_VIDEO_TRANSITION(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_VIDEO_TRANSITION))
+
+#define GES_IS_TRACK_VIDEO_TRANSITION_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_VIDEO_TRANSITION))
+
+#define GES_TRACK_VIDEO_TRANSITION_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_VIDEO_TRANSITION, GESTrackVideoTransitionClass))
+
+/** 
+ * GESTrackVideoTransition:
+ * @parent: parent
+ *
+ */
+
+struct _GESTrackVideoTransition {
+  GESTrackTransition parent;
+
+  /*< public >*/
+};
+
+/**
+ * GESTrackVideoTransitionClass:
+ * @parent_class: parent class
+ *
+ */
+
+struct _GESTrackVideoTransitionClass {
+  GESTrackTransitionClass parent_class;
+
+  /*< public >*/
+};
+
+GType ges_track_video_transition_get_type (void);
+
+GESTrackVideoTransition* ges_track_video_transition_new (void);
+
+G_END_DECLS
+
+#endif /* _GES_TRACK_VIDEO_transition */
+

diff --git a/ges/ges-types.h b/ges/ges-types.h
index 93cafed..a3380c8 100644 (file)
--- a/ges/ges-types.h
+++ b/ges/ges-types.h
@@ -73,6 +73,10 @@ typedef struct _GESTrackAudioTransition GESTrackAudioTransition;
 typedef struct _GESTrackAudioTransitionClass
   GESTrackAudioTransitionClass;
 
+typedef struct _GESTrackVideoTransition GESTrackVideoTransition;
+typedef struct _GESTrackVideoTransitionClass
+  GESTrackVideoTransitionClass;
+
 typedef struct _GESTrackBackgroundSource GESTrackBackgroundSource;
 typedef struct _GESTrackBackgroundSourceClass
   GESTrackBackgroundSourceClass;