From 6f05bb12b7d9d2cfbd419e2709bafde27da1b21b Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 20 Aug 2006 19:01:11 +0200 Subject: [PATCH 1/1] Fix the alsa writer The previous patch broke compilation of alsa_write.c badly. Fix is rather large but obvious. --- alsa_write.c | 2 +- configure.ac | 4 ++-- error.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alsa_write.c b/alsa_write.c index c104a5d5..4510b975 100644 --- a/alsa_write.c +++ b/alsa_write.c @@ -170,7 +170,7 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn) static int alsa_write_post_select(__a_unused struct sched *s, struct writer_node *wn) { - struct private_alsa__write_data *pad = wn->private_data; + struct private_alsa_write_data *pad = wn->private_data; struct writer_node_group *wng = wn->wng; size_t frames = (*wng->loaded - wn->written) / pad->bytes_per_frame; snd_pcm_sframes_t ret; diff --git a/configure.ac b/configure.ac index a83d39eb..58152dbc 100644 --- a/configure.ac +++ b/configure.ac @@ -327,11 +327,11 @@ AC_CHECK_LIB([asound], [snd_pcm_open], [], [ have_alsa="no" ]) if test "$have_alsa" = "yes"; then - audiod_errlist_objs="$audiod_errlist_objs alsa_writer" + audiod_errlist_objs="$audiod_errlist_objs alsa_write" audiod_cmdline_objs="$audiod_cmdline_objs alsa_write.cmdline" audiod_ldflags="$audiod_ldflags -lasound" - write_errlist_objs="$write_errlist_objs alsa_writer" + write_errlist_objs="$write_errlist_objs alsa_write" write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline" write_ldflags="$write_ldflags -lasound" write_writers="$write_writers alsa" diff --git a/error.h b/error.h index e1af56a2..0f83398e 100644 --- a/error.h +++ b/error.h @@ -71,7 +71,7 @@ enum para_subsystem { SS_FD, SS_WRITE, SS_WRITE_COMMON, - SS_ALSA_WRITER, + SS_ALSA_WRITE, SS_FILE_WRITE, SS_OSX_WRITE, NUM_SS @@ -408,7 +408,7 @@ extern const char **para_errlist[]; PARA_ERROR(DELAY_TIMEOUT, "initial delay timeout"), \ -#define ALSA_WRITER_ERRORS \ +#define ALSA_WRITE_ERRORS \ PARA_ERROR(BROKEN_CONF, "Broken alsa configuration"), \ PARA_ERROR(ACCESS_TYPE, "alsa access type not available"), \ PARA_ERROR(SAMPLE_FORMAT, "sample format not available"), \ @@ -564,7 +564,7 @@ SS_ENUM(DCCP_SEND); SS_ENUM(FD); SS_ENUM(WRITE); SS_ENUM(WRITE_COMMON); -SS_ENUM(ALSA_WRITER); +SS_ENUM(ALSA_WRITE); SS_ENUM(FILE_WRITE); SS_ENUM(OSX_WRITE); SS_ENUM(RINGBUFFER); -- 2.39.2