Commit 037b71bc authored by Thibault Saunier's avatar Thibault Saunier
Browse files

Rename GESAssetTrackElement to GESTrackElementAsset

parent bfef8d77
......@@ -103,7 +103,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-asset-track-object.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"/>
<xi:include href="xml/ges-project.xml"/>
......
......@@ -1003,20 +1003,20 @@ GES_ASSET_CLIP_GET_CLASS
</SECTION>
<SECTION>
<FILE>ges-asset-track-object</FILE>
<TITLE>GESAssetTrackElement</TITLE>
GESAssetTrackElement
ges_asset_track_element_get_type
ges_asset_track_element_get_track_type
ges_asset_track_element_set_track_type
<FILE>ges-track-element-asset</FILE>
<TITLE>GESTrackElementAsset</TITLE>
GESTrackElementAsset
ges_track_element_asset_get_type
ges_track_element_asset_get_track_type
ges_track_element_asset_set_track_type
<SUBSECTION Standard>
GESAssetTrackElementPrivate
GES_ASSET_TRACK_ELEMENT
GES_TYPE_ASSET_TRACK_ELEMENT
GES_ASSET_TRACK_ELEMENT_CLASS
GES_IS_ASSET_TRACK_ELEMENT
GES_IS_ASSET_TRACK_ELEMENT_CLASS
GES_ASSET_TRACK_ELEMENT_GET_CLASS
GESTrackElementAssetPrivate
GES_TRACK_ELEMENT_ASSET
GES_TYPE_TRACK_ELEMENT_ASSET
GES_TRACK_ELEMENT_ASSET_CLASS
GES_IS_TRACK_ELEMENT_ASSET
GES_IS_TRACK_ELEMENT_ASSET_CLASS
GES_TRACK_ELEMENT_ASSET_GET_CLASS
</SECTION>
<SECTION>
......
......@@ -50,7 +50,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \
ges-asset.c \
ges-uri-asset.c \
ges-asset-clip.c \
ges-asset-track-object.c \
ges-track-element-asset.c \
ges-extractable.c \
ges-project.c \
ges-base-xml-formatter.c \
......@@ -104,7 +104,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-asset.h \
ges-uri-asset.h \
ges-asset-clip.h \
ges-asset-track-object.h \
ges-track-element-asset.h \
ges-extractable.h \
ges-project.h \
ges-base-xml-formatter.h \
......
......@@ -19,11 +19,11 @@
*/
/**
* SECTION: ges-asset-track-object
* SECTION: ges-track-element-asset
* @short_description: A GESAsset subclass specialized in GESTrackElement extraction
*/
#include "ges-asset-track-object.h"
#include "ges-track-element-asset.h"
enum
{
......@@ -34,9 +34,9 @@ enum
static GParamSpec *properties[PROP_LAST];
G_DEFINE_TYPE (GESAssetTrackElement, ges_asset_track_element, GES_TYPE_ASSET);
G_DEFINE_TYPE (GESTrackElementAsset, ges_track_element_asset, GES_TYPE_ASSET);
struct _GESAssetTrackElementPrivate
struct _GESTrackElementAssetPrivate
{
GESTrackType type;
};
......@@ -45,7 +45,7 @@ static void
_get_property (GObject * object, guint property_id,
GValue * value, GParamSpec * pspec)
{
GESAssetTrackElement *asset = GES_ASSET_TRACK_ELEMENT (object);
GESTrackElementAsset *asset = GES_TRACK_ELEMENT_ASSET (object);
switch (property_id) {
case PROP_TRACK_TYPE:
......@@ -60,7 +60,7 @@ static void
_set_property (GObject * object, guint property_id,
const GValue * value, GParamSpec * pspec)
{
GESAssetTrackElement *asset = GES_ASSET_TRACK_ELEMENT (object);
GESTrackElementAsset *asset = GES_TRACK_ELEMENT_ASSET (object);
switch (property_id) {
case PROP_TRACK_TYPE:
......@@ -72,11 +72,11 @@ _set_property (GObject * object, guint property_id,
}
static void
ges_asset_track_element_class_init (GESAssetTrackElementClass * klass)
ges_track_element_asset_class_init (GESTrackElementAssetClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass, sizeof (GESAssetTrackElementPrivate));
g_type_class_add_private (klass, sizeof (GESTrackElementAssetPrivate));
object_class->get_property = _get_property;
object_class->set_property = _set_property;
......@@ -96,19 +96,19 @@ ges_asset_track_element_class_init (GESAssetTrackElementClass * klass)
}
static void
ges_asset_track_element_init (GESAssetTrackElement * self)
ges_track_element_asset_init (GESTrackElementAsset * self)
{
GESAssetTrackElementPrivate *priv;
GESTrackElementAssetPrivate *priv;
priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GES_TYPE_ASSET_TRACK_ELEMENT, GESAssetTrackElementPrivate);
GES_TYPE_TRACK_ELEMENT_ASSET, GESTrackElementAssetPrivate);
priv->type = GES_TRACK_TYPE_UNKNOWN;
}
/**
* ges_asset_track_element_set_track_type:
* ges_track_element_asset_set_track_type:
* @asset: A #GESAssetObject
* @type: A #GESTrackType
*
......@@ -116,16 +116,16 @@ ges_asset_track_element_init (GESAssetTrackElement * self)
* should get into
*/
void
ges_asset_track_element_set_track_type (GESAssetTrackElement * asset,
ges_track_element_asset_set_track_type (GESTrackElementAsset * asset,
GESTrackType type)
{
g_return_if_fail (GES_IS_ASSET_TRACK_ELEMENT (asset));
g_return_if_fail (GES_IS_TRACK_ELEMENT_ASSET (asset));
asset->priv->type = type;
}
/**
* ges_asset_track_element_get_track_type:
* ges_track_element_asset_get_track_type:
* @asset: A #GESAssetObject
*
* Get the GESAssetTrackType the #GESTrackElement extracted from @self
......@@ -134,9 +134,9 @@ ges_asset_track_element_set_track_type (GESAssetTrackElement * asset,
* Returns: a #GESTrackType
*/
const GESTrackType
ges_asset_track_element_get_track_type (GESAssetTrackElement * asset)
ges_track_element_asset_get_track_type (GESTrackElementAsset * asset)
{
g_return_val_if_fail (GES_IS_ASSET_TRACK_ELEMENT (asset),
g_return_val_if_fail (GES_IS_TRACK_ELEMENT_ASSET (asset),
GES_TRACK_TYPE_UNKNOWN);
return asset->priv->type;
......
......@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef _GES_ASSET_TRACK_ELEMENT_
#define _GES_ASSET_TRACK_ELEMENT_
#ifndef _GES_TRACK_ELEMENT_ASSET_
#define _GES_TRACK_ELEMENT_ASSET_
#include <glib-object.h>
#include <gio/gio.h>
......@@ -27,38 +27,38 @@
G_BEGIN_DECLS
#define GES_TYPE_ASSET_TRACK_ELEMENT ges_asset_track_element_get_type()
#define GES_ASSET_TRACK_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_ASSET_TRACK_ELEMENT, GESAssetTrackElement))
#define GES_ASSET_TRACK_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_ASSET_TRACK_ELEMENT, GESAssetTrackElementClass))
#define GES_IS_ASSET_TRACK_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_ASSET_TRACK_ELEMENT))
#define GES_IS_ASSET_TRACK_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_ASSET_TRACK_ELEMENT))
#define GES_ASSET_TRACK_ELEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_ASSET_TRACK_ELEMENT, GESAssetTrackElementClass))
#define GES_TYPE_TRACK_ELEMENT_ASSET ges_track_element_asset_get_type()
#define GES_TRACK_ELEMENT_ASSET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_ELEMENT_ASSET, GESTrackElementAsset))
#define GES_TRACK_ELEMENT_ASSET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_ELEMENT_ASSET, GESTrackElementAssetClass))
#define GES_IS_TRACK_ELEMENT_ASSET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_ELEMENT_ASSET))
#define GES_IS_TRACK_ELEMENT_ASSET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_ELEMENT_ASSET))
#define GES_TRACK_ELEMENT_ASSET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_ELEMENT_ASSET, GESTrackElementAssetClass))
typedef struct _GESAssetTrackElementPrivate GESAssetTrackElementPrivate;
typedef struct _GESTrackElementAssetPrivate GESTrackElementAssetPrivate;
GType ges_asset_track_element_get_type (void);
GType ges_track_element_asset_get_type (void);
struct _GESAssetTrackElement
struct _GESTrackElementAsset
{
GESAsset parent;
/* <private> */
GESAssetTrackElementPrivate *priv;
GESTrackElementAssetPrivate *priv;
/* Padding for API extension */
gpointer __ges_reserved[GES_PADDING];
};
struct _GESAssetTrackElementClass
struct _GESTrackElementAssetClass
{
GESAssetClass parent_class;
gpointer _ges_reserved[GES_PADDING];
};
const GESTrackType ges_asset_track_element_get_track_type (GESAssetTrackElement *asset);
void ges_asset_track_element_set_track_type (GESAssetTrackElement * asset, GESTrackType type);
const GESTrackType ges_track_element_asset_get_track_type (GESTrackElementAsset *asset);
void ges_track_element_asset_set_track_type (GESTrackElementAsset * asset, GESTrackType type);
G_END_DECLS
#endif /* _GES_ASSET_TRACK_ELEMENT */
#endif /* _GES_TRACK_ELEMENT_ASSET */
......@@ -149,8 +149,8 @@ typedef struct _GESAssetClipClass GESAssetClipClass;
typedef struct _GESUriClipAsset GESUriClipAsset;
typedef struct _GESUriClipAssetClass GESUriClipAssetClass;
typedef struct _GESAssetTrackElement GESAssetTrackElement;
typedef struct _GESAssetTrackElementClass GESAssetTrackElementClass;
typedef struct _GESTrackElementAsset GESTrackElementAsset;
typedef struct _GESTrackElementAssetClass GESTrackElementAssetClass;
typedef struct _GESUriSourceAsset GESUriSourceAsset;
typedef struct _GESUriSourceAssetClass GESUriSourceAssetClass;
......
......@@ -30,7 +30,7 @@
#include <gst/pbutils/pbutils.h>
#include "ges.h"
#include "ges-internal.h"
#include "ges-asset-track-object.h"
#include "ges-track-element-asset.h"
static GHashTable *parent_newparent_table = NULL;
static void
......@@ -247,7 +247,7 @@ _create_uri_source_asset (GESUriClipAsset * asset,
priv_tckasset->uri = ges_asset_get_id (GES_ASSET (asset));
priv_tckasset->sinfo = g_object_ref (sinfo);
priv_tckasset->parent_asset = asset;
ges_asset_track_element_set_track_type (GES_ASSET_TRACK_ELEMENT
ges_track_element_asset_set_track_type (GES_TRACK_ELEMENT_ASSET
(tck_filesource_asset), type);
priv->asset_trackfilesources = g_list_append (priv->asset_trackfilesources,
......@@ -470,7 +470,7 @@ ges_uri_clip_asset_get_stream_assets (GESUriClipAsset * self)
*/
G_DEFINE_TYPE (GESUriSourceAsset, ges_uri_source_asset,
GES_TYPE_ASSET_TRACK_ELEMENT);
GES_TYPE_TRACK_ELEMENT_ASSET);
static GESExtractable *
_extract (GESAsset * asset, GError ** error)
......
......@@ -26,7 +26,7 @@
#include <ges/ges-types.h>
#include <ges/ges-asset.h>
#include <ges/ges-asset-clip.h>
#include <ges/ges-asset-track-object.h>
#include <ges/ges-track-element-asset.h>
G_BEGIN_DECLS
#define GES_TYPE_URI_CLIP_ASSET ges_uri_clip_asset_get_type()
......@@ -95,7 +95,7 @@ GType ges_uri_source_asset_get_type (void);
struct _GESUriSourceAsset
{
GESAssetTrackElement parent;
GESTrackElementAsset parent;
/* <private> */
GESUriSourceAssetPrivate *priv;
......@@ -106,7 +106,7 @@ struct _GESUriSourceAsset
struct _GESUriSourceAssetClass
{
GESAssetTrackElementClass parent_class;
GESTrackElementAssetClass parent_class;
gpointer _ges_reserved[GES_PADDING];
};
......
......@@ -31,7 +31,7 @@
#include "ges-source-clip.h"
#include "ges-uri-source.h"
#include "ges-uri-asset.h"
#include "ges-asset-track-object.h"
#include "ges-track-element-asset.h"
#include "ges-extractable.h"
#include "ges-track-image-source.h"
#include "ges-audio-test-source.h"
......@@ -381,9 +381,9 @@ ges_uri_clip_create_track_elements (GESClip * obj, GESTrackType type)
ges_uri_clip_asset_get_stream_assets (GES_URI_CLIP_ASSET
(GES_TIMELINE_ELEMENT (obj)->asset));
for (tmp = stream_assets; tmp; tmp = tmp->next) {
GESAssetTrackElement *asset = GES_ASSET_TRACK_ELEMENT (tmp->data);
GESTrackElementAsset *asset = GES_TRACK_ELEMENT_ASSET (tmp->data);
if (ges_asset_track_element_get_track_type (asset) == type)
if (ges_track_element_asset_get_track_type (asset) == type)
res = g_list_prepend (res, ges_asset_extract (GES_ASSET (asset), NULL));
}
......
......@@ -47,7 +47,7 @@ extractable_set_asset (GESExtractable * self, GESAsset * asset)
if (ges_track_element_get_track_type (GES_TRACK_ELEMENT (self)) ==
GES_TRACK_TYPE_UNKNOWN) {
ges_track_element_set_track_type (GES_TRACK_ELEMENT (self),
ges_asset_track_element_get_track_type (GES_ASSET_TRACK_ELEMENT
ges_track_element_asset_get_track_type (GES_TRACK_ELEMENT_ASSET
(asset)));
}
}
......
......@@ -48,7 +48,7 @@
#include <ges/ges-screenshot.h>
#include <ges/ges-asset.h>
#include <ges/ges-asset-clip.h>
#include <ges/ges-asset-track-object.h>
#include <ges/ges-track-element-asset.h>
#include <ges/ges-uri-asset.h>
#include <ges/ges-project.h>
#include <ges/ges-extractable.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment