mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-23 17:14:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

Rename GESTrackImageSource to GESImageSource

Browse source
This commit is contained in:
Thibault Saunier 2013-01-26 14:21:56 -03:00
parent 037b71bc16
commit 6aa01b594a
11 changed files with 74 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/ges.mk
View file

@ -30,7 +30,7 @@ LOCAL_SRC_FILES := \
ges-source.c \ ges-source.c \
ges-track-operation.c \ ges-track-operation.c \
ges-uri-source.c \ ges-uri-source.c \
ges-track-image-source.c \ ges-image-source.c \
ges-track-transition.c \ ges-track-transition.c \
ges-track-audio-transition.c \ ges-track-audio-transition.c \
ges-track-video-transition.c \ ges-track-video-transition.c \

2
docs/libs/ges-docs.sgml
View file

@ -71,7 +71,7 @@ platform as well as Windows. It is released under the GNU Library General Public
<xi:include href="xml/ges-track-transition.xml"/> <xi:include href="xml/ges-track-transition.xml"/>
<xi:include href="xml/ges-track-video-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-track-audio-transition.xml"/>
<xi:include href="xml/ges-track-image-source.xml"/> <xi:include href="xml/ges-image-source.xml"/>
<xi:include href="xml/ges-effect.xml"/> <xi:include href="xml/ges-effect.xml"/>
</chapter> </chapter>

26
docs/libs/ges-sections.txt
View file

@ -178,20 +178,20 @@ ges_track_filesource_get_type
</SECTION> </SECTION>
<SECTION> <SECTION>
<FILE>ges-track-image-source</FILE> <FILE>ges-image-source</FILE>
<TITLE>GESTrackImageSource</TITLE> <TITLE>GESImageSource</TITLE>
GESTrackImageSource GESImageSource
ges_track_image_source_new ges_image_source_new
<SUBSECTION Standard> <SUBSECTION Standard>
GESTrackImageSourcePrivate GESImageSourcePrivate
GES_IS_TRACK_IMAGE_SOURCE GES_IS_IMAGE_SOURCE
GES_IS_TRACK_IMAGE_SOURCE_CLASS GES_IS_IMAGE_SOURCE_CLASS
GES_TRACK_IMAGE_SOURCE GES_IMAGE_SOURCE
GES_TRACK_IMAGE_SOURCE_CLASS GES_IMAGE_SOURCE_CLASS
GES_TRACK_IMAGE_SOURCE_GET_CLASS GES_IMAGE_SOURCE_GET_CLASS
GES_TYPE_TRACK_IMAGE_SOURCE GES_TYPE_IMAGE_SOURCE
GESTrackImageSourceClass GESImageSourceClass
ges_track_image_source_get_type ges_image_source_get_type
</SECTION> </SECTION>
<SECTION> <SECTION>

2
docs/libs/ges.types
View file

@ -25,7 +25,7 @@ ges_audio_test_source_get_type
ges_track_audio_transition_get_type ges_track_audio_transition_get_type
ges_track_filesource_get_type ges_track_filesource_get_type
ges_track_get_type ges_track_get_type
ges_track_image_source_get_type ges_image_source_get_type
ges_track_element_get_type ges_track_element_get_type
ges_base_effect_get_type ges_base_effect_get_type
ges_effect_get_type ges_effect_get_type

4
ges/Makefile.am
View file

@ -34,7 +34,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \
ges-source.c \ ges-source.c \
ges-track-operation.c \ ges-track-operation.c \
ges-uri-source.c \ ges-uri-source.c \
ges-track-image-source.c \ ges-image-source.c \
ges-track-transition.c \ ges-track-transition.c \
ges-track-audio-transition.c \ ges-track-audio-transition.c \
ges-track-video-transition.c \ ges-track-video-transition.c \
@ -90,7 +90,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-source.h \ ges-source.h \
ges-track-operation.h \ ges-track-operation.h \
ges-uri-source.h \ ges-uri-source.h \
ges-track-image-source.h \ ges-image-source.h \
ges-track-transition.h \ ges-track-transition.h \
ges-track-audio-transition.h \ ges-track-audio-transition.h \
ges-track-video-transition.h \ ges-track-video-transition.h \

56
ges/ges-track-image-source.c → ges/ges-image-source.c
View file

@ -19,7 +19,7 @@
*/ */
/** /**
* SECTION:ges-track-image-source * SECTION:ges-image-source
* @short_description: outputs the video stream from a media file as a still * @short_description: outputs the video stream from a media file as a still
* image. * image.
* *
@ -30,11 +30,11 @@
#include "ges-internal.h" #include "ges-internal.h"
#include "ges-track-element.h" #include "ges-track-element.h"
#include "ges-track-image-source.h" #include "ges-image-source.h"
G_DEFINE_TYPE (GESTrackImageSource, ges_track_image_source, GES_TYPE_SOURCE); G_DEFINE_TYPE (GESImageSource, ges_image_source, GES_TYPE_SOURCE);
struct _GESTrackImageSourcePrivate struct _GESImageSourcePrivate
{ {
/* Dummy variable */ /* Dummy variable */
void *nothing; void *nothing;
@ -47,10 +47,10 @@ enum
}; };
static void static void
ges_track_image_source_get_property (GObject * object, guint property_id, ges_image_source_get_property (GObject * object, guint property_id,
GValue * value, GParamSpec * pspec) GValue * value, GParamSpec * pspec)
{ {
GESTrackImageSource *uriclip = GES_TRACK_IMAGE_SOURCE (object); GESImageSource *uriclip = GES_IMAGE_SOURCE (object);
switch (property_id) { switch (property_id) {
case PROP_URI: case PROP_URI:
@ -62,10 +62,10 @@ ges_track_image_source_get_property (GObject * object, guint property_id,
} }
static void static void
ges_track_image_source_set_property (GObject * object, guint property_id, ges_image_source_set_property (GObject * object, guint property_id,
const GValue * value, GParamSpec * pspec) const GValue * value, GParamSpec * pspec)
{ {
GESTrackImageSource *uriclip = GES_TRACK_IMAGE_SOURCE (object); GESImageSource *uriclip = GES_IMAGE_SOURCE (object);
switch (property_id) { switch (property_id) {
case PROP_URI: case PROP_URI:
@ -77,14 +77,14 @@ ges_track_image_source_set_property (GObject * object, guint property_id,
} }
static void static void
ges_track_image_source_dispose (GObject * object) ges_image_source_dispose (GObject * object)
{ {
GESTrackImageSource *uriclip = GES_TRACK_IMAGE_SOURCE (object); GESImageSource *uriclip = GES_IMAGE_SOURCE (object);
if (uriclip->uri) if (uriclip->uri)
g_free (uriclip->uri); g_free (uriclip->uri);
G_OBJECT_CLASS (ges_track_image_source_parent_class)->dispose (object); G_OBJECT_CLASS (ges_image_source_parent_class)->dispose (object);
} }
static void static void
@ -110,7 +110,7 @@ pad_added_cb (GstElement * timeline, GstPad * pad, GstElement * scale)
} }
static GstElement * static GstElement *
ges_track_image_source_create_element (GESTrackElement * object) ges_image_source_create_element (GESTrackElement * object)
{ {
GstElement *bin, *source, *scale, *freeze, *iconv; GstElement *bin, *source, *scale, *freeze, *iconv;
GstPad *src, *target; GstPad *src, *target;
@ -138,7 +138,7 @@ ges_track_image_source_create_element (GESTrackElement * object)
gst_element_add_pad (bin, src); gst_element_add_pad (bin, src);
gst_object_unref (target); gst_object_unref (target);
g_object_set (source, "uri", ((GESTrackImageSource *) object)->uri, NULL); g_object_set (source, "uri", ((GESImageSource *) object)->uri, NULL);
g_signal_connect (G_OBJECT (source), "pad-added", g_signal_connect (G_OBJECT (source), "pad-added",
G_CALLBACK (pad_added_cb), scale); G_CALLBACK (pad_added_cb), scale);
@ -147,46 +147,46 @@ ges_track_image_source_create_element (GESTrackElement * object)
} }
static void static void
ges_track_image_source_class_init (GESTrackImageSourceClass * klass) ges_image_source_class_init (GESImageSourceClass * klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GESTrackElementClass *gesobj_class = GES_TRACK_ELEMENT_CLASS (klass); GESTrackElementClass *gesobj_class = GES_TRACK_ELEMENT_CLASS (klass);
g_type_class_add_private (klass, sizeof (GESTrackImageSourcePrivate)); g_type_class_add_private (klass, sizeof (GESImageSourcePrivate));
object_class->get_property = ges_track_image_source_get_property; object_class->get_property = ges_image_source_get_property;
object_class->set_property = ges_track_image_source_set_property; object_class->set_property = ges_image_source_set_property;
object_class->dispose = ges_track_image_source_dispose; object_class->dispose = ges_image_source_dispose;
/** /**
* GESTrackImageSource:uri: * GESImageSource:uri:
* *
* The location of the file/resource to use. * The location of the file/resource to use.
*/ */
g_object_class_install_property (object_class, PROP_URI, g_object_class_install_property (object_class, PROP_URI,
g_param_spec_string ("uri", "URI", "uri of the resource", g_param_spec_string ("uri", "URI", "uri of the resource",
NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
gesobj_class->create_element = ges_track_image_source_create_element; gesobj_class->create_element = ges_image_source_create_element;
} }
static void static void
ges_track_image_source_init (GESTrackImageSource * self) ges_image_source_init (GESImageSource * self)
{ {
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GES_TYPE_TRACK_IMAGE_SOURCE, GESTrackImageSourcePrivate); GES_TYPE_IMAGE_SOURCE, GESImageSourcePrivate);
} }
/** /**
* ges_track_image_source_new: * ges_image_source_new:
* @uri: the URI the source should control * @uri: the URI the source should control
* *
* Creates a new #GESTrackImageSource for the provided @uri. * Creates a new #GESImageSource for the provided @uri.
* *
* Returns: A new #GESTrackImageSource. * Returns: A new #GESImageSource.
*/ */
GESTrackImageSource * GESImageSource *
ges_track_image_source_new (gchar * uri) ges_image_source_new (gchar * uri)
{ {
return g_object_new (GES_TYPE_TRACK_IMAGE_SOURCE, "uri", uri, "track-type", return g_object_new (GES_TYPE_IMAGE_SOURCE, "uri", uri, "track-type",
GES_TRACK_TYPE_VIDEO, NULL); GES_TRACK_TYPE_VIDEO, NULL);
} }

42
ges/ges-track-image-source.h → ges/ges-image-source.h
View file

@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef _GES_TRACK_IMAGE_SOURCE #ifndef _GES_IMAGE_SOURCE
#define _GES_TRACK_IMAGE_SOURCE #define _GES_IMAGE_SOURCE
#include <glib-object.h> #include <glib-object.h>
#include <ges/ges-types.h> #include <ges/ges-types.h>
@ -27,52 +27,52 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GES_TYPE_TRACK_IMAGE_SOURCE ges_track_image_source_get_type() #define GES_TYPE_IMAGE_SOURCE ges_image_source_get_type()
#define GES_TRACK_IMAGE_SOURCE(obj) \ #define GES_IMAGE_SOURCE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_IMAGE_SOURCE, GESTrackImageSource)) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_IMAGE_SOURCE, GESImageSource))
#define GES_TRACK_IMAGE_SOURCE_CLASS(klass) \ #define GES_IMAGE_SOURCE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_IMAGE_SOURCE, GESTrackImageSourceClass)) (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_IMAGE_SOURCE, GESImageSourceClass))
#define GES_IS_TRACK_IMAGE_SOURCE(obj) \ #define GES_IS_IMAGE_SOURCE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_IMAGE_SOURCE)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_IMAGE_SOURCE))
#define GES_IS_TRACK_IMAGE_SOURCE_CLASS(klass) \ #define GES_IS_IMAGE_SOURCE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_IMAGE_SOURCE)) (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_IMAGE_SOURCE))
#define GES_TRACK_IMAGE_SOURCE_GET_CLASS(obj) \ #define GES_IMAGE_SOURCE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_IMAGE_SOURCE, GESTrackImageSourceClass)) (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_IMAGE_SOURCE, GESImageSourceClass))
typedef struct _GESTrackImageSourcePrivate GESTrackImageSourcePrivate; typedef struct _GESImageSourcePrivate GESImageSourcePrivate;
/** /**
* GESTrackImageSource: * GESImageSource:
*/ */
struct _GESTrackImageSource { struct _GESImageSource {
/*< private >*/ /*< private >*/
GESSource parent; GESSource parent;
gchar *uri; gchar *uri;
GESTrackImageSourcePrivate *priv; GESImageSourcePrivate *priv;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];
}; };
struct _GESTrackImageSourceClass { struct _GESImageSourceClass {
GESSourceClass parent_class; GESSourceClass parent_class;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING]; gpointer _ges_reserved[GES_PADDING];
}; };
GType ges_track_image_source_get_type (void); GType ges_image_source_get_type (void);
GESTrackImageSource* ges_track_image_source_new (gchar *uri); GESImageSource* ges_image_source_new (gchar *uri);
G_END_DECLS G_END_DECLS
#endif /* _GES_TRACK_IMAGE_SOURCE */ #endif /* _GES_IMAGE_SOURCE */

4
ges/ges-types.h
View file

@ -104,8 +104,8 @@ typedef struct _GESEffectClass GESEffectClass;
typedef struct _GESUriSource GESUriSource; typedef struct _GESUriSource GESUriSource;
typedef struct _GESUriSourceClass GESUriSourceClass; typedef struct _GESUriSourceClass GESUriSourceClass;
typedef struct _GESTrackImageSource GESTrackImageSource; typedef struct _GESImageSource GESImageSource;
typedef struct _GESTrackImageSourceClass GESTrackImageSourceClass; typedef struct _GESImageSourceClass GESImageSourceClass;
typedef struct _GESTrackTransition GESTrackTransition; typedef struct _GESTrackTransition GESTrackTransition;
typedef struct _GESTrackTransitionClass GESTrackTransitionClass; typedef struct _GESTrackTransitionClass GESTrackTransitionClass;

6
ges/ges-uri-clip.c
View file

@ -33,7 +33,7 @@
#include "ges-uri-asset.h" #include "ges-uri-asset.h"
#include "ges-track-element-asset.h" #include "ges-track-element-asset.h"
#include "ges-extractable.h" #include "ges-extractable.h"
#include "ges-track-image-source.h" #include "ges-image-source.h"
#include "ges-audio-test-source.h" #include "ges-audio-test-source.h"
static void ges_extractable_interface_init (GESExtractableInterface * iface); static void ges_extractable_interface_init (GESExtractableInterface * iface);
@ -401,8 +401,8 @@ ges_uri_clip_create_track_element (GESClip * obj, GESTrackType type)
GST_DEBUG ("Object is still image, not adding any audio source"); GST_DEBUG ("Object is still image, not adding any audio source");
return NULL; return NULL;
} else { } else {
GST_DEBUG ("Creating a GESTrackImageSource"); GST_DEBUG ("Creating a GESImageSource");
res = (GESTrackElement *) ges_track_image_source_new (priv->uri); res = (GESTrackElement *) ges_image_source_new (priv->uri);
} }
} else { } else {

2
ges/ges.h
View file

@ -61,7 +61,7 @@
#include <ges/ges-track-operation.h> #include <ges/ges-track-operation.h>
#include <ges/ges-uri-source.h> #include <ges/ges-uri-source.h>
#include <ges/ges-track-image-source.h> #include <ges/ges-image-source.h>
#include <ges/ges-video-test-source.h> #include <ges/ges-video-test-source.h>
#include <ges/ges-audio-test-source.h> #include <ges/ges-audio-test-source.h>
#include <ges/ges-track-title-source.h> #include <ges/ges-track-title-source.h>

2
tests/check/ges/uriclip.c
View file

@ -201,7 +201,7 @@ GST_START_TEST (test_filesource_images)
/* the returned track object should be an image source */ /* the returned track object should be an image source */
trobj = ges_clip_create_track_element (clip, v->type); trobj = ges_clip_create_track_element (clip, v->type);
ges_clip_add_track_element (clip, trobj); ges_clip_add_track_element (clip, trobj);
fail_unless (GES_IS_TRACK_IMAGE_SOURCE (trobj)); fail_unless (GES_IS_IMAGE_SOURCE (trobj));
/* The track holds a reference to the object /* The track holds a reference to the object
* and the timelinobject holds a reference to the object */ * and the timelinobject holds a reference to the object */