From bfcde99a8f7fe31be504e1d55c4a065c760bb533 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 14 Jun 2004 22:47:29 +0000
Subject: rename some more

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@14 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/module-pipe-sink.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/sink-pipe.c        | 156 -------------------------------------------------
 2 files changed, 156 insertions(+), 156 deletions(-)
 create mode 100644 src/module-pipe-sink.c
 delete mode 100644 src/sink-pipe.c

diff --git a/src/module-pipe-sink.c b/src/module-pipe-sink.c
new file mode 100644
index 00000000..e63a7a86
--- /dev/null
+++ b/src/module-pipe-sink.c
@@ -0,0 +1,156 @@
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <limits.h>
+
+#include "iochannel.h"
+#include "sink.h"
+#include "module.h"
+
+struct userdata {
+    char *filename;
+    
+    struct sink *sink;
+    struct iochannel *io;
+    struct core *core;
+    struct mainloop_source *mainloop_source;
+
+    struct memchunk memchunk;
+};
+
+static void do_write(struct userdata *u) {
+    ssize_t r;
+    assert(u);
+
+    mainloop_source_enable(u->mainloop_source, 0);
+        
+    if (!iochannel_is_writable(u->io))
+        return;
+
+    if (!u->memchunk.length)
+        if (sink_render(u->sink, PIPE_BUF, &u->memchunk) < 0)
+            return;
+
+    assert(u->memchunk.memblock && u->memchunk.length);
+    
+    if ((r = iochannel_write(u->io, u->memchunk.memblock->data + u->memchunk.index, u->memchunk.length)) < 0) {
+        fprintf(stderr, "write() failed: %s\n", strerror(errno));
+        return;
+    }
+
+    u->memchunk.index += r;
+    u->memchunk.length -= r;
+        
+    if (u->memchunk.length <= 0) {
+        memblock_unref(u->memchunk.memblock);
+        u->memchunk.memblock = NULL;
+    }
+}
+
+static void notify_callback(struct sink*s, void *userdata) {
+    struct userdata *u = userdata;
+    assert(u);
+
+    if (iochannel_is_writable(u->io))
+        mainloop_source_enable(u->mainloop_source, 1);
+}
+
+static void prepare_callback(struct mainloop_source *src, void *userdata) {
+    struct userdata *u = userdata;
+    assert(u);
+    do_write(u);
+}
+
+static void io_callback(struct iochannel *io, void*userdata) {
+    struct userdata *u = userdata;
+    assert(u);
+    do_write(u);
+}
+
+int module_init(struct core *c, struct module*m) {
+    struct userdata *u = NULL;
+    struct stat st;
+    char *p;
+    int fd = -1;
+    const static struct sample_spec ss = {
+        .format = SAMPLE_S16NE,
+        .rate = 44100,
+        .channels = 2,
+    };
+    assert(c && m);
+
+    mkfifo((p = m->argument ? m->argument : "/tmp/musicfifo"), 0777);
+
+    if ((fd = open(p, O_RDWR)) < 0) {
+        fprintf(stderr, "open('%s'): %s\n", p, strerror(errno));
+        goto fail;
+    }
+
+    if (fstat(fd, &st) < 0) {
+        fprintf(stderr, "fstat('%s'): %s\n", p, strerror(errno));
+        goto fail;
+    }
+
+    if (!S_ISFIFO(st.st_mode)) {
+        fprintf(stderr, "'%s' is not a FIFO\n", p);
+        goto fail;
+    }
+
+    
+    u = malloc(sizeof(struct userdata));
+    assert(u);
+
+    u->filename = strdup(p);
+    assert(u->filename);
+    u->core = c;
+    u->sink = sink_new(c, "fifo", &ss);
+    assert(u->sink);
+    sink_set_notify_callback(u->sink, notify_callback, u);
+
+    u->io = iochannel_new(c->mainloop, -1, fd);
+    assert(u->io);
+    iochannel_set_callback(u->io, io_callback, u);
+
+    u->memchunk.memblock = NULL;
+    u->memchunk.length = 0;
+
+    u->mainloop_source = mainloop_source_new_fixed(c->mainloop, prepare_callback, u);
+    assert(u->mainloop_source);
+    mainloop_source_enable(u->mainloop_source, 0);
+    
+    m->userdata = u;
+
+    return 0;
+
+fail:
+    if (fd >= 0)
+        close(fd);
+
+    return -1;
+}
+
+void module_done(struct core *c, struct module*m) {
+    struct userdata *u;
+    assert(c && m);
+
+    u = m->userdata;
+    assert(u);
+    
+    if (u->memchunk.memblock)
+        memblock_unref(u->memchunk.memblock);
+        
+    sink_free(u->sink);
+    iochannel_free(u->io);
+    mainloop_source_free(u->mainloop_source);
+
+    assert(u->filename);
+    unlink(u->filename);
+    free(u->filename);
+    
+    free(u);
+}
diff --git a/src/sink-pipe.c b/src/sink-pipe.c
deleted file mode 100644
index e63a7a86..00000000
--- a/src/sink-pipe.c
+++ /dev/null
@@ -1,156 +0,0 @@
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <limits.h>
-
-#include "iochannel.h"
-#include "sink.h"
-#include "module.h"
-
-struct userdata {
-    char *filename;
-    
-    struct sink *sink;
-    struct iochannel *io;
-    struct core *core;
-    struct mainloop_source *mainloop_source;
-
-    struct memchunk memchunk;
-};
-
-static void do_write(struct userdata *u) {
-    ssize_t r;
-    assert(u);
-
-    mainloop_source_enable(u->mainloop_source, 0);
-        
-    if (!iochannel_is_writable(u->io))
-        return;
-
-    if (!u->memchunk.length)
-        if (sink_render(u->sink, PIPE_BUF, &u->memchunk) < 0)
-            return;
-
-    assert(u->memchunk.memblock && u->memchunk.length);
-    
-    if ((r = iochannel_write(u->io, u->memchunk.memblock->data + u->memchunk.index, u->memchunk.length)) < 0) {
-        fprintf(stderr, "write() failed: %s\n", strerror(errno));
-        return;
-    }
-
-    u->memchunk.index += r;
-    u->memchunk.length -= r;
-        
-    if (u->memchunk.length <= 0) {
-        memblock_unref(u->memchunk.memblock);
-        u->memchunk.memblock = NULL;
-    }
-}
-
-static void notify_callback(struct sink*s, void *userdata) {
-    struct userdata *u = userdata;
-    assert(u);
-
-    if (iochannel_is_writable(u->io))
-        mainloop_source_enable(u->mainloop_source, 1);
-}
-
-static void prepare_callback(struct mainloop_source *src, void *userdata) {
-    struct userdata *u = userdata;
-    assert(u);
-    do_write(u);
-}
-
-static void io_callback(struct iochannel *io, void*userdata) {
-    struct userdata *u = userdata;
-    assert(u);
-    do_write(u);
-}
-
-int module_init(struct core *c, struct module*m) {
-    struct userdata *u = NULL;
-    struct stat st;
-    char *p;
-    int fd = -1;
-    const static struct sample_spec ss = {
-        .format = SAMPLE_S16NE,
-        .rate = 44100,
-        .channels = 2,
-    };
-    assert(c && m);
-
-    mkfifo((p = m->argument ? m->argument : "/tmp/musicfifo"), 0777);
-
-    if ((fd = open(p, O_RDWR)) < 0) {
-        fprintf(stderr, "open('%s'): %s\n", p, strerror(errno));
-        goto fail;
-    }
-
-    if (fstat(fd, &st) < 0) {
-        fprintf(stderr, "fstat('%s'): %s\n", p, strerror(errno));
-        goto fail;
-    }
-
-    if (!S_ISFIFO(st.st_mode)) {
-        fprintf(stderr, "'%s' is not a FIFO\n", p);
-        goto fail;
-    }
-
-    
-    u = malloc(sizeof(struct userdata));
-    assert(u);
-
-    u->filename = strdup(p);
-    assert(u->filename);
-    u->core = c;
-    u->sink = sink_new(c, "fifo", &ss);
-    assert(u->sink);
-    sink_set_notify_callback(u->sink, notify_callback, u);
-
-    u->io = iochannel_new(c->mainloop, -1, fd);
-    assert(u->io);
-    iochannel_set_callback(u->io, io_callback, u);
-
-    u->memchunk.memblock = NULL;
-    u->memchunk.length = 0;
-
-    u->mainloop_source = mainloop_source_new_fixed(c->mainloop, prepare_callback, u);
-    assert(u->mainloop_source);
-    mainloop_source_enable(u->mainloop_source, 0);
-    
-    m->userdata = u;
-
-    return 0;
-
-fail:
-    if (fd >= 0)
-        close(fd);
-
-    return -1;
-}
-
-void module_done(struct core *c, struct module*m) {
-    struct userdata *u;
-    assert(c && m);
-
-    u = m->userdata;
-    assert(u);
-    
-    if (u->memchunk.memblock)
-        memblock_unref(u->memchunk.memblock);
-        
-    sink_free(u->sink);
-    iochannel_free(u->io);
-    mainloop_source_free(u->mainloop_source);
-
-    assert(u->filename);
-    unlink(u->filename);
-    free(u->filename);
-    
-    free(u);
-}
-- 
cgit