X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=check_wav.c;h=89ebdacc0805e9575acea92d09ed3b2dd81ebac3;hp=11459e08c375c62285664637125c599f0e5b02be;hb=HEAD;hpb=a28eef552dc779eac12c1df430522dc4e20ae428

diff --git a/check_wav.c b/check_wav.c
index 11459e08..3789f30a 100644
--- a/check_wav.c
+++ b/check_wav.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file check_wav.c Detect and delete a wav header. */
 
@@ -15,6 +11,7 @@
 #include "buffer_tree.h"
 #include "error.h"
 #include "check_wav.h"
+#include "portable_io.h"
 
 /** Length of a standard wav header. */
 #define WAV_HEADER_LEN 44
@@ -42,15 +39,15 @@ struct check_wav_context {
 };
 
 /**
- * Set select timeout according to the given context.
+ * Request a minimal timeout if not idle.
  *
- * \param s Contains the timeval that should be set.
- * \param cwc Contains a pointer to the buffer tree node.
+ * \param s The scheduler instance.
+ * \param cwc The buffer tree node is derived from this.
  *
- * This requests a minimal timeout from the scheduler if btrn of \a cwc is not
- * idle.
+ * If no data is available and the buffer tree node is not in error state, the
+ * function does nothing.
  */
-void check_wav_pre_select(struct sched *s, struct check_wav_context *cwc)
+void check_wav_pre_monitor(struct sched *s, struct check_wav_context *cwc)
 {
 	int ret = btr_node_status(cwc->btrn, cwc->min_iqs, BTR_NT_INTERNAL);
 	if (ret != 0)
@@ -124,7 +121,7 @@ out:
  *
  * \return Standard.
  */
-int check_wav_post_select(struct check_wav_context *cwc)
+int check_wav_post_monitor(struct check_wav_context *cwc)
 {
 	struct btr_node *btrn = cwc->btrn;
 	unsigned char *a;
@@ -159,9 +156,9 @@ int check_wav_post_select(struct check_wav_context *cwc)
 	PARA_INFO_LOG("found wav header\n");
 	cwc->state = CWS_HAVE_HEADER;
 	/* Only set those values which have not already been set. */
-	cwc->channels = (unsigned)a[22];
-	cwc->sample_rate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
-	bps = a[34] + ((unsigned)a[35] << 8);
+	cwc->channels = a[22];
+	cwc->sample_rate = read_u32(a + 24);
+	bps = read_u16(a + 34);
 	if (bps != 8 && bps != 16) {
 		PARA_WARNING_LOG("%u bps not supported, assuming 16\n",
 			bps);
@@ -177,7 +174,7 @@ int check_wav_post_select(struct check_wav_context *cwc)
 	else
 		cwc->sample_format = (a[3] == 'F')?
 			SF_S16_LE : SF_S16_BE;
-	PARA_NOTICE_LOG("%dHz, %s, %s\n", cwc->sample_rate,
+	PARA_NOTICE_LOG("%uHz, %s, %s\n", cwc->sample_rate,
 		cwc->channels == 1? "mono" : "stereo",
 		sample_formats[cwc->sample_format]);
 	btr_consume(btrn, WAV_HEADER_LEN);
@@ -201,8 +198,8 @@ out:
  * children of this node can figure out channel count, sample rate, etc.
  *
  * \return The (opaque) handle of the newly created check_wav instance. It is
- * supposed to be passed to \ref check_wav_pre_select() and \ref
- * check_wav_post_select().
+ * supposed to be passed to \ref check_wav_pre_monitor() and \ref
+ * check_wav_post_monitor().
  *
  * \sa \ref btr_new_node.
  */
@@ -210,7 +207,7 @@ struct check_wav_context *check_wav_init(struct btr_node *parent,
 		struct btr_node *child, struct wav_params *params,
 		struct btr_node **cw_btrn)
 {
-	struct check_wav_context *cwc = para_calloc(sizeof(*cwc));
+	struct check_wav_context *cwc = zalloc(sizeof(*cwc));
 
 	cwc->state = CWS_NEED_HEADER;
 	cwc->min_iqs = WAV_HEADER_LEN;
@@ -228,7 +225,7 @@ struct check_wav_context *check_wav_init(struct btr_node *parent,
  *
  * \param cwc Determines the instance to shut down.
  *
- * This function may only be called after check_wav_post_select() has returned
+ * This function may only be called after check_wav_post_monitor() has returned
  * negative.
  */
 void check_wav_shutdown(struct check_wav_context *cwc)