X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=check_wav.h;h=045158ab2d2d32dd97e000896dce450a2b854496;hp=ba1a8eca48f2bf9407c7f3efbbdbd74e7414b2c7;hb=b1206644af64376f11877f14fa9f9dd3c30f8e4b;hpb=d46a0767b58654f15f16406cf99296287bd0d534

diff --git a/check_wav.h b/check_wav.h
index ba1a8eca..045158ab 100644
--- a/check_wav.h
+++ b/check_wav.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2012 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -29,22 +29,19 @@ struct wav_params {
 	int sample_format_given;
 };
 
-/**
- * Copy the wav parameters.
- *
- * \param dst Usually a pointer to struct wav_params.
- * \param src Usually a pointer to some args_info struct.
- *
- * This can not be implemented as a function since the type of the structure
- * pointed to by \a src depends on the application.
- */
-#define COPY_WAV_PARMS(dst, src) \
-	(dst)->channels_arg = (src)->channels_arg; \
-	(dst)->channels_given = (src)->channels_given; \
-	(dst)->sample_rate_arg = (src)->sample_rate_arg; \
-	(dst)->sample_rate_given = (src)->sample_rate_given; \
-	(dst)->sample_format_arg = (src)->sample_format_arg; \
-	(dst)->sample_format_given = (src)->sample_format_given;
+#define LLS_COPY_WAV_PARMS(_dst, _pfx, _lpr) \
+	(_dst)->channels_given = lls_opt_given(lls_opt_result( \
+		_pfx ## _OPT_CHANNELS, (_lpr))); \
+	(_dst)->sample_rate_given = lls_opt_given(lls_opt_result( \
+		_pfx ## _OPT_SAMPLE_RATE, (_lpr))); \
+	(_dst)->sample_format_given = lls_opt_given(lls_opt_result( \
+		_pfx ## _OPT_SAMPLE_FORMAT, (_lpr))); \
+	(_dst)->channels_arg = lls_uint32_val(0, lls_opt_result( \
+		_pfx ## _OPT_CHANNELS, (_lpr))); \
+	(_dst)->sample_rate_arg = lls_uint32_val(0, lls_opt_result( \
+		_pfx ## _OPT_SAMPLE_RATE, (_lpr))); \
+	(_dst)->sample_format_arg = lls_uint32_val(0, lls_opt_result( \
+		_pfx ## _OPT_SAMPLE_FORMAT, (_lpr)));
 
 struct check_wav_context *check_wav_init(struct btr_node *parent,
 		struct btr_node *child, struct wav_params *params,