mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-16 13:26:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

build fixed again. Moved type declarations in a standalone file.

Browse source
This commit is contained in:
Edward Hervey 2009-08-06 12:14:37 +02:00
parent 081f4805ef
commit f3131a2f6a
17 changed files with 251 additions and 207 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -1,8 +1,8 @@
DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
SUBDIRS = src
SUBDIRS = ges
DIST_SUBDIRS = src
DIST_SUBDIRS = ges
# include before EXTRA_DIST for win32 assignment
include $(top_srcdir)/common/win32.mak

2
autogen.sh
View file

@ -3,7 +3,7 @@
DIE=0
package=gst-editing-services
srcfile=src/ges-timeline.c
srcfile=ges/ges-timeline.c
# Make sure we have common
if test ! -f common/gst-autogen.sh;

4
configure.ac
View file

@ -19,7 +19,7 @@ dnl check if this is a release version
AS_NANO(GST_CVS="no", GST_CVS="yes")
dnl can autoconf find the source ?
AC_CONFIG_SRCDIR([src/ges-timeline.c])
AC_CONFIG_SRCDIR([ges/ges-timeline.c])
dnl define the output header for config
AM_CONFIG_HEADER([config.h])
@ -239,6 +239,6 @@ common/shave-libtool
common/m4/Makefile
gst-editing-services.spec
m4/Makefile
src/Makefile
ges/Makefile
)
AC_OUTPUT

1
ges/Makefile.am
View file

@ -17,6 +17,7 @@ libges_@GST_MAJORMINOR@_la_SOURCES = \
libges_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/ges/
libges_@GST_MAJORMINOR@include_HEADERS = \
ges-types.h \
ges.h \
ges-simple-timeline-layer.h \
ges-timeline.h \

19
ges/ges-simple-timeline-layer.h
View file

@ -21,7 +21,8 @@
#define _GES_SIMPLE_TIMELINE_LAYER
#include <glib-object.h>
#include "ges-timeline-layer.h"
#include <ges/ges-types.h>
#include <ges/ges-timeline-layer.h>
G_BEGIN_DECLS
@ -42,9 +43,6 @@ G_BEGIN_DECLS
#define GES_SIMPLE_TIMELINE_LAYER_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_SIMPLE_TIMELINE_LAYER, GESSimpleTimelineLayerClass))
typedef struct _GESSimpleTimelineLayer GESSimpleTimelineLayer;
typedef struct _GESSimpleTimelineLayerClass GESSimpleTimelineLayerClass;
struct _GESSimpleTimelineLayer {
GESTimelineLayer parent;
};
@ -58,9 +56,16 @@ GType ges_simple_timeline_layer_get_type (void);
GESSimpleTimelineLayer* ges_simple_timeline_layer_new (void);
gboolean
ges_simple_timeline_layer_add_object (GESSimpleTimelineLayer *layer, GESTimelineObject *object, gint position);
ges_simple_timeline_layer_remove_object (GESSimpleTimelineLayer *layer, GESTimelineObject *object);
ges_simple_timeline_layer_move_object (GESSimpleTimelineLayer *layer, GESTimelineObject, gint newposition);
ges_simple_timeline_layer_add_object (GESSimpleTimelineLayer *layer,
GESTimelineObject *object, gint position);
gboolean
ges_simple_timeline_layer_remove_object (GESSimpleTimelineLayer *layer,
GESTimelineObject *object);
gboolean
ges_simple_timeline_layer_move_object (GESSimpleTimelineLayer *layer,
GESTimelineObject, gint newposition);
G_END_DECLS

4
ges/ges-timeline-layer.h
View file

@ -21,6 +21,7 @@
#define _GES_TIMELINE_LAYER
#include <glib-object.h>
#include <ges/ges-types.h>
G_BEGIN_DECLS
@ -41,9 +42,6 @@ G_BEGIN_DECLS
#define GES_TIMELINE_LAYER_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_LAYER, GESTimelineLayerClass))
typedef struct _GESTimelineLayer GESTimelineLayer;
typedef struct _GESTimelineLayerClass GESTimelineLayerClass;
struct _GESTimelineLayer {
GObject parent;
};

18
ges/ges-timeline-object.c
View file

@ -28,18 +28,20 @@
*/
G_DEFINE_TYPE (GESTimelineObject, ges_timeline_object, G_TYPE_OBJECT)
G_DEFINE_TYPE (GESTimelineObject, ges_timeline_object, G_TYPE_OBJECT);
#define GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GES_TYPE_TIMELINE_OBJECT, GESTimelineObjectPrivate))
typedef struct _GESTimelineObjectPrivate GESTimelineObjectPrivate;
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GES_TYPE_TIMELINE_OBJECT, GESTimelineObjectPrivate));
struct _GESTimelineObjectPrivate
{
typedef struct _GESTimelineObjectPrivate GESTimelineObjectPrivate;
struct _GESTimelineObjectPrivate
{
int dummy;
};
};
static void
ges_timeline_object_get_property (GObject * object, guint property_id,
static void
ges_timeline_object_get_property (GObject * object, guint property_id,
GValue * value, GParamSpec * pspec)
{
switch (property_id) {

10
ges/ges-timeline-object.h
View file

@ -21,6 +21,7 @@
#define _GES_TIMELINE_OBJECT
#include <glib-object.h>
#include <ges/ges-types.h>
G_BEGIN_DECLS
@ -41,9 +42,6 @@ G_BEGIN_DECLS
#define GES_TIMELINE_OBJECT_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_OBJECT, GESTimelineObjectClass))
typedef struct _GESTimelineObject GESTimelineObject;
typedef struct _GESTimelineObjectClass GESTimelineObjectClass;
struct _GESTimelineObject {
GObject parent;
@ -62,9 +60,11 @@ struct _GESTimelineObjectClass {
GType ges_timeline_object_get_type (void);
GESTimelineObject* ges_timeline_object_new (void);
GESTimelineObject*
ges_timeline_object_new (void);
GESTrackObject * ges_timeline_object_create_track_object (GESTimelineObject * object,
GESTrackObject *
ges_timeline_object_create_track_object (GESTimelineObject * object,
GESTrack * track);
G_END_DECLS

5
ges/ges-timeline-pipeline.h
View file

@ -21,7 +21,7 @@
#define _GES_TIMELINE_PIPELINE
#include <glib-object.h>
#include <gst/gst.h>
#include <ges/ges.h>
G_BEGIN_DECLS
@ -42,9 +42,6 @@ G_BEGIN_DECLS
#define GEST_TIMELINE_PIPELINE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GEST_TYPE_TIMELINE_PIPELINE, GESTimelinePipelineClass))
typedef struct _GESTimelinePipeline GESTimelinePipeline;
typedef struct _GESTimelinePipelineClass GESTimelinePipelineClass;
struct _GESTimelinePipeline {
GstPipeline parent;
};

5
ges/ges-timeline-source.h
View file

@ -21,7 +21,7 @@
#define _GES_TIMELINE_SOURCE
#include <glib-object.h>
#include <ges-timeline-object.h>
#include <ges/ges.h>
G_BEGIN_DECLS
@ -42,9 +42,6 @@ G_BEGIN_DECLS
#define GES_TIMELINE_SOURCE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_SOURCE, GESTimelineSourceClass))
typedef struct _GESTimelineSource GESTimelineSource;
typedef struct _GESTimelineSourceClass GESTimelineSourceClass;
struct _GESTimelineSource {
GESTimelineObject parent;
};

5
ges/ges-timeline-transition.h
View file

@ -21,7 +21,7 @@
#define _GES_TIMELINE_TRANSITION
#include <glib-object.h>
#include <ges-timeline-object.h>
#include <ges/ges.h>
G_BEGIN_DECLS
@ -42,9 +42,6 @@ G_BEGIN_DECLS
#define GES_TIMELINE_TRANSITION_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_TRANSITION, GESTimelineTransitionClass))
typedef struct _GESTimelineTransition GESTimelineTransition;
typedef struct _GESTimelineTransitionClass GESTimelineTransitionClass;
struct _GESTimelineTransition {
GESTimelineObject parent;
};

6
ges/ges-timeline.h
View file

@ -22,8 +22,7 @@
#include <glib-object.h>
#include <gst/gst.h>
#include <ges/ges-timeline-layer.h>
#include <ges/ges-track.h>
#include <ges/ges-types.h>
G_BEGIN_DECLS
@ -44,9 +43,6 @@ G_BEGIN_DECLS
#define GES_TIMELINE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE, GESTimelineClass))
typedef struct _GESTimeline GESTimeline;
typedef struct _GESTimelineClass GESTimelineClass;
struct _GESTimeline {
GstBin parent;

124
ges/ges-track-object.c
View file

@ -26,37 +26,38 @@ static GQuark _priority_quark;
#define _do_init \
{ \
gint i; \
\
_start_quark = g_quark_from_static_string ("start"); \
_inpoint_quark = g_quark_from_static_string ("inpoint"); \
_duration_quark = g_quark_from_static_string ("duration"); \
_priority_quark = g_quark_from_static_string ("priority"); \
}
G_DEFINE_TYPE_WITH_CODE (GESTrackObject, ges_track_object, G_TYPE_OBJECT,
_do_init)
_do_init);
#define GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GES_TYPE_TRACK_OBJECT, GESTrackObjectPrivate))
enum
{
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GES_TYPE_TRACK_OBJECT, GESTrackObjectPrivate));
enum
{
PROP_0,
PROP_START,
PROP_INPOINT,
PROP_DURATION,
PROP_PRIORITY,
}
};
typedef struct _GESTrackObjectPrivate GESTrackObjectPrivate;
typedef struct _GESTrackObjectPrivate GESTrackObjectPrivate;
struct _GESTrackObjectPrivate
{
struct _GESTrackObjectPrivate
{
int dummy;
};
};
static void
ges_track_object_get_property (GObject * object, guint property_id,
static void
ges_track_object_get_property (GObject * object, guint property_id,
GValue * value, GParamSpec * pspec)
{
{
GESTrackObject *tobj = GES_TRACK_OBJECT (object);
switch (property_id) {
@ -75,48 +76,47 @@ G_DEFINE_TYPE_WITH_CODE (GESTrackObject, ges_track_object, G_TYPE_OBJECT,
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
}
}
static void
ges_track_object_set_property (GObject * object, guint property_id,
static void
ges_track_object_set_property (GObject * object, guint property_id,
const GValue * value, GParamSpec * pspec)
{
{
GESTrackObject *tobj = GES_TRACK_OBJECT (object);
switch (property_id) {
case PROP_START:
ges_track_object_set_start_internal (tobj,
g_value_get_uint64 (value));
ges_track_object_set_start_internal (tobj, g_value_get_uint64 (value));
break;
case PROP_INPOINT:
ges_track_object_set_inpoint_internal (tobj,
g_value_get_uint64 (value));
ges_track_object_set_inpoint_internal (tobj, g_value_get_uint64 (value));
break;
case PROP_DURATION:
ges_track_object_set_duration_internal (tobj,
g_value_get_uint64 (value));
ges_track_object_set_duration_internal (tobj, g_value_get_uint64 (value));
break;
case PROP_PRIORITY:
ges_track_object_set_priority_internal (tobj,
g_value_get_uint (value));
ges_track_object_set_priority_internal (tobj, g_value_get_uint (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
}
}
static void ges_track_object_dispose (GObject * object)
{
static void
ges_track_object_dispose (GObject * object)
{
G_OBJECT_CLASS (ges_track_object_parent_class)->dispose (object);
}
}
static void ges_track_object_finalize (GObject * object)
{
static void
ges_track_object_finalize (GObject * object)
{
G_OBJECT_CLASS (ges_track_object_parent_class)->finalize (object);
}
}
static void ges_track_object_class_init (GESTrackObjectClass * klass)
{
static void
ges_track_object_class_init (GESTrackObjectClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass, sizeof (GESTrackObjectPrivate));
@ -138,17 +138,17 @@ G_DEFINE_TYPE_WITH_CODE (GESTrackObject, ges_track_object, G_TYPE_OBJECT,
0, G_MAXUINT64, 0, G_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_PRIORITY,
g_param_spec_uint ("priority", "Priority",
"The priority of the object", 0, G_MAXUINT, 0,
G_PARAM_READWRITE));
}
"The priority of the object", 0, G_MAXUINT, 0, G_PARAM_READWRITE));
}
static void ges_track_object_init (GESTrackObject * self)
{
}
static void
ges_track_object_init (GESTrackObject * self)
{
}
GESTrackObject *ges_track_object_new (GESTimelineObject * timelineobj,
GESTrack * track)
{
GESTrackObject *
ges_track_object_new (GESTimelineObject * timelineobj, GESTrack * track)
{
GESTrackObject *obj;
obj = g_object_new (GES_TYPE_TRACK_OBJECT, NULL);
@ -159,11 +159,11 @@ G_DEFINE_TYPE_WITH_CODE (GESTrackObject, ges_track_object, G_TYPE_OBJECT,
/* Create the associated GnlObject */
ges_track_object_create_gnl_object (obj);
}
}
gboolean
ges_track_object_set_start_internal (GESTrackObject * object,
guint64 start) {
gboolean
ges_track_object_set_start_internal (GESTrackObject * object, guint64 start)
{
g_return_val_if_fail (object->gnlobject, FALSE);
if (G_UNLIKELY (start == object->start))
@ -171,11 +171,11 @@ G_DEFINE_TYPE_WITH_CODE (GESTrackObject, ges_track_object, G_TYPE_OBJECT,
g_object_set (object->gnlobject, "start", start, NULL);
return TRUE;
};
};
gboolean
ges_track_object_set_inpoint_internal (GESTrackObject * object,
guint64 inpoint) {
gboolean
ges_track_object_set_inpoint_internal (GESTrackObject * object, guint64 inpoint)
{
guint64 dur;
g_return_val_if_fail (object->gnlobject, FALSE);
@ -189,11 +189,12 @@ G_DEFINE_TYPE_WITH_CODE (GESTrackObject, ges_track_object, G_TYPE_OBJECT,
g_object_set (object->gnlobject, "media-start", inpoint, "duration", dur,
"media-duration", dur, NULL);
return TRUE;
}
}
gboolean
ges_track_object_set_duration_internal (GESTrackObject * object,
guint64 duration) {
gboolean
ges_track_object_set_duration_internal (GESTrackObject * object,
guint64 duration)
{
g_return_val_if_fail (object->gnlobject, FALSE);
if (G_UNLIKELY (duration == object->duration))
@ -202,11 +203,12 @@ G_DEFINE_TYPE_WITH_CODE (GESTrackObject, ges_track_object, G_TYPE_OBJECT,
g_object_set (object->gnlobject, "duration", duration, "media-duration",
duration, NULL);
return TRUE;
}
}
gboolean
ges_track_object_set_priority_internal (GESTrackObject * object,
guint32 priority) {
gboolean
ges_track_object_set_priority_internal (GESTrackObject * object,
guint32 priority)
{
g_return_val_if_fail (object->gnlobject, FALSE);
if (G_UNLIKELY (priority == object->priority))
@ -214,4 +216,4 @@ G_DEFINE_TYPE_WITH_CODE (GESTrackObject, ges_track_object, G_TYPE_OBJECT,
g_object_set (object->gnlobject, "priority", priority, NULL);
return TRUE;
}
}

4
ges/ges-track-object.h
View file

@ -21,6 +21,7 @@
#define _GES_TRACK_OBJECT
#include <glib-object.h>
#include <ges/ges.h>
G_BEGIN_DECLS
@ -41,9 +42,6 @@ G_BEGIN_DECLS
#define GES_TRACK_OBJECT_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_OBJECT, GESTrackObjectClass))
typedef struct _GESTrackObject GESTrackObject;
typedef struct _GESTrackObjectClass GESTrackObjectClass;
struct _GESTrackObject {
GObject parent;

7
ges/ges-track.h
View file

@ -22,7 +22,7 @@
#include <glib-object.h>
#include <gst/gst.h>
#include <ges-track-object.h>
#include <ges/ges-types.h>
G_BEGIN_DECLS
@ -43,13 +43,10 @@ G_BEGIN_DECLS
#define GES_TRACK_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK, GESTrackClass))
typedef struct _GESTrack GESTrack;
typedef struct _GESTrackClass GESTrackClass;
struct _GESTrack {
GstBin parent;
GnlComposition * composition; /* The composition associated with this track */
GstElement * composition; /* The composition associated with this track */
};
struct _GESTrackClass {

51
ges/ges-types.h Normal file
View file

@ -0,0 +1,51 @@
/* GStreamer Editing Services
* Copyright (C) 2009 Edward Hervey <bilboed@bilboed.com>
*
* 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_TYPES_H__
#define __GES_TYPES_H__
typedef struct _GESSimpleTimelineLayer GESSimpleTimelineLayer;
typedef struct _GESSimpleTimelineLayerClass GESSimpleTimelineLayerClass;
typedef struct _GESTimeline GESTimeline;
typedef struct _GESTimelineClass GESTimelineClass;
typedef struct _GESTimelineLayer GESTimelineLayer;
typedef struct _GESTimelineLayerClass GESTimelineLayerClass;
typedef struct _GESTimelineObject GESTimelineObject;
typedef struct _GESTimelineObjectClass GESTimelineObjectClass;
typedef struct _GESTimelinePipeline GESTimelinePipeline;
typedef struct _GESTimelinePipelineClass GESTimelinePipelineClass;
typedef struct _GESTimelineSource GESTimelineSource;
typedef struct _GESTimelineSourceClass GESTimelineSourceClass;
typedef struct _GESTimelineTransition GESTimelineTransition;
typedef struct _GESTimelineTransitionClass GESTimelineTransitionClass;
typedef struct _GESTrack GESTrack;
typedef struct _GESTrackClass GESTrackClass;
typedef struct _GESTrackObject GESTrackObject;
typedef struct _GESTrackObjectClass GESTrackObjectClass;
#endif /* __GES_TYPES_H__ */

5
ges/ges.h
View file

@ -23,14 +23,17 @@
#include <glib.h>
#include <gst/gst.h>
#include <ges/ges-simple-timeline-layer.h>
#include <ges/ges-types.h>
#include <ges/ges-timeline.h>
#include <ges/ges-timeline-layer.h>
#include <ges/ges-simple-timeline-layer.h>
#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-track.h>
#include <ges/ges-track-object.h>
GST_DEBUG_CATEGORY_EXTERN (ges_debug);
#define GST_CAT_DEFAULT ges_debug