Fix the alsa writer

The previous patch broke compilation of alsa_write.c badly.
Fix is rather large but obvious.

diff --git a/alsa_write.c b/alsa_write.c
index c104a5d5352ce35287e6ec8f167d24951890e166..4510b975c6fe8d8a832995e84095bc45aaea8794 100644 (file)
--- 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 a83d39eb93124c696defd3eb33639903098fa999..58152dbc228151387dc86ec113bb72fe2b352b17 100644 (file)
--- 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 e1af56a2688fb559d0bc76bdcf29adfadc7657db..0f83398e7aae6333446ee45555a0fd91879e152f 100644 (file)
--- 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);