X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fwav.c;h=92f6bfb53c743ae636d41aedcb83f5e20f144965;hb=04cb915716ecdc1ee26440b4c09bc2f2de183631;hp=c5b573caeb99af93b650356ec3da12a77f92e72c;hpb=1d36b4d27f737dfcd6e232bc9d9538bd64bf1afb;p=libsigrok.git

diff --git a/input/wav.c b/input/wav.c
index c5b573ca..92f6bfb5 100644
--- a/input/wav.c
+++ b/input/wav.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
@@ -25,14 +25,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "input/wav: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "input/wav: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 #define CHUNK_SIZE 4096
 
@@ -144,13 +144,15 @@ static int loadfile(struct sr_input *in, const char *filename)
 	ctx = in->sdi->priv;
 
 	/* Send header packet to the session bus. */
-	std_session_send_df_header(in->sdi, DRIVER_LOG_DOMAIN);
+	std_session_send_df_header(in->sdi, LOG_PREFIX);
 
 	packet.type = SR_DF_META;
 	packet.payload = &meta;
-	src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate);
+	src = sr_config_new(SR_CONF_SAMPLERATE,
+			g_variant_new_uint64(ctx->samplerate));
 	meta.config = g_slist_append(NULL, src);
 	sr_session_send(in->sdi, &packet);
+	sr_config_free(src);
 
 	if ((fd = open(filename, O_RDONLY)) == -1)
 		return SR_ERR;