mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-03 17:22:29 +00:00
ges-launch: Only create a layer if needed.
That way scenarios can start with an empty timeline
This commit is contained in:
parent
5d21fb74fe
commit
f16ad15ef3
1 changed files with 10 additions and 8 deletions
|
@ -254,7 +254,7 @@ str_to_time (char *time)
|
||||||
static GESTimeline *
|
static GESTimeline *
|
||||||
create_timeline (int nbargs, gchar ** argv, const gchar * proj_uri)
|
create_timeline (int nbargs, gchar ** argv, const gchar * proj_uri)
|
||||||
{
|
{
|
||||||
GESLayer *layer;
|
GESLayer *layer = NULL;
|
||||||
GESTrack *tracka = NULL, *trackv = NULL;
|
GESTrack *tracka = NULL, *trackv = NULL;
|
||||||
GESTimeline *timeline;
|
GESTimeline *timeline;
|
||||||
guint i;
|
guint i;
|
||||||
|
@ -276,13 +276,6 @@ create_timeline (int nbargs, gchar ** argv, const gchar * proj_uri)
|
||||||
if (proj_uri)
|
if (proj_uri)
|
||||||
return timeline;
|
return timeline;
|
||||||
|
|
||||||
/* We are only going to be doing one layer of clips */
|
|
||||||
layer = (GESLayer *) ges_layer_new ();
|
|
||||||
|
|
||||||
/* Add the tracks and the layer to the timeline */
|
|
||||||
if (!ges_timeline_add_layer (timeline, layer))
|
|
||||||
goto build_failure;
|
|
||||||
|
|
||||||
if (track_types & GES_TRACK_TYPE_AUDIO) {
|
if (track_types & GES_TRACK_TYPE_AUDIO) {
|
||||||
tracka = GES_TRACK (ges_audio_track_new ());
|
tracka = GES_TRACK (ges_audio_track_new ());
|
||||||
if (disable_mixing)
|
if (disable_mixing)
|
||||||
|
@ -312,6 +305,15 @@ create_timeline (int nbargs, gchar ** argv, const gchar * proj_uri)
|
||||||
char *arg0 = argv[(i * 3) + 1];
|
char *arg0 = argv[(i * 3) + 1];
|
||||||
guint64 duration = str_to_time (argv[(i * 3) + 2]);
|
guint64 duration = str_to_time (argv[(i * 3) + 2]);
|
||||||
|
|
||||||
|
if (i == 0) {
|
||||||
|
/* We are only going to be doing one layer of clips */
|
||||||
|
layer = (GESLayer *) ges_layer_new ();
|
||||||
|
|
||||||
|
/* Add the tracks and the layer to the timeline */
|
||||||
|
if (!ges_timeline_add_layer (timeline, layer))
|
||||||
|
goto build_failure;
|
||||||
|
}
|
||||||
|
|
||||||
if (duration == 0)
|
if (duration == 0)
|
||||||
duration = GST_CLOCK_TIME_NONE;
|
duration = GST_CLOCK_TIME_NONE;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue