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

device-monitor: fix device listing without --follow

Browse source 
In !427, I removed the call to get_devices in order to always
print added devices from the bus handler, however this requires
the main loop to run until all pending messages have been consumed.

This commit achieves this by always running the main loop, and
simply adding an idle source to quit it in the non --follow case.
This commit is contained in:
Mathieu Duponchelle 2019-09-30 16:11:18 +02:00 committed by Mathieu Duponchelle
parent 606ab04cd6
commit 0e1da383a7
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/gst-device-monitor.c
View file

@ -268,6 +268,13 @@ bus_msg_handler (GstBus * bus, GstMessage * msg, gpointer user_data)
return TRUE;
}
static gboolean
quit_loop (GMainLoop * loop)
{
g_main_loop_quit (loop);
return G_SOURCE_REMOVE;
}
int
main (int argc, char **argv)
{
@ -364,12 +371,16 @@ main (int argc, char **argv)
GST_INFO ("Took %.2f seconds", g_timer_elapsed (timer, NULL));
if (follow) {
if (!follow) {
/* Consume all the messages pending on the bus and exit */
g_idle_add ((GSourceFunc) quit_loop, app.loop);
} else {
g_print ("Monitoring devices, waiting for devices to be removed or "
"new devices to be added...\n");
g_main_loop_run (app.loop);
}
g_main_loop_run (app.loop);
gst_device_monitor_stop (app.monitor);
gst_object_unref (app.monitor);