Rename 'struct sr_probe' to 'struct sr_channel' everywhere.

[libsigrok.git] / input / wav.c

diff --git a/input/wav.c b/input/wav.c
index 92f6bfb53c743ae636d41aedcb83f5e20f144965..5b3e3c2a61b2c366b3f9f4e2dfc9892fe8ceba5f 100644 (file)
--- a/input/wav.c
+++ b/input/wav.c
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* 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 LOG_PREFIX "input/wav"
 
 #define CHUNK_SIZE 4096
 
@@ -92,7 +85,7 @@ static int format_match(const char *filename)
 
 static int init(struct sr_input *in, const char *filename)
 {
-       struct sr_probe *probe;
+       struct sr_channel *probe;
        struct context *ctx;
        char buf[40], probename[8];
        int i;