mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-30 02:58:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

launcher: don't start the pipeline before we're done updating it

Browse source 
Since 70e3b8ae2a the CommandLineFormatter
also emit "loaded" so we ended up doing this twice, once
as before in `run_pipeline` and another time in the `project:loaded`
callback.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/265>
This commit is contained in:
Mathieu Duponchelle 2021-08-10 23:23:39 +02:00
parent e12b3b7cef
commit ee35cba6e8
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tools/ges-launcher.c
View file

@ -692,12 +692,16 @@ _project_loaded_cb (GESProject * project, GESTimeline * timeline,
self->priv->seenerrors = TRUE;
g_application_quit (G_APPLICATION (self));
}
_timeline_set_user_options (self, timeline, project_uri);
if (project_uri) {
if (!_timeline_set_user_options (self, timeline, project_uri)) {
g_error ("Failed to set user options on timeline\n");
} else if (project_uri) {
if (!_set_rendering_details (self))
g_error ("Failed to setup rendering details\n");
}
print_timeline (self->priv->timeline);
g_free (project_uri);
if (!self->priv->seenerrors && opts->needs_set_state &&
@ -947,22 +951,12 @@ _run_pipeline (GESLauncher * self)
g_error ("Failed to setup rendering details\n");
return FALSE;
}
print_timeline (self->priv->timeline);
}
bus = gst_pipeline_get_bus (GST_PIPELINE (self->priv->pipeline));
gst_bus_add_signal_watch (bus);
g_signal_connect (bus, "message", G_CALLBACK (bus_message_cb), self);
if (!opts->load_path) {
if (opts->needs_set_state
&& gst_element_set_state (GST_ELEMENT (self->priv->pipeline),
GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
g_error ("Failed to start the pipeline\n");
return FALSE;
}
}
g_application_hold (G_APPLICATION (self));
return TRUE;