add new tool paplay

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@241 fefdeb5f-60dc-0310-8127-8f9354f1896f

5 files changed, 395 insertions, 9 deletions

diff --git a/polyp/Makefile.am b/polyp/Makefile.am
index 4e075468..2d14b420 100644
--- a/polyp/Makefile.am
+++ b/polyp/Makefile.am
@@ -33,7 +33,7 @@ AM_LDADD=$(PTHREAD_LIBS) -lm
 AM_LIBADD=$(PTHREAD_LIBS) -lm
 
 EXTRA_DIST = default.pa.in daemon.conf.in client.conf.in depmod.py esdcompat.sh.in
-bin_PROGRAMS = polypaudio pacat pactl
+bin_PROGRAMS = polypaudio pacat pactl paplay
 bin_SCRIPTS = esdcompat.sh
 noinst_PROGRAMS = \
 		mainloop-test \
@@ -372,9 +372,13 @@ pacat_SOURCES = pacat.c
 pacat_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
 pacat_CFLAGS = $(AM_CFLAGS) 
 
+paplay_SOURCES = paplay.c
+paplay_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
+paplay_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
+
 pactl_SOURCES = pactl.c
 pactl_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
-pactl_CFLAGS = $(AM_CFLAGS) $(LIBSDNFILE_CFLAGS)
+pactl_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
 
 pacat_simple_SOURCES = pacat-simple.c
 pacat_simple_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la libpolyp-simple-@PA_MAJORMINOR@.la libpolyp-error-@PA_MAJORMINOR@.la libpolyp-mainloop-@PA_MAJORMINOR@.la
@@ -460,7 +464,7 @@ lib_LTLIBRARIES+= \
 
 noinst_PROGRAMS+= \
 		mainloop-test-glib12
-		
+
 libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_SOURCES = glib-mainloop.h glib12-mainloop.c
 libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
 libpolyp_mainloop_glib12_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop-@PA_MAJORMINOR@.la $(GLIB12_LIBS)
