mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

tools: Exit the app as it is a simgle instance app

Browse source 
And force exiting GstValidate when wanted
This commit is contained in:
Thibault Saunier 2015-06-03 14:56:11 +02:00
parent b86cca00f1
commit fee018b358
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/ges-launcher.c
View file

@ -159,7 +159,7 @@ _project_loaded_cb (GESProject * project, GESTimeline * timeline,
g_error ("couldn't create uri for '%s", opts->save_path); g_error ("couldn't create uri for '%s", opts->save_path);
self->priv->seenerrors = TRUE; self->priv->seenerrors = TRUE;
g_application_release (G_APPLICATION (self)); g_application_quit (G_APPLICATION (self));
} }
g_print ("\nSaving project to %s\n", uri); g_print ("\nSaving project to %s\n", uri);
@ -169,7 +169,7 @@ _project_loaded_cb (GESProject * project, GESTimeline * timeline,
g_assert_no_error (error); g_assert_no_error (error);
if (error) { if (error) {
self->priv->seenerrors = TRUE; self->priv->seenerrors = TRUE;
g_application_release (G_APPLICATION (self)); g_application_quit (G_APPLICATION (self));
} }
} }
@ -180,7 +180,7 @@ _project_loaded_cb (GESProject * project, GESTimeline * timeline,
opts->scenario, &opts->needs_set_state) == FALSE) { opts->scenario, &opts->needs_set_state) == FALSE) {
g_error ("Could not activate scenario %s", opts->scenario); g_error ("Could not activate scenario %s", opts->scenario);
self->priv->seenerrors = TRUE; self->priv->seenerrors = TRUE;
g_application_release (G_APPLICATION (self)); g_application_quit (G_APPLICATION (self));
} }
if (opts->needs_set_state if (opts->needs_set_state
@ -197,7 +197,7 @@ _error_loading_asset_cb (GESProject * project, GError * error,
g_printerr ("Error loading asset %s: %s\n", failed_id, error->message); g_printerr ("Error loading asset %s: %s\n", failed_id, error->message);
self->priv->seenerrors = TRUE; self->priv->seenerrors = TRUE;
g_application_release (G_APPLICATION (self)); g_application_quit (G_APPLICATION (self));
} }
static gboolean static gboolean
@ -288,12 +288,12 @@ bus_message_cb (GstBus * bus, GstMessage * message, GESLauncher * self)
g_error_free (err); g_error_free (err);
g_free (dbg_info); g_free (dbg_info);
self->priv->seenerrors = TRUE; self->priv->seenerrors = TRUE;
g_application_release (G_APPLICATION (self)); g_application_quit (G_APPLICATION (self));
break; break;
} }
case GST_MESSAGE_EOS: case GST_MESSAGE_EOS:
g_printerr ("\nDone\n"); g_printerr ("\nDone\n");
g_application_release (G_APPLICATION (self)); g_application_quit (G_APPLICATION (self));
break; break;
case GST_MESSAGE_STATE_CHANGED: case GST_MESSAGE_STATE_CHANGED:
if (GST_MESSAGE_SRC (message) == GST_OBJECT_CAST (self->priv->pipeline)) { if (GST_MESSAGE_SRC (message) == GST_OBJECT_CAST (self->priv->pipeline)) {
@ -331,7 +331,7 @@ intr_handler (GESLauncher * self)
GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (self->priv->pipeline), GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (self->priv->pipeline),
GST_DEBUG_GRAPH_SHOW_ALL, "ges-launch.interupted"); GST_DEBUG_GRAPH_SHOW_ALL, "ges-launch.interupted");
g_application_release (G_APPLICATION (self)); g_application_quit (G_APPLICATION (self));
/* remove signal handler */ /* remove signal handler */
return TRUE; return TRUE;

4
tools/ges-validate.c
View file

@ -87,7 +87,7 @@ ges_validate_clean (GstPipeline * pipeline)
g_object_get_data (G_OBJECT (pipeline), RUNNER_ON_PIPELINE); g_object_get_data (G_OBJECT (pipeline), RUNNER_ON_PIPELINE);
if (runner) if (runner)
res = gst_validate_runner_printf (runner); res = gst_validate_runner_exit (runner, TRUE);
gst_object_unref (pipeline); gst_object_unref (pipeline);
if (runner) { if (runner) {
@ -111,7 +111,7 @@ ges_validate_handle_request_state_change (GstMessage * message,
&& state == GST_STATE_NULL) { && state == GST_STATE_NULL) {
gst_validate_printf (GST_MESSAGE_SRC (message), gst_validate_printf (GST_MESSAGE_SRC (message),
"State change request NULL, " "quiting application\n"); "State change request NULL, " "quiting application\n");
g_application_release (application); g_application_quit (application);
} }
} }