input: Use own main loop instead of sr_session_run()
authorDaniel Elstner <daniel.kitta@gmail.com>
Fri, 9 Oct 2015 16:45:03 +0000 (18:45 +0200)
committerDaniel Elstner <daniel.kitta@gmail.com>
Fri, 9 Oct 2015 18:33:06 +0000 (20:33 +0200)
Again, this is mainly for demonstration purposes, and to make
sigrok-cli consistently use the same "modern" API everywhere.

input.c

diff --git a/input.c b/input.c
index a4206e0e220bde32803566e56dfc73b4b617a976..21c28cd70a74467e665eab3440324b728e6402c9 100644 (file)
--- a/input.c
+++ b/input.c
@@ -149,6 +149,7 @@ void load_input_file(void)
        struct sr_session *session;
        struct sr_dev_inst *sdi;
        GSList *devices;
+       GMainLoop *main_loop;
        int ret;
 
        if (!strcmp(opt_input_file, "-")) {
@@ -161,18 +162,27 @@ void load_input_file(void)
                        ret = sr_session_dev_list(session, &devices);
                        if (ret != SR_OK || !devices || !devices->data) {
                                g_critical("Failed to access session device.");
+                               g_slist_free(devices);
                                sr_session_destroy(session);
                                return;
                        }
                        sdi = devices->data;
+                       g_slist_free(devices);
                        if (select_channels(sdi) != SR_OK) {
                                sr_session_destroy(session);
                                return;
                        }
+                       main_loop = g_main_loop_new(NULL, FALSE);
+
                        sr_session_datafeed_callback_add(session, datafeed_in, NULL);
-                       sr_session_start(session);
-                       sr_session_run(session);
-                       sr_session_stop(session);
+                       sr_session_stopped_callback_set(session,
+                               (sr_session_stopped_callback)g_main_loop_quit,
+                               main_loop);
+                       if (sr_session_start(session) == SR_OK)
+                               g_main_loop_run(main_loop);
+
+                       g_main_loop_unref(main_loop);
+                       sr_session_destroy(session);
                } else if (ret != SR_ERR) {
                        /* It's a session file, but it didn't work out somehow. */
                        g_critical("Failed to load session file.");