X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=b0b21f2be4a6ac64c2d940f499b59757273db743;hp=3759306ec2215f0732bba5fcc76d18d011db41e1;hb=f6db57bc964bc78f1a7ce521dee2108289cd8b8e;hpb=39840199dee5c2be051222637ee36feaaff6d2e7

diff --git a/alsa_write.c b/alsa_write.c
index 3759306e..b0b21f2b 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -125,7 +125,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
 	period_time = pad->buffer_time * 250; /* buffer time / 4 */
 	msg = "could not set period time";
 	ret = snd_pcm_hw_params_set_period_time_near(pad->handle, hwparams,
-		&period_time, 0);
+		&period_time, NULL);
 	if (ret < 0)
 		goto fail;
 
@@ -199,10 +199,10 @@ fail:
 	return -E_ALSA;
 }
 
-static void alsa_write_pre_select(struct sched *s, struct task *t)
+static void alsa_write_pre_select(struct sched *s, void *context)
 {
 	struct pollfd pfd;
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_alsa_write_data *pad = wn->private_data;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
@@ -248,10 +248,9 @@ static void alsa_close(struct writer_node *wn)
 	free(pad);
 }
 
-static int alsa_write_post_select(__a_unused struct sched *s,
-		struct task *t)
+static int alsa_write_post_select(__a_unused struct sched *s, void *context)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_alsa_write_data *pad = wn->private_data;
 	struct btr_node *btrn = wn->btrn;
 	char *data;
@@ -259,7 +258,7 @@ static int alsa_write_post_select(__a_unused struct sched *s,
 	snd_pcm_sframes_t frames;
 	int ret;
 
-	ret = task_get_notification(t);
+	ret = task_get_notification(wn->task);
 	if (ret < 0)
 		goto err;
 again: