X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstd.c;h=e36b7ccc77910637dd0e0bbc484d3150e40b66a2;hb=463160cbca37367ef94dfead0c64531d82b83ab8;hp=bd9c62860cccd9ccf15e7e383a8fa6c1ea49aa7f;hpb=e66d1892d0dd16ed166fc8f13493f95de0607362;p=libsigrok.git

diff --git a/src/std.c b/src/std.c
index bd9c6286..e36b7ccc 100644
--- a/src/std.c
+++ b/src/std.c
@@ -540,3 +540,64 @@ SR_PRIV int std_opts_config_list(uint32_t key, GVariant **data,
 
 	return SR_OK;
 }
+
+SR_PRIV GVariant *std_gvar_tuple_array(const uint64_t (*a)[][2], unsigned int n)
+{
+	unsigned int i;
+	GVariant *rational[2];
+	GVariantBuilder gvb;
+
+	g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+
+	for (i = 0; i < n; i++) {
+		rational[0] = g_variant_new_uint64((*a)[i][0]);
+		rational[1] = g_variant_new_uint64((*a)[i][1]);
+
+		/* FIXME: Valgrind reports a memory leak here. */
+		g_variant_builder_add_value(&gvb, g_variant_new_tuple(rational, 2));
+	}
+
+	return g_variant_builder_end(&gvb);
+}
+
+SR_PRIV GVariant *std_gvar_tuple_rational(const struct sr_rational *r, unsigned int n)
+{
+	unsigned int i;
+	GVariant *rational[2];
+	GVariantBuilder gvb;
+
+	g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+
+	for (i = 0; i < n; i++) {
+		rational[0] = g_variant_new_uint64(r[i].p);
+		rational[1] = g_variant_new_uint64(r[i].q);
+
+		/* FIXME: Valgrind reports a memory leak here. */
+		g_variant_builder_add_value(&gvb, g_variant_new_tuple(rational, 2));
+	}
+
+	return g_variant_builder_end(&gvb);
+}
+
+static GVariant *samplerate_helper(const uint64_t samplerates[], unsigned int n, const char *str)
+{
+	GVariant *gvar;
+	GVariantBuilder gvb;
+
+	g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
+	gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates,
+			n, sizeof(uint64_t));
+	g_variant_builder_add(&gvb, "{sv}", str, gvar);
+
+	return g_variant_builder_end(&gvb);
+}
+
+SR_PRIV GVariant *std_gvar_samplerates(const uint64_t samplerates[], unsigned int n)
+{
+	return samplerate_helper(samplerates, n, "samplerates");
+}
+
+SR_PRIV GVariant *std_gvar_samplerates_steps(const uint64_t samplerates[], unsigned int n)
+{
+	return samplerate_helper(samplerates, n, "samplerate-steps");
+}