mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-19 16:21:17 +00:00
pipeline: Finnish renaming from GESTimelinePipeline
This commit is contained in:
parent
1a674bb26c
commit
0d0fc767ee
4 changed files with 42 additions and 43 deletions
|
@ -521,12 +521,12 @@ GESPipelineClass
|
|||
GESPipelinePrivate
|
||||
ges_play_sink_convert_frame
|
||||
ges_pipeline_get_type
|
||||
GES_TIMELINE_PIPELINE
|
||||
GES_TIMELINE_PIPELINE_CLASS
|
||||
GES_TIMELINE_PIPELINE_GET_CLASS
|
||||
GES_IS_TIMELINE_PIPELINE
|
||||
GES_IS_TIMELINE_PIPELINE_CLASS
|
||||
GES_TYPE_TIMELINE_PIPELINE
|
||||
GES_PIPELINE
|
||||
GES_PIPELINE_CLASS
|
||||
GES_PIPELINE_GET_CLASS
|
||||
GES_IS_PIPELINE
|
||||
GES_IS_PIPELINE_CLASS
|
||||
GES_TYPE_PIPELINE
|
||||
</SECTION>
|
||||
|
||||
|
||||
|
|
|
@ -93,7 +93,7 @@ static OutputChain *new_output_chain_for_track (GESPipeline * self,
|
|||
static void
|
||||
_overlay_expose (GstVideoOverlay * overlay)
|
||||
{
|
||||
GESPipeline *pipeline = GES_TIMELINE_PIPELINE (overlay);
|
||||
GESPipeline *pipeline = GES_PIPELINE (overlay);
|
||||
|
||||
gst_video_overlay_expose (GST_VIDEO_OVERLAY (pipeline->priv->playsink));
|
||||
}
|
||||
|
@ -101,7 +101,7 @@ _overlay_expose (GstVideoOverlay * overlay)
|
|||
static void
|
||||
_overlay_handle_events (GstVideoOverlay * overlay, gboolean handle_events)
|
||||
{
|
||||
GESPipeline *pipeline = GES_TIMELINE_PIPELINE (overlay);
|
||||
GESPipeline *pipeline = GES_PIPELINE (overlay);
|
||||
|
||||
gst_video_overlay_handle_events (GST_VIDEO_OVERLAY (pipeline->priv->playsink),
|
||||
handle_events);
|
||||
|
@ -111,7 +111,7 @@ static void
|
|||
_overlay_set_render_rectangle (GstVideoOverlay * overlay, gint x,
|
||||
gint y, gint width, gint height)
|
||||
{
|
||||
GESPipeline *pipeline = GES_TIMELINE_PIPELINE (overlay);
|
||||
GESPipeline *pipeline = GES_PIPELINE (overlay);
|
||||
|
||||
gst_video_overlay_set_render_rectangle (GST_VIDEO_OVERLAY (pipeline->priv->
|
||||
playsink), x, y, width, height);
|
||||
|
@ -120,7 +120,7 @@ _overlay_set_render_rectangle (GstVideoOverlay * overlay, gint x,
|
|||
static void
|
||||
_overlay_set_window_handle (GstVideoOverlay * overlay, guintptr handle)
|
||||
{
|
||||
GESPipeline *pipeline = GES_TIMELINE_PIPELINE (overlay);
|
||||
GESPipeline *pipeline = GES_PIPELINE (overlay);
|
||||
|
||||
gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (pipeline->
|
||||
priv->playsink), handle);
|
||||
|
@ -145,7 +145,7 @@ static void
|
|||
ges_pipeline_get_property (GObject * object, guint property_id,
|
||||
GValue * value, GParamSpec * pspec)
|
||||
{
|
||||
GESPipeline *self = GES_TIMELINE_PIPELINE (object);
|
||||
GESPipeline *self = GES_PIPELINE (object);
|
||||
|
||||
switch (property_id) {
|
||||
case PROP_AUDIO_SINK:
|
||||
|
@ -171,7 +171,7 @@ static void
|
|||
ges_pipeline_set_property (GObject * object, guint property_id,
|
||||
const GValue * value, GParamSpec * pspec)
|
||||
{
|
||||
GESPipeline *self = GES_TIMELINE_PIPELINE (object);
|
||||
GESPipeline *self = GES_PIPELINE (object);
|
||||
|
||||
switch (property_id) {
|
||||
case PROP_AUDIO_SINK:
|
||||
|
@ -183,12 +183,11 @@ ges_pipeline_set_property (GObject * object, guint property_id,
|
|||
value);
|
||||
break;
|
||||
case PROP_TIMELINE:
|
||||
ges_pipeline_add_timeline (GES_TIMELINE_PIPELINE (object),
|
||||
ges_pipeline_add_timeline (GES_PIPELINE (object),
|
||||
g_value_get_object (value));
|
||||
break;
|
||||
case PROP_MODE:
|
||||
ges_pipeline_set_mode (GES_TIMELINE_PIPELINE (object),
|
||||
g_value_get_flags (value));
|
||||
ges_pipeline_set_mode (GES_PIPELINE (object), g_value_get_flags (value));
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||
|
@ -198,7 +197,7 @@ ges_pipeline_set_property (GObject * object, guint property_id,
|
|||
static void
|
||||
ges_pipeline_dispose (GObject * object)
|
||||
{
|
||||
GESPipeline *self = GES_TIMELINE_PIPELINE (object);
|
||||
GESPipeline *self = GES_PIPELINE (object);
|
||||
|
||||
if (self->priv->playsink) {
|
||||
if (self->priv->mode & (TIMELINE_MODE_PREVIEW))
|
||||
|
@ -295,7 +294,7 @@ ges_pipeline_init (GESPipeline * self)
|
|||
{
|
||||
GST_INFO_OBJECT (self, "Creating new 'playsink'");
|
||||
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
|
||||
GES_TYPE_TIMELINE_PIPELINE, GESPipelinePrivate);
|
||||
GES_TYPE_PIPELINE, GESPipelinePrivate);
|
||||
|
||||
self->priv->playsink =
|
||||
gst_element_factory_make ("playsink", "internal-sinks");
|
||||
|
@ -420,7 +419,7 @@ ges_pipeline_change_state (GstElement * element, GstStateChange transition)
|
|||
GESPipeline *self;
|
||||
GstStateChangeReturn ret;
|
||||
|
||||
self = GES_TIMELINE_PIPELINE (element);
|
||||
self = GES_PIPELINE (element);
|
||||
|
||||
switch (transition) {
|
||||
case GST_STATE_CHANGE_READY_TO_PAUSED:
|
||||
|
@ -804,7 +803,7 @@ no_more_pads_cb (GstElement * timeline, GESPipeline * self)
|
|||
gboolean
|
||||
ges_pipeline_add_timeline (GESPipeline * pipeline, GESTimeline * timeline)
|
||||
{
|
||||
g_return_val_if_fail (GES_IS_TIMELINE_PIPELINE (pipeline), FALSE);
|
||||
g_return_val_if_fail (GES_IS_PIPELINE (pipeline), FALSE);
|
||||
g_return_val_if_fail (GES_IS_TIMELINE (timeline), FALSE);
|
||||
g_return_val_if_fail (pipeline->priv->timeline == NULL, FALSE);
|
||||
|
||||
|
@ -852,7 +851,7 @@ ges_pipeline_set_render_settings (GESPipeline * pipeline,
|
|||
GError *err = NULL;
|
||||
GstEncodingProfile *set_profile;
|
||||
|
||||
g_return_val_if_fail (GES_IS_TIMELINE_PIPELINE (pipeline), FALSE);
|
||||
g_return_val_if_fail (GES_IS_PIPELINE (pipeline), FALSE);
|
||||
|
||||
/* Clear previous URI sink if it existed */
|
||||
/* FIXME : We should figure out if it was added to the pipeline,
|
||||
|
@ -921,7 +920,7 @@ ges_pipeline_get_mode (GESPipeline * pipeline)
|
|||
gboolean
|
||||
ges_pipeline_set_mode (GESPipeline * pipeline, GESPipelineFlags mode)
|
||||
{
|
||||
g_return_val_if_fail (GES_IS_TIMELINE_PIPELINE (pipeline), FALSE);
|
||||
g_return_val_if_fail (GES_IS_PIPELINE (pipeline), FALSE);
|
||||
|
||||
GST_DEBUG_OBJECT (pipeline, "current mode : %d, mode : %d",
|
||||
pipeline->priv->mode, mode);
|
||||
|
@ -1039,7 +1038,7 @@ ges_pipeline_get_thumbnail (GESPipeline * self, GstCaps * caps)
|
|||
{
|
||||
GstElement *sink;
|
||||
|
||||
g_return_val_if_fail (GES_IS_TIMELINE_PIPELINE (self), FALSE);
|
||||
g_return_val_if_fail (GES_IS_PIPELINE (self), FALSE);
|
||||
|
||||
sink = self->priv->playsink;
|
||||
|
||||
|
@ -1076,7 +1075,7 @@ ges_pipeline_save_thumbnail (GESPipeline * self, int width, int
|
|||
GstCaps *caps;
|
||||
gboolean res = TRUE;
|
||||
|
||||
g_return_val_if_fail (GES_IS_TIMELINE_PIPELINE (self), FALSE);
|
||||
g_return_val_if_fail (GES_IS_PIPELINE (self), FALSE);
|
||||
|
||||
caps = gst_caps_from_string (format);
|
||||
|
||||
|
@ -1133,7 +1132,7 @@ ges_pipeline_get_thumbnail_rgb24 (GESPipeline * self, gint width, gint height)
|
|||
GstSample *ret;
|
||||
GstCaps *caps;
|
||||
|
||||
g_return_val_if_fail (GES_IS_TIMELINE_PIPELINE (self), FALSE);
|
||||
g_return_val_if_fail (GES_IS_PIPELINE (self), FALSE);
|
||||
|
||||
caps = gst_caps_new_simple ("video/x-raw", "format", G_TYPE_STRING,
|
||||
"RGB", NULL);
|
||||
|
@ -1166,7 +1165,7 @@ ges_pipeline_preview_get_video_sink (GESPipeline * self)
|
|||
{
|
||||
GstElement *sink = NULL;
|
||||
|
||||
g_return_val_if_fail (GES_IS_TIMELINE_PIPELINE (self), FALSE);
|
||||
g_return_val_if_fail (GES_IS_PIPELINE (self), FALSE);
|
||||
|
||||
g_object_get (self->priv->playsink, "video-sink", &sink, NULL);
|
||||
|
||||
|
@ -1184,7 +1183,7 @@ ges_pipeline_preview_get_video_sink (GESPipeline * self)
|
|||
void
|
||||
ges_pipeline_preview_set_video_sink (GESPipeline * self, GstElement * sink)
|
||||
{
|
||||
g_return_if_fail (GES_IS_TIMELINE_PIPELINE (self));
|
||||
g_return_if_fail (GES_IS_PIPELINE (self));
|
||||
|
||||
g_object_set (self->priv->playsink, "video-sink", sink, NULL);
|
||||
};
|
||||
|
@ -1206,7 +1205,7 @@ ges_pipeline_preview_get_audio_sink (GESPipeline * self)
|
|||
{
|
||||
GstElement *sink = NULL;
|
||||
|
||||
g_return_val_if_fail (GES_IS_TIMELINE_PIPELINE (self), FALSE);
|
||||
g_return_val_if_fail (GES_IS_PIPELINE (self), FALSE);
|
||||
|
||||
g_object_get (self->priv->playsink, "audio-sink", &sink, NULL);
|
||||
|
||||
|
@ -1224,7 +1223,7 @@ ges_pipeline_preview_get_audio_sink (GESPipeline * self)
|
|||
void
|
||||
ges_pipeline_preview_set_audio_sink (GESPipeline * self, GstElement * sink)
|
||||
{
|
||||
g_return_if_fail (GES_IS_TIMELINE_PIPELINE (self));
|
||||
g_return_if_fail (GES_IS_PIPELINE (self));
|
||||
|
||||
g_object_set (self->priv->playsink, "audio-sink", sink, NULL);
|
||||
};
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef _GES_TIMELINE_PIPELINE
|
||||
#define _GES_TIMELINE_PIPELINE
|
||||
#ifndef _GES_PIPELINE
|
||||
#define _GES_PIPELINE
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <ges/ges.h>
|
||||
|
@ -27,22 +27,22 @@
|
|||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define GES_TYPE_TIMELINE_PIPELINE ges_pipeline_get_type()
|
||||
#define GES_TYPE_PIPELINE ges_pipeline_get_type()
|
||||
|
||||
#define GES_TIMELINE_PIPELINE(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TIMELINE_PIPELINE, GESPipeline))
|
||||
#define GES_PIPELINE(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_PIPELINE, GESPipeline))
|
||||
|
||||
#define GES_TIMELINE_PIPELINE_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TIMELINE_PIPELINE, GESPipelineClass))
|
||||
#define GES_PIPELINE_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_PIPELINE, GESPipelineClass))
|
||||
|
||||
#define GES_IS_TIMELINE_PIPELINE(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TIMELINE_PIPELINE))
|
||||
#define GES_IS_PIPELINE(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_PIPELINE))
|
||||
|
||||
#define GES_IS_TIMELINE_PIPELINE_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TIMELINE_PIPELINE))
|
||||
#define GES_IS_PIPELINE_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_PIPELINE))
|
||||
|
||||
#define GES_TIMELINE_PIPELINE_GET_CLASS(obj) \
|
||||
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_PIPELINE, GESPipelineClass))
|
||||
#define GES_PIPELINE_GET_CLASS(obj) \
|
||||
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_PIPELINE, GESPipelineClass))
|
||||
|
||||
typedef struct _GESPipelinePrivate GESPipelinePrivate;
|
||||
|
||||
|
@ -118,5 +118,5 @@ ges_pipeline_preview_set_audio_sink (GESPipeline * self,
|
|||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* _GES_TIMELINE_PIPELINE */
|
||||
#endif /* _GES_PIPELINE */
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ thumbnail_cb (gpointer user)
|
|||
GstCaps *caps;
|
||||
GESPipeline *p;
|
||||
|
||||
p = GES_TIMELINE_PIPELINE (user);
|
||||
p = GES_PIPELINE (user);
|
||||
|
||||
caps = gst_caps_from_string ("image/jpeg");
|
||||
GST_INFO ("getting thumbnails");
|
||||
|
|
Loading…
Reference in a new issue