X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=f71f999bd10491449b191e14786d62f9edb28eb6;hb=fd65ec4c9c349a9ed240fedf69946abea7afd047;hp=6e101784606dc4d168a824be891f48413ceffb33;hpb=e950559979908f828a903ede8a50bde091566eed;p=sigrok-cli.git

diff --git a/session.c b/session.c
index 6e10178..f71f999 100644
--- a/session.c
+++ b/session.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
@@ -358,7 +359,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
 	double tmp_double, dlow, dhigh;
 	uint64_t tmp_u64, p, q, low, high, mqflags;
 	uint32_t mq;
-	GVariant *rational[2], *range[2], *gvar, *gtup[2];
+	GVariant *rational[2], *range[2], *gtup[2];
 	GVariantBuilder *vbl;
 	gboolean tmp_bool;
 	gchar **keyval;
@@ -453,7 +454,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
 			g_strfreev(keyval);
 		}
 		break;
-	case SR_T_MQLIST:
+	case SR_T_MQ:
 		/*
 		  Argument is MQ id e.g. ("voltage") optionally followed by one
 		  or more /<mqflag> e.g. "/ac".
@@ -475,12 +476,9 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
 		}
 		g_strfreev(keyval);
 		if (ret != -1) {
-			vbl = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
 			gtup[0] = g_variant_new_uint32(mq);
 			gtup[1] = g_variant_new_uint64(mqflags);
-			gvar = g_variant_new_tuple(gtup, 2);
-			g_variant_builder_add_value(vbl, gvar);
-			src->data = g_variant_builder_end(vbl);
+			src->data = g_variant_new_tuple(gtup, 2);
 		}
 		break;
 	default:
@@ -533,6 +531,7 @@ void run_session(void)
 	int is_demo_dev;
 	struct sr_dev_driver *driver;
 	const struct sr_transform *t;
+	GMainLoop *main_loop;
 
 	devices = device_scan();
 	if (!devices) {
@@ -609,6 +608,7 @@ void run_session(void)
 		return;
 	}
 
+	trigger = NULL;
 	if (opt_triggers) {
 		if (!parse_triggerstring(sdi, opt_triggers, &trigger)) {
 			sr_session_destroy(session);
@@ -683,8 +683,14 @@ void run_session(void)
 	if (!(t = setup_transform_module(sdi)))
 		g_critical("Failed to initialize transform module.");
 
+	main_loop = g_main_loop_new(NULL, FALSE);
+
+	sr_session_stopped_callback_set(session,
+		(sr_session_stopped_callback)g_main_loop_quit, main_loop);
+
 	if (sr_session_start(session) != SR_OK) {
 		g_critical("Failed to start session.");
+		g_main_loop_unref(main_loop);
 		sr_session_destroy(session);
 		return;
 	}
@@ -692,12 +698,15 @@ void run_session(void)
 	if (opt_continuous)
 		add_anykey(session);
 
-	sr_session_run(session);
+	g_main_loop_run(main_loop);
 
 	if (opt_continuous)
 		clear_anykey();
 
+	if (trigger)
+		sr_trigger_free(trigger);
+
 	sr_session_datafeed_callback_remove_all(session);
+	g_main_loop_unref(main_loop);
 	sr_session_destroy(session);
-
 }