mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges-pipeline: Rename add_timeline to set_timeline

Browse source 
API BREAKAGE:
        - ges_pipeline_add_timeline
        + ges_pipeline_set_timeline
This commit is contained in:
Alexandru Băluț 2014-02-04 10:45:58 +01:00 committed by Thibault Saunier
parent f76000d750
commit df93acc581
19 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/python/examples/simple.py
View file

@ -35,7 +35,7 @@ class Simple:
def _create_pipeline(self, timeline): def _create_pipeline(self, timeline):
self.pipeline = GES.Pipeline() self.pipeline = GES.Pipeline()
self.pipeline.add_timeline(timeline) self.pipeline.set_timeline(timeline)
bus = self.pipeline.get_bus() bus = self.pipeline.get_bus()
bus.add_signal_watch() bus.add_signal_watch()
bus.connect("message", self.bus_message_cb) bus.connect("message", self.bus_message_cb)

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

@ -503,7 +503,7 @@ ges_clip_get_type
<TITLE>GESPipeline</TITLE> <TITLE>GESPipeline</TITLE>
GESPipeline GESPipeline
ges_pipeline_new ges_pipeline_new
ges_pipeline_add_timeline ges_pipeline_set_timeline
ges_pipeline_set_mode ges_pipeline_set_mode
ges_pipeline_set_render_settings ges_pipeline_set_render_settings
ges_pipeline_preview_get_audio_sink ges_pipeline_preview_get_audio_sink

10
ges/ges-pipeline.c
View file

@ -183,7 +183,7 @@ ges_pipeline_set_property (GObject * object, guint property_id,
value); value);
break; break;
case PROP_TIMELINE: case PROP_TIMELINE:
ges_pipeline_add_timeline (GES_PIPELINE (object), ges_pipeline_set_timeline (GES_PIPELINE (object),
g_value_get_object (value)); g_value_get_object (value));
break; break;
case PROP_MODE: case PROP_MODE:
@ -261,11 +261,11 @@ ges_pipeline_class_init (GESPipelineClass * klass)
* GESPipeline:timeline: * GESPipeline:timeline:
* *
* Timeline to use in this pipeline. See also * Timeline to use in this pipeline. See also
* ges_pipeline_add_timeline() for more info. * ges_pipeline_set_timeline() for more info.
*/ */
properties[PROP_TIMELINE] = g_param_spec_object ("timeline", "Timeline", properties[PROP_TIMELINE] = g_param_spec_object ("timeline", "Timeline",
"Timeline to use in this pipeline. See also " "Timeline to use in this pipeline. See also "
"ges_pipeline_add_timeline() for more info.", "ges_pipeline_set_timeline() for more info.",
GES_TYPE_TIMELINE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); GES_TYPE_TIMELINE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_TIMELINE, g_object_class_install_property (object_class, PROP_TIMELINE,
properties[PROP_TIMELINE]); properties[PROP_TIMELINE]);
@ -786,7 +786,7 @@ no_more_pads_cb (GstElement * timeline, GESPipeline * self)
} }
/** /**
* ges_pipeline_add_timeline: * ges_pipeline_set_timeline:
* @pipeline: a #GESPipeline * @pipeline: a #GESPipeline
* @timeline: the #GESTimeline to set on the @pipeline. * @timeline: the #GESTimeline to set on the @pipeline.
* *
@ -798,7 +798,7 @@ no_more_pads_cb (GstElement * timeline, GESPipeline * self)
* else FALSE. * else FALSE.
*/ */
gboolean gboolean
ges_pipeline_add_timeline (GESPipeline * pipeline, GESTimeline * timeline) ges_pipeline_set_timeline (GESPipeline * pipeline, GESTimeline * timeline)
{ {
g_return_val_if_fail (GES_IS_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 (GES_IS_TIMELINE (timeline), FALSE);

2
ges/ges-pipeline.h
View file

@ -79,7 +79,7 @@ GType ges_pipeline_get_type (void);
GESPipeline* ges_pipeline_new (void); GESPipeline* ges_pipeline_new (void);
gboolean ges_pipeline_add_timeline (GESPipeline * pipeline, gboolean ges_pipeline_set_timeline (GESPipeline * pipeline,
GESTimeline * timeline); GESTimeline * timeline);
gboolean ges_pipeline_set_render_settings (GESPipeline *pipeline, gboolean ges_pipeline_set_render_settings (GESPipeline *pipeline,

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

@ -350,7 +350,7 @@ check_timeline (GESTimeline * timeline)
gst_bus_add_watch (bus, my_bus_callback, &ret); gst_bus_add_watch (bus, my_bus_callback, &ret);
gst_object_unref (bus); gst_object_unref (bus);
ges_pipeline_add_timeline (pipeline, timeline); ges_pipeline_set_timeline (pipeline, timeline);
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1); gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1);
GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (pipeline), GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (pipeline),

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

@ -633,7 +633,7 @@ project_loaded_now_play_cb (GESProject * project, GESTimeline * timeline)
GESPipeline *pipeline = ges_pipeline_new (); GESPipeline *pipeline = ges_pipeline_new ();
fail_unless (ges_pipeline_add_timeline (pipeline, timeline)); fail_unless (ges_pipeline_set_timeline (pipeline, timeline));
bus = gst_element_get_bus (GST_ELEMENT (pipeline)); bus = gst_element_get_bus (GST_ELEMENT (pipeline));
fail_if (gst_element_set_state (GST_ELEMENT (pipeline), fail_if (gst_element_set_state (GST_ELEMENT (pipeline),

4
tests/check/ges/test-utils.c
View file

@ -97,7 +97,7 @@ ges_test_create_pipeline (GESTimeline * timeline)
GESPipeline *pipeline; GESPipeline *pipeline;
pipeline = ges_pipeline_new (); pipeline = ges_pipeline_new ();
fail_unless (ges_pipeline_add_timeline (pipeline, timeline)); fail_unless (ges_pipeline_set_timeline (pipeline, timeline));
g_object_set (pipeline, "audio-sink", gst_element_factory_make ("fakesink", g_object_set (pipeline, "audio-sink", gst_element_factory_make ("fakesink",
"test-audiofakesink"), "video-sink", "test-audiofakesink"), "video-sink",
@ -264,7 +264,7 @@ play_timeline (GESTimeline * timeline)
gst_bus_add_watch (bus, (GstBusFunc) my_bus_callback, loop); gst_bus_add_watch (bus, (GstBusFunc) my_bus_callback, loop);
gst_object_unref (bus); gst_object_unref (bus);
ges_pipeline_add_timeline (pipeline, timeline); ges_pipeline_set_timeline (pipeline, timeline);
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1); gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1);

2
tests/examples/concatenate.c
View file

@ -103,7 +103,7 @@ main (int argc, char **argv)
pipeline = ges_pipeline_new (); pipeline = ges_pipeline_new ();
/* Add the timeline to that pipeline */ /* Add the timeline to that pipeline */
if (!ges_pipeline_add_timeline (pipeline, timeline)) if (!ges_pipeline_set_timeline (pipeline, timeline))
return -1; return -1;
mainloop = g_main_loop_new (NULL, FALSE); mainloop = g_main_loop_new (NULL, FALSE);

4
tests/examples/ges-ui.c
View file

@ -1142,7 +1142,7 @@ app_launch_project (App * app, gchar * uri)
bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline)); bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
mainloop = g_main_loop_new (NULL, FALSE); mainloop = g_main_loop_new (NULL, FALSE);
ges_pipeline_add_timeline (pipeline, timeline); ges_pipeline_set_timeline (pipeline, timeline);
ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO); ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO);
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
gst_bus_add_signal_watch (bus); gst_bus_add_signal_watch (bus);
@ -1268,7 +1268,7 @@ app_init (void)
if (!(ret->pipeline = ges_pipeline_new ())) if (!(ret->pipeline = ges_pipeline_new ()))
goto fail; goto fail;
if (!ges_pipeline_add_timeline (ret->pipeline, ret->timeline)) if (!ges_pipeline_set_timeline (ret->pipeline, ret->timeline))
goto fail; goto fail;
if (!(create_ui (ret))) if (!(create_ui (ret)))

2
tests/examples/overlays.c
View file

@ -92,7 +92,7 @@ make_timeline (char *path, float duration, char *text, guint32 color,
ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO); ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO);
timeline = ges_timeline_new (); timeline = ges_timeline_new ();
ges_pipeline_add_timeline (pipeline, timeline); ges_pipeline_set_timeline (pipeline, timeline);
trackv = GES_TRACK (ges_video_track_new ()); trackv = GES_TRACK (ges_video_track_new ());
ges_timeline_add_track (timeline, trackv); ges_timeline_add_track (timeline, trackv);

2
tests/examples/simple1.c
View file

@ -84,7 +84,7 @@ main (int argc, gchar ** argv)
!ges_timeline_add_layer (timeline, layer2) || !ges_timeline_add_layer (timeline, layer2) ||
!ges_timeline_add_track (timeline, tracka) || !ges_timeline_add_track (timeline, tracka) ||
!ges_timeline_add_track (timeline, trackv) || !ges_timeline_add_track (timeline, trackv) ||
!ges_pipeline_add_timeline (pipeline, timeline)) !ges_pipeline_set_timeline (pipeline, timeline))
return -1; return -1;
if (1) { if (1) {

2
tests/examples/test1.c
View file

@ -67,7 +67,7 @@ main (int argc, gchar ** argv)
pipeline = ges_pipeline_new (); pipeline = ges_pipeline_new ();
/* Add the timeline to that pipeline */ /* Add the timeline to that pipeline */
if (!ges_pipeline_add_timeline (pipeline, timeline)) if (!ges_pipeline_set_timeline (pipeline, timeline))
return -1; return -1;
/* The following is standard usage of a GStreamer pipeline (note how you haven't /* The following is standard usage of a GStreamer pipeline (note how you haven't

2
tests/examples/test2.c
View file

@ -78,7 +78,7 @@ main (int argc, gchar ** argv)
pipeline = ges_pipeline_new (); pipeline = ges_pipeline_new ();
/* Add the timeline to that pipeline */ /* Add the timeline to that pipeline */
if (!ges_pipeline_add_timeline (pipeline, timeline)) if (!ges_pipeline_set_timeline (pipeline, timeline))
return -1; return -1;
/* The following is standard usage of a GStreamer pipeline (note how you /* The following is standard usage of a GStreamer pipeline (note how you

2
tests/examples/test3.c
View file

@ -77,7 +77,7 @@ main (int argc, gchar ** argv)
pipeline = ges_pipeline_new (); pipeline = ges_pipeline_new ();
/* Add the timeline to that pipeline */ /* Add the timeline to that pipeline */
if (!ges_pipeline_add_timeline (pipeline, timeline)) if (!ges_pipeline_set_timeline (pipeline, timeline))
return -1; return -1;
/* The following is standard usage of a GStreamer pipeline (note how you haven't /* The following is standard usage of a GStreamer pipeline (note how you haven't

2
tests/examples/test4.c
View file

@ -134,7 +134,7 @@ main (int argc, gchar ** argv)
pipeline = ges_pipeline_new (); pipeline = ges_pipeline_new ();
/* Add the timeline to that pipeline */ /* Add the timeline to that pipeline */
if (!ges_pipeline_add_timeline (pipeline, timeline)) if (!ges_pipeline_set_timeline (pipeline, timeline))
return -1; return -1;

2
tests/examples/text_properties.c
View file

@ -65,7 +65,7 @@ make_timeline (char *path, float duration, char *text)
ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO); ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO);
timeline = ges_timeline_new (); timeline = ges_timeline_new ();
ges_pipeline_add_timeline (pipeline, timeline); ges_pipeline_set_timeline (pipeline, timeline);
trackv = GES_TRACK (ges_video_track_new ()); trackv = GES_TRACK (ges_video_track_new ());
ges_timeline_add_track (timeline, trackv); ges_timeline_add_track (timeline, trackv);

2
tests/examples/thumbnails.c
View file

@ -101,7 +101,7 @@ create_timeline (void)
pipeline = ges_pipeline_new (); pipeline = ges_pipeline_new ();
if (!ges_pipeline_add_timeline (pipeline, timeline)) if (!ges_pipeline_set_timeline (pipeline, timeline))
return NULL; return NULL;
return pipeline; return pipeline;

2
tests/examples/transition.c
View file

@ -100,7 +100,7 @@ make_timeline (gchar * nick, gdouble tdur, gchar * patha, gfloat adur,
ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO); ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO);
timeline = ges_timeline_new (); timeline = ges_timeline_new ();
ges_pipeline_add_timeline (pipeline, timeline); ges_pipeline_set_timeline (pipeline, timeline);
trackv = GES_TRACK (ges_video_track_new ()); trackv = GES_TRACK (ges_video_track_new ());
ges_timeline_add_track (timeline, trackv); ges_timeline_add_track (timeline, trackv);

2
tools/ges-launch.c
View file

@ -343,7 +343,7 @@ create_pipeline (GESTimeline ** ret_timeline, gchar * load_path,
pipeline = ges_pipeline_new (); pipeline = ges_pipeline_new ();
/* Add the timeline to that pipeline */ /* Add the timeline to that pipeline */
if (!ges_pipeline_add_timeline (pipeline, timeline)) if (!ges_pipeline_set_timeline (pipeline, timeline))
goto failure; goto failure;
*ret_timeline = timeline; *ret_timeline = timeline;