mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 08:46:40 +00:00
Rename GESAssetClip to GESClipAsset
This commit is contained in:
parent
997df180ea
commit
fb7baa1cd3
10 changed files with 67 additions and 67 deletions
|
@ -102,7 +102,7 @@ platform as well as Windows. It is released under the GNU Library General Public
|
|||
|
||||
<chapter>
|
||||
<title>Assets</title>
|
||||
<xi:include href="xml/ges-asset-clip.xml"/>
|
||||
<xi:include href="xml/ges-clip-asset.xml"/>
|
||||
<xi:include href="xml/ges-track-element-asset.xml"/>
|
||||
<xi:include href="xml/ges-uri-clip-asset.xml"/>
|
||||
<xi:include href="xml/ges-asset-track-file-source.xml"/>
|
||||
|
|
|
@ -986,20 +986,20 @@ ges_asset_get_type
|
|||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
<FILE>ges-asset-clip</FILE>
|
||||
<TITLE>GESAssetClip</TITLE>
|
||||
GESAssetClip
|
||||
ges_asset_clip_get_type
|
||||
ges_asset_clip_set_supported_formats
|
||||
ges_asset_clip_get_supported_formats
|
||||
<FILE>ges-clip-asset</FILE>
|
||||
<TITLE>GESClipAsset</TITLE>
|
||||
GESClipAsset
|
||||
ges_clip_asset_get_type
|
||||
ges_clip_asset_set_supported_formats
|
||||
ges_clip_asset_get_supported_formats
|
||||
<SUBSECTION Standard>
|
||||
GESAssetClipPrivate
|
||||
GES_ASSET_CLIP
|
||||
GES_TYPE_ASSET_CLIP
|
||||
GES_ASSET_CLIP_CLASS
|
||||
GES_IS_ASSET_CLIP
|
||||
GES_IS_ASSET_CLIP_CLASS
|
||||
GES_ASSET_CLIP_GET_CLASS
|
||||
GESClipAssetPrivate
|
||||
GES_CLIP_ASSET
|
||||
GES_TYPE_CLIP_ASSET
|
||||
GES_CLIP_ASSET_CLASS
|
||||
GES_IS_CLIP_ASSET
|
||||
GES_IS_CLIP_ASSET_CLASS
|
||||
GES_CLIP_ASSET_GET_CLASS
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
|
|
|
@ -49,7 +49,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \
|
|||
ges-pitivi-formatter.c \
|
||||
ges-asset.c \
|
||||
ges-uri-asset.c \
|
||||
ges-asset-clip.c \
|
||||
ges-clip-asset.c \
|
||||
ges-track-element-asset.c \
|
||||
ges-extractable.c \
|
||||
ges-project.c \
|
||||
|
@ -103,7 +103,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
|
|||
ges-pitivi-formatter.h \
|
||||
ges-asset.h \
|
||||
ges-uri-asset.h \
|
||||
ges-asset-clip.h \
|
||||
ges-clip-asset.h \
|
||||
ges-track-element-asset.h \
|
||||
ges-extractable.h \
|
||||
ges-project.h \
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
/**
|
||||
* SECTION: ges-asset-clip
|
||||
* SECTION: ges-clip-asset
|
||||
* @short_description: A GESAsset subclass specialized in GESClip extraction
|
||||
*
|
||||
* The #GESUriClipAsset is a special #GESAsset specilized in #GESClip.
|
||||
|
@ -26,16 +26,16 @@
|
|||
* from it can potentialy create #GESTrackElement for.
|
||||
*/
|
||||
|
||||
#include "ges-asset-clip.h"
|
||||
#include "ges-clip-asset.h"
|
||||
|
||||
G_DEFINE_TYPE (GESAssetClip, ges_asset_clip, GES_TYPE_ASSET);
|
||||
#define GES_ASSET_CLIP_GET_PRIVATE(o)\
|
||||
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GES_TYPE_ASSET_CLIP, \
|
||||
GESAssetClipPrivate))
|
||||
G_DEFINE_TYPE (GESClipAsset, ges_clip_asset, GES_TYPE_ASSET);
|
||||
#define GES_CLIP_ASSET_GET_PRIVATE(o)\
|
||||
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GES_TYPE_CLIP_ASSET, \
|
||||
GESClipAssetPrivate))
|
||||
|
||||
#define parent_class ges_asset_clip_parent_class
|
||||
#define parent_class ges_clip_asset_parent_class
|
||||
|
||||
struct _GESAssetClipPrivate
|
||||
struct _GESClipAssetPrivate
|
||||
{
|
||||
GESTrackType supportedformats;
|
||||
};
|
||||
|
@ -69,7 +69,7 @@ static void
|
|||
_get_property (GObject * object, guint property_id,
|
||||
GValue * value, GParamSpec * pspec)
|
||||
{
|
||||
GESAssetClipPrivate *priv = GES_ASSET_CLIP (object)->priv;
|
||||
GESClipAssetPrivate *priv = GES_CLIP_ASSET (object)->priv;
|
||||
switch (property_id) {
|
||||
case PROP_SUPPORTED_FORMATS:
|
||||
g_value_set_flags (value, priv->supportedformats);
|
||||
|
@ -83,7 +83,7 @@ static void
|
|||
_set_property (GObject * object, guint property_id,
|
||||
const GValue * value, GParamSpec * pspec)
|
||||
{
|
||||
GESAssetClipPrivate *priv = GES_ASSET_CLIP (object)->priv;
|
||||
GESClipAssetPrivate *priv = GES_CLIP_ASSET (object)->priv;
|
||||
|
||||
switch (property_id) {
|
||||
case PROP_SUPPORTED_FORMATS:
|
||||
|
@ -95,9 +95,9 @@ _set_property (GObject * object, guint property_id,
|
|||
}
|
||||
|
||||
static void
|
||||
ges_asset_clip_init (GESAssetClip * self)
|
||||
ges_clip_asset_init (GESClipAsset * self)
|
||||
{
|
||||
self->priv = GES_ASSET_CLIP_GET_PRIVATE (self);
|
||||
self->priv = GES_CLIP_ASSET_GET_PRIVATE (self);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -110,18 +110,18 @@ _constructed (GObject * object)
|
|||
pspec = G_PARAM_SPEC_FLAGS (g_object_class_find_property (class,
|
||||
"supported-formats"));
|
||||
|
||||
GES_ASSET_CLIP (object)->priv->supportedformats = pspec->default_value;
|
||||
GES_CLIP_ASSET (object)->priv->supportedformats = pspec->default_value;
|
||||
g_type_class_unref (class);
|
||||
|
||||
G_OBJECT_CLASS (parent_class)->constructed (object);
|
||||
}
|
||||
|
||||
static void
|
||||
ges_asset_clip_class_init (GESAssetClipClass * self_class)
|
||||
ges_clip_asset_class_init (GESClipAssetClass * self_class)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (self_class);
|
||||
|
||||
g_type_class_add_private (self_class, sizeof (GESAssetClipPrivate));
|
||||
g_type_class_add_private (self_class, sizeof (GESClipAssetPrivate));
|
||||
object_class->constructed = _constructed;
|
||||
object_class->dispose = _dispose;
|
||||
object_class->finalize = _finalize;
|
||||
|
@ -129,7 +129,7 @@ ges_asset_clip_class_init (GESAssetClipClass * self_class)
|
|||
object_class->set_property = _set_property;
|
||||
|
||||
/**
|
||||
* GESAssetClip:supported-formats:
|
||||
* GESClipAsset:supported-formats:
|
||||
*
|
||||
* The formats supported by the asset.
|
||||
*/
|
||||
|
@ -148,24 +148,24 @@ ges_asset_clip_class_init (GESAssetClipClass * self_class)
|
|||
* *
|
||||
***********************************************/
|
||||
/**
|
||||
* ges_asset_clip_set_supported_formats:
|
||||
* @self: a #GESAssetClip
|
||||
* @supportedformats: The track types supported by the GESAssetClip
|
||||
* ges_clip_asset_set_supported_formats:
|
||||
* @self: a #GESClipAsset
|
||||
* @supportedformats: The track types supported by the GESClipAsset
|
||||
*
|
||||
* Sets track types for which objects extracted from @self can create #GESTrackElement
|
||||
*/
|
||||
void
|
||||
ges_asset_clip_set_supported_formats (GESAssetClip * self,
|
||||
ges_clip_asset_set_supported_formats (GESClipAsset * self,
|
||||
GESTrackType supportedformats)
|
||||
{
|
||||
g_return_if_fail (GES_IS_ASSET_CLIP (self));
|
||||
g_return_if_fail (GES_IS_CLIP_ASSET (self));
|
||||
|
||||
self->priv->supportedformats = supportedformats;
|
||||
}
|
||||
|
||||
/**
|
||||
* ges_asset_clip_get_supported_formats:
|
||||
* @self: a #GESAssetClip
|
||||
* ges_clip_asset_get_supported_formats:
|
||||
* @self: a #GESClipAsset
|
||||
*
|
||||
* Gets track types for which objects extracted from @self can create #GESTrackElement
|
||||
*
|
||||
|
@ -173,9 +173,9 @@ ges_asset_clip_set_supported_formats (GESAssetClip * self,
|
|||
* a layer
|
||||
*/
|
||||
GESTrackType
|
||||
ges_asset_clip_get_supported_formats (GESAssetClip * self)
|
||||
ges_clip_asset_get_supported_formats (GESClipAsset * self)
|
||||
{
|
||||
g_return_val_if_fail (GES_IS_ASSET_CLIP (self), GES_TRACK_TYPE_UNKNOWN);
|
||||
g_return_val_if_fail (GES_IS_CLIP_ASSET (self), GES_TRACK_TYPE_UNKNOWN);
|
||||
|
||||
return self->priv->supportedformats;
|
||||
}
|
|
@ -20,8 +20,8 @@
|
|||
*/
|
||||
|
||||
|
||||
#ifndef GES_ASSET_CLIP_H
|
||||
#define GES_ASSET_CLIP_H
|
||||
#ifndef GES_CLIP_ASSET_H
|
||||
#define GES_CLIP_ASSET_H
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <ges/ges-types.h>
|
||||
|
@ -29,36 +29,36 @@
|
|||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define GES_TYPE_ASSET_CLIP (ges_asset_clip_get_type ())
|
||||
#define GES_ASSET_CLIP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_ASSET_CLIP, GESAssetClip))
|
||||
#define GES_ASSET_CLIP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_ASSET_CLIP, GESAssetClipClass))
|
||||
#define GES_IS_ASSET_CLIP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_ASSET_CLIP))
|
||||
#define GES_IS_ASSET_CLIP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_ASSET_CLIP))
|
||||
#define GES_ASSET_CLIP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_ASSET_CLIP, GESAssetClipClass))
|
||||
#define GES_TYPE_CLIP_ASSET (ges_clip_asset_get_type ())
|
||||
#define GES_CLIP_ASSET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_CLIP_ASSET, GESClipAsset))
|
||||
#define GES_CLIP_ASSET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_CLIP_ASSET, GESClipAssetClass))
|
||||
#define GES_IS_CLIP_ASSET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_CLIP_ASSET))
|
||||
#define GES_IS_CLIP_ASSET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_CLIP_ASSET))
|
||||
#define GES_CLIP_ASSET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_CLIP_ASSET, GESClipAssetClass))
|
||||
|
||||
typedef struct _GESAssetClipPrivate GESAssetClipPrivate;
|
||||
typedef struct _GESClipAssetPrivate GESClipAssetPrivate;
|
||||
|
||||
struct _GESAssetClip
|
||||
struct _GESClipAsset
|
||||
{
|
||||
GESAsset parent;
|
||||
|
||||
/* <private> */
|
||||
GESAssetClipPrivate *priv;
|
||||
GESClipAssetPrivate *priv;
|
||||
|
||||
gpointer _ges_reserved[GES_PADDING];
|
||||
};
|
||||
|
||||
struct _GESAssetClipClass
|
||||
struct _GESClipAssetClass
|
||||
{
|
||||
GESAssetClass parent;
|
||||
|
||||
gpointer _ges_reserved[GES_PADDING];
|
||||
};
|
||||
|
||||
GType ges_asset_clip_get_type (void);
|
||||
void ges_asset_clip_set_supported_formats (GESAssetClip *self,
|
||||
GType ges_clip_asset_get_type (void);
|
||||
void ges_clip_asset_set_supported_formats (GESClipAsset *self,
|
||||
GESTrackType supportedformats);
|
||||
GESTrackType ges_asset_clip_get_supported_formats (GESAssetClip *self);
|
||||
GESTrackType ges_clip_asset_get_supported_formats (GESClipAsset *self);
|
||||
|
||||
G_END_DECLS
|
||||
#endif /* _GES_ASSET_CLIP_H */
|
||||
#endif /* _GES_CLIP_ASSET_H */
|
|
@ -143,8 +143,8 @@ typedef struct _GESPitiviFormatterClass GESPitiviFormatterClass;
|
|||
typedef struct _GESAsset GESAsset;
|
||||
typedef struct _GESAssetClass GESAssetClass;
|
||||
|
||||
typedef struct _GESAssetClip GESAssetClip;
|
||||
typedef struct _GESAssetClipClass GESAssetClipClass;
|
||||
typedef struct _GESClipAsset GESClipAsset;
|
||||
typedef struct _GESClipAssetClass GESClipAssetClass;
|
||||
|
||||
typedef struct _GESUriClipAsset GESUriClipAsset;
|
||||
typedef struct _GESUriClipAssetClass GESUriClipAssetClass;
|
||||
|
|
|
@ -41,7 +41,7 @@ initable_iface_init (GInitableIface * initable_iface)
|
|||
}
|
||||
|
||||
G_DEFINE_TYPE_WITH_CODE (GESUriClipAsset, ges_uri_clip_asset,
|
||||
GES_TYPE_ASSET_CLIP,
|
||||
GES_TYPE_CLIP_ASSET,
|
||||
G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init));
|
||||
|
||||
/* TODO: We should monitor files here, and add some way of reporting changes
|
||||
|
@ -290,7 +290,7 @@ ges_uri_clip_asset_set_info (GESUriClipAsset * self, GstDiscovererInfo * info)
|
|||
gst_discoverer_stream_info_get_stream_id (sinf));
|
||||
_create_uri_source_asset (self, sinf, type);
|
||||
}
|
||||
ges_asset_clip_set_supported_formats (GES_ASSET_CLIP
|
||||
ges_clip_asset_set_supported_formats (GES_CLIP_ASSET
|
||||
(self), supportedformats);
|
||||
|
||||
if (stream_list)
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <gio/gio.h>
|
||||
#include <ges/ges-types.h>
|
||||
#include <ges/ges-asset.h>
|
||||
#include <ges/ges-asset-clip.h>
|
||||
#include <ges/ges-clip-asset.h>
|
||||
#include <ges/ges-track-element-asset.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
@ -47,7 +47,7 @@ GType ges_uri_clip_asset_get_type (void);
|
|||
|
||||
struct _GESUriClipAsset
|
||||
{
|
||||
GESAssetClip parent;
|
||||
GESClipAsset parent;
|
||||
|
||||
/* <private> */
|
||||
GESUriClipAssetPrivate *priv;
|
||||
|
@ -58,7 +58,7 @@ struct _GESUriClipAsset
|
|||
|
||||
struct _GESUriClipAssetClass
|
||||
{
|
||||
GESAssetClipClass parent_class;
|
||||
GESClipAssetClass parent_class;
|
||||
|
||||
/* <private> */
|
||||
GstDiscoverer *discoverer;
|
||||
|
|
|
@ -242,8 +242,8 @@ extractable_set_asset (GESExtractable * self, GESAsset * asset)
|
|||
if (ges_clip_get_supported_formats (clip) == GES_TRACK_TYPE_UNKNOWN) {
|
||||
|
||||
ges_clip_set_supported_formats (clip,
|
||||
ges_asset_clip_get_supported_formats
|
||||
(GES_ASSET_CLIP (filesource_asset)));
|
||||
ges_clip_asset_get_supported_formats
|
||||
(GES_CLIP_ASSET (filesource_asset)));
|
||||
}
|
||||
|
||||
GES_TIMELINE_ELEMENT (uriclip)->asset = asset;
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#include <ges/ges-uri-clip.h>
|
||||
#include <ges/ges-screenshot.h>
|
||||
#include <ges/ges-asset.h>
|
||||
#include <ges/ges-asset-clip.h>
|
||||
#include <ges/ges-clip-asset.h>
|
||||
#include <ges/ges-track-element-asset.h>
|
||||
#include <ges/ges-uri-asset.h>
|
||||
#include <ges/ges-project.h>
|
||||
|
|
Loading…
Reference in a new issue