X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=8cf5cfd25bf3909e0f4d338d2397ca0e017c29ab;hp=0bad21992c2537f41201a36499b5cf9129b0255e;hb=c387b216b5fd3c944053e1bba024815719e9a0d9;hpb=e4426bc694c60ba5aade50fd7161251be33dc16a diff --git a/alsa_write.c b/alsa_write.c index 0bad2199..8cf5cfd2 100644 --- a/alsa_write.c +++ b/alsa_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Andre Noll + * Copyright (C) 2005-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -35,7 +35,7 @@ struct private_alsa_write_data { /** The alsa handle */ snd_pcm_t *handle; - /** Determined and set by alsa_open(). */ + /** Determined and set by alsa_init(). */ int bytes_per_frame; /** The approximate maximum buffer duration in us. */ unsigned buffer_time; @@ -142,11 +142,6 @@ static int alsa_init(struct private_alsa_write_data *pad, return 1; } -/* Open an instance of the alsa writer. */ -static void alsa_open(__a_unused struct writer_node *wn) -{ -} - static void alsa_write_pre_select(struct sched *s, struct task *t) { struct writer_node *wn = container_of(t, struct writer_node, task); @@ -219,7 +214,7 @@ again: bytes = btr_next_buffer(btrn, &data); if (ret < 0 || bytes < wn->min_iqs) { /* eof */ assert(btr_no_parent(btrn)); - ret = -E_ALSA_EOF; + ret = -E_WRITE_COMMON_EOF; if (!pad) goto err; /* wait until pending frames are played */ @@ -236,10 +231,9 @@ again: if (!pad) { int32_t val; - pad = para_calloc(sizeof(*pad)); - wn->private_data = pad; if (bytes == 0) /* no data available */ return; + pad = para_calloc(sizeof(*pad)); get_btr_sample_rate(btrn, &val); pad->sample_rate = val; get_btr_channels(btrn, &val); @@ -250,8 +244,11 @@ again: PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->sample_rate); ret = alsa_init(pad, wn->conf); - if (ret < 0) + if (ret < 0) { + free(pad); goto err; + } + wn->private_data = pad; wn->min_iqs = pad->bytes_per_frame; goto again; } @@ -303,7 +300,6 @@ void alsa_write_init(struct writer *w) struct alsa_write_args_info dummy; alsa_cmdline_parser_init(&dummy); - w->open = alsa_open; w->close = alsa_close; w->pre_select = alsa_write_pre_select; w->post_select = alsa_write_post_select;