diff --git a/polyp/module-combine.c b/polyp/module-combine.c
index 6952ce6c..1a909087 100644
--- a/polyp/module-combine.c
+++ b/polyp/module-combine.c
@@ -115,8 +115,8 @@ static void adjust_rates(struct userdata *u) {
     base_rate = u->sink->sample_spec.rate;
 
     for (o = u->outputs; o; o = o->next) {
-        uint32_t r = base_rate;
-
+        uint32_t r = base_rate; 
+        
         if (o->total_latency < target_latency)
             r -= (uint32_t) (((((double) target_latency - o->total_latency))/u->adjust_time)*r/ 1000000);
         else if (o->total_latency > target_latency)
diff --git a/polyp/paplay.c b/polyp/paplay.c
new file mode 100644
index 00000000..cc973a7d
--- /dev/null
+++ b/polyp/paplay.c
@@ -0,0 +1,377 @@
+/* $Id$ */
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 2 of the License,
+  or (at your option) any later version.
+ 
+  polypaudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <signal.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+
+#include <sndfile.h>
+
+#include <polyp/polyplib.h>
+#include <polyp/polyplib-error.h>
+#include <polyp/mainloop.h>
+#include <polyp/mainloop-signal.h>
+#include <polyp/polyplib-version.h>
+
+#if PA_API_VERSION != PA_API_VERSION_0_6
+#error Invalid Polypaudio API version
+#endif
+
+static struct pa_context *context = NULL;
+static struct pa_stream *stream = NULL;
+static struct pa_mainloop_api *mainloop_api = NULL;
+
+static char *stream_name = NULL, *client_name = NULL, *device = NULL;
+
+static int verbose = 0;
+static pa_volume_t volume = PA_VOLUME_NORM;
+
+static SNDFILE* sndfile = NULL;
+
+static struct pa_sample_spec sample_spec = { 0, 0, 0 }; 
+
+static sf_count_t (*readf_function)(SNDFILE *sndfile, void *ptr, sf_count_t frames);
+
+/* A shortcut for terminating the application */
+static void quit(int ret) {
+    assert(mainloop_api);
+    mainloop_api->quit(mainloop_api, ret);
+}
+
+/* Connection draining complete */
+static void context_drain_complete(struct pa_context*c, void *userdata) {
+    pa_context_disconnect(c);
+}
+
+/* Stream draining complete */
+static void stream_drain_complete(struct pa_stream*s, int success, void *userdata) {
+    struct pa_operation *o;
+
+    if (!success) {
+        fprintf(stderr, "Failed to drain stream: %s\n", pa_strerror(pa_context_errno(context)));
+        quit(1);
+    }
+    
+    if (verbose)    
+        fprintf(stderr, "Playback stream drained.\n");
+
+    pa_stream_disconnect(stream);
+    pa_stream_unref(stream);
+    stream = NULL;
+    
+    if (!(o = pa_context_drain(context, context_drain_complete, NULL)))
+        pa_context_disconnect(context);
+    else {
+        pa_operation_unref(o);
+
+        if (verbose)
+            fprintf(stderr, "Draining connection to server.\n");
+    }
+}
+
+/* This is called whenever new data may be written to the stream */
+static void stream_write_callback(struct pa_stream *s, size_t length, void *userdata) {
+    size_t k;
+    sf_count_t f, n;
+    void *data;
+    assert(s && length);
+
+    if (!sndfile)
+        return;
+    
+    k = pa_frame_size(&sample_spec);
+
+    data = malloc(length);
+
+    n = length/k;
+    
+    f = readf_function(sndfile, data, n);
+
+    if (f > 0)
+        pa_stream_write(s, data, f*k, free, 0);
+
+    if (f < n) {
+        sf_close(sndfile);
+        sndfile = NULL;
+        pa_operation_unref(pa_stream_drain(s, stream_drain_complete, NULL));
+    }
+}
+
+/* This routine is called whenever the stream state changes */
+static void stream_state_callback(struct pa_stream *s, void *userdata) {
+    assert(s);
+
+    switch (pa_stream_get_state(s)) {
+        case PA_STREAM_CREATING:
+        case PA_STREAM_TERMINATED:
+            break;
+
+        case PA_STREAM_READY:
+            if (verbose)
+                fprintf(stderr, "Stream successfully created\n");
+            break;
+            
+        case PA_STREAM_FAILED:
+        default:
+            fprintf(stderr, "Stream errror: %s\n", pa_strerror(pa_context_errno(pa_stream_get_context(s))));
+            quit(1);
+    }
+}
+
+/* This is called whenever the context status changes */
+static void context_state_callback(struct pa_context *c, void *userdata) {
+    assert(c);
+
+    switch (pa_context_get_state(c)) {
+        case PA_CONTEXT_CONNECTING:
+        case PA_CONTEXT_AUTHORIZING:
+        case PA_CONTEXT_SETTING_NAME:
+            break;
+        
+        case PA_CONTEXT_READY:
+            
+            assert(c && !stream);
+
+            if (verbose)
+                fprintf(stderr, "Connection established.\n");
+
+            stream = pa_stream_new(c, stream_name, &sample_spec);
+            assert(stream);
+
+            pa_stream_set_state_callback(stream, stream_state_callback, NULL);
+            pa_stream_set_write_callback(stream, stream_write_callback, NULL);
+            pa_stream_connect_playback(stream, device, NULL, 0, volume);
+                
+            break;
+            
+        case PA_CONTEXT_TERMINATED:
+            quit(0);
+            break;
+
+        case PA_CONTEXT_FAILED:
+        default:
+            fprintf(stderr, "Connection failure: %s\n", pa_strerror(pa_context_errno(c)));
+            quit(1);
+    }
+}
+
+/* UNIX signal to quit recieved */
+static void exit_signal_callback(struct pa_mainloop_api*m, struct pa_signal_event *e, int sig, void *userdata) {
+    if (verbose)
+        fprintf(stderr, "Got SIGINT, exiting.\n");
+    quit(0);
+    
+}
+
+static void help(const char *argv0) {
+
+    printf("%s [options] FILE\n\n"
+           "  -h, --help                            Show this help\n"
+           "      --version                         Show version\n\n"
+           "  -v, --verbose                         Enable verbose operations\n\n"
+           "  -s, --server=SERVER                   The name of the server to connect to\n"
+           "  -d, --device=DEVICE                   The name of the sink/source to connect to\n"
+           "  -n, --client-name=NAME                How to call this client on the server\n"
+           "      --stream-name=NAME                How to call this stream on the server\n"
+           "      --volume=VOLUME                   Specify the initial (linear) volume in range 0...256\n",
+           argv0);
+}
+
+enum {
+    ARG_VERSION = 256,
+    ARG_STREAM_NAME,
+    ARG_VOLUME
+};
+
+int main(int argc, char *argv[]) {
+    struct pa_mainloop* m = NULL;
+    int ret = 1, r, c;
+    char *bn, *server = NULL;
+    SF_INFO sfinfo;
+
+    static const struct option long_options[] = {
+        {"device",      1, NULL, 'd'},
+        {"server",      1, NULL, 's'},
+        {"client-name", 1, NULL, 'n'},
+        {"stream-name", 1, NULL, ARG_STREAM_NAME},
+        {"version",     0, NULL, ARG_VERSION},
+        {"help",        0, NULL, 'h'},
+        {"verbose",     0, NULL, 'v'},
+        {"volume",      1, NULL, ARG_VOLUME},
+        {NULL,          0, NULL, 0}
+    };
+
+    if (!(bn = strrchr(argv[0], '/')))
+        bn = argv[0];
+    else
+        bn++;
+
+    while ((c = getopt_long(argc, argv, "d:s:n:hv", long_options, NULL)) != -1) {
+
+        switch (c) {
+            case 'h' :
+                help(bn);
+                ret = 0;
+                goto quit;
+                
+            case ARG_VERSION:
+                printf("paplay "PACKAGE_VERSION"\nCompiled with libpolyp %s\nLinked with libpolyp %s\n", pa_get_headers_version(), pa_get_library_version());
+                ret = 0;
+                goto quit;
+
+            case 'd':
+                free(device);
+                device = strdup(optarg);
+                break;
+
+            case 's':
+                free(server);
+                server = strdup(optarg);
+                break;
+
+            case 'n':
+                free(client_name);
+                client_name = strdup(optarg);
+                break;
+
+            case ARG_STREAM_NAME:
+                free(stream_name);
+                stream_name = strdup(optarg);
+                break;
+
+            case 'v':
+                verbose = 1;
+                break;
+
+            case ARG_VOLUME: {
+                int v = atoi(optarg);
+                volume = v < 0 ? 0 : v;
+                break;
+            }
+
+            default:
+                goto quit;
+        }
+    }
+
+    if (optind >= argc) {
+        fprintf(stderr, "Missing file name.\n");
+        goto quit;
+    }
+
+    if (!client_name)
+        client_name = strdup(bn);
+
+    if (!stream_name)
+        stream_name = strdup(argv[optind]);
+
+    memset(&sfinfo, 0, sizeof(sfinfo));
+    
+    if (!(sndfile = sf_open(argv[optind], SFM_READ, &sfinfo))) {
+        fprintf(stderr, "Faile to open file '%s'\n", argv[optind]);
+        goto quit;
+    }
+
+    sample_spec.rate = sfinfo.samplerate;
+    sample_spec.channels = sfinfo.channels;
+    
+    switch (sfinfo.format & 0xFF) {
+        case SF_FORMAT_PCM_16:
+        case SF_FORMAT_PCM_U8:
+        case SF_FORMAT_ULAW:
+        case SF_FORMAT_ALAW:
+            sample_spec.format = PA_SAMPLE_S16NE;
+            readf_function = (sf_count_t (*)(SNDFILE *sndfile, void *ptr, sf_count_t frames)) sf_readf_short;
+            break;
+        case SF_FORMAT_FLOAT:
+        default:
+            sample_spec.format = PA_SAMPLE_FLOAT32NE;
+            readf_function = (sf_count_t (*)(SNDFILE *sndfile, void *ptr, sf_count_t frames)) sf_readf_float;
+            break;
+    }
+
+    if (verbose) {
+        char t[PA_SAMPLE_SPEC_SNPRINT_MAX];
+        pa_sample_spec_snprint(t, sizeof(t), &sample_spec);
+        fprintf(stderr, "Using sample spec '%s'\n", t);
+    }
+    
+    /* Set up a new main loop */
+    if (!(m = pa_mainloop_new())) {
+        fprintf(stderr, "pa_mainloop_new() failed.\n");
+        goto quit;
+    }
+
+    mainloop_api = pa_mainloop_get_api(m);
+
+    r = pa_signal_init(mainloop_api);
+    assert(r == 0);
+    pa_signal_new(SIGINT, exit_signal_callback, NULL);
+    signal(SIGPIPE, SIG_IGN);
+    
+    /* Create a new connection context */
+    if (!(context = pa_context_new(mainloop_api, client_name))) {
+        fprintf(stderr, "pa_context_new() failed.\n");
+        goto quit;
+    }
+
+    pa_context_set_state_callback(context, context_state_callback, NULL);
+
+    /* Connect the context */
+    pa_context_connect(context, server, 1, NULL);
+
+    /* Run the main loop */
+    if (pa_mainloop_run(m, &ret) < 0) {
+        fprintf(stderr, "pa_mainloop_run() failed.\n");
+        goto quit;
+    }
+    
+quit:
+    if (stream)
+        pa_stream_unref(stream);
+
+    if (context)
+        pa_context_unref(context);
+
+    if (m) {
+        pa_signal_done();
+        pa_mainloop_free(m);
+    }
+
+    free(server);
+    free(device);
+    free(client_name);
+    free(stream_name);
+
+    if (sndfile)
+        sf_close(sndfile);
+    
+    return ret;
+}
diff --git a/polyp/polyplib-context.h b/polyp/polyplib-context.h
index 548a39dd..75be5930 100644
--- a/polyp/polyplib-context.h
+++ b/polyp/polyplib-context.h
@@ -45,6 +45,9 @@
 /** \example pacat.c
  * A playback and recording tool using the asynchronous API */
 
+/** \example paplay.c
+ * A sound file playback tool using the asynchronous API, based on libsndfile */
+
 PA_C_DECL_BEGIN
 
 /** \struct pa_context
diff --git a/polyp/protocol-native.c b/polyp/protocol-native.c
index f36bbd71..aeccd504 100644
--- a/polyp/protocol-native.c
+++ b/polyp/protocol-native.c
@@ -484,7 +484,7 @@ static void sink_input_drop_cb(struct pa_sink_input *i, const struct pa_memchunk
         s->drain_request = 0;
     }
 
-    /*pa_log(__FILE__": after_drop: %u\n", pa_memblockq_get_length(s->memblockq));*/
+/*     pa_log(__FILE__": after_drop: %u\n", pa_memblockq_get_length(s->memblockq)); */
 }
 
 static void sink_input_kill_cb(struct pa_sink_input *i) {
@@ -828,8 +828,10 @@ static void command_drain_playback_stream(struct pa_pdispatch *pd, uint32_t comm
     pa_memblockq_prebuf_disable(s->memblockq);
     
     if (!pa_memblockq_is_readable(s->memblockq)) {
+/*         pa_log("immediate drain: %u\n", pa_memblockq_get_length(s->memblockq)); */
         pa_pstream_send_simple_ack(c->pstream, tag);
     } else {
+/*         pa_log("slow drain triggered\n"); */
         s->drain_request = 1;
         s->drain_tag = tag;
 
@@ -1854,7 +1856,7 @@ static void pstream_memblock_callback(struct pa_pstream *p, uint32_t channel, ui
     struct connection *c = userdata;
     struct output_stream *stream;
     assert(p && chunk && userdata);
-
+    
     if (!(stream = pa_idxset_get_by_index(c->output_streams, channel))) {
         pa_log(__FILE__": client sent block for invalid stream.\n");
         connection_free(c);
@@ -1870,10 +1872,10 @@ static void pstream_memblock_callback(struct pa_pstream *p, uint32_t channel, ui
         
         pa_memblockq_push_align(p->memblockq, chunk, delta);
         assert(p->sink_input);
-        /*pa_log(__FILE__": after_recv: %u\n", pa_memblockq_get_length(p->memblockq));*/
+/*         pa_log(__FILE__": after_recv: %u\n", pa_memblockq_get_length(p->memblockq)); */
 
         pa_sink_notify(p->sink_input->sink);
-/*         pa_log(__FILE__": Recieved %u bytes.\n", chunk->length); */
+/*          pa_log(__FILE__": Recieved %u bytes.\n", chunk->length);  */
 
     } else {
         struct upload_stream *u = (struct upload_stream*) stream;