remove all occurences of

[pulseaudio] / src / modules / module-null-sink.c

diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
index 5731a4032004feaf15a9b05a47e2a34cf5f7cf9d..50e58853a598c8fee22200edf841d6d5468ddb47 100644 (file)
--- a/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser 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
+  PulseAudio 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 Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,20 +33,28 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include <polypcore/iochannel.h>
-#include <polypcore/sink.h>
-#include <polypcore/module.h>
-#include <polypcore/util.h>
-#include <polypcore/modargs.h>
-#include <polypcore/xmalloc.h>
-#include <polypcore/log.h>
+#include <pulse/timeval.h>
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/iochannel.h>
+#include <pulsecore/sink.h>
+#include <pulsecore/module.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
 
 #include "module-null-sink-symdef.h"
 
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("Clocked NULL sink")
 PA_MODULE_VERSION(PACKAGE_VERSION)
-PA_MODULE_USAGE("format=<sample format> channels=<number of channels> rate=<sample rate> sink_name=<name of sink>")
+PA_MODULE_USAGE(
+        "format=<sample format> "
+        "channels=<number of channels> "
+        "rate=<sample rate> "
+        "sink_name=<name of sink>"
+        "channel_map=<channel map>"
+        "description=<description for the sink>")
 
 #define DEFAULT_SINK_NAME "null"
 
@@ -56,6 +64,9 @@ struct userdata {
     pa_sink *sink;
     pa_time_event *time_event;
     size_t block_size;
+
+    uint64_t n_bytes;
+    struct timeval start_time;
 };
 
 static const char* const valid_modargs[] = {
@@ -63,6 +74,8 @@ static const char* const valid_modargs[] = {
     "format",
     "channels",
     "sink_name",
+    "channel_map",
+    "description",
     NULL
 };
 
@@ -82,42 +95,60 @@ static void time_callback(pa_mainloop_api *m, pa_time_event*e, const struct time
 
     pa_timeval_add(&ntv, pa_bytes_to_usec(l, &u->sink->sample_spec));
     m->time_restart(e, &ntv);
+
+    u->n_bytes += l;
+}
+
+static pa_usec_t get_latency(pa_sink *s) {
+    struct userdata *u = s->userdata;
+    pa_usec_t a, b;
+    struct timeval now;
+
+    a = pa_timeval_diff(pa_gettimeofday(&now), &u->start_time);
+    b = pa_bytes_to_usec(u->n_bytes, &s->sample_spec);
+
+    return b > a ? b - a : 0;
 }
 
 int pa__init(pa_core *c, pa_module*m) {
     struct userdata *u = NULL;
     pa_sample_spec ss;
+    pa_channel_map map;
     pa_modargs *ma = NULL;
-    struct timeval tv;
-    assert(c && m);
+    
+    assert(c);
+    assert(m);
     
     if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
-        pa_log(__FILE__": failed to parse module arguments.\n");
+        pa_log("failed to parse module arguments.");
         goto fail;
     }
 
     ss = c->default_sample_spec;
-    if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
-        pa_log(__FILE__": invalid sample format specification.\n");
+    if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_DEFAULT) < 0) {
+        pa_log("invalid sample format specification or channel map.");
         goto fail;
     }
     
-    u = pa_xmalloc0(sizeof(struct userdata));
+    u = pa_xnew0(struct userdata, 1);
     u->core = c;
     u->module = m;
     m->userdata = u;
     
-    if (!(u->sink = pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss, NULL))) {
-        pa_log(__FILE__": failed to create sink.\n");
+    if (!(u->sink = pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss, &map))) {
+        pa_log("failed to create sink.");
         goto fail;
     }
-    
+
+    u->sink->get_latency = get_latency;
     u->sink->userdata = u;
     pa_sink_set_owner(u->sink, m);
-    u->sink->description = pa_sprintf_malloc("NULL sink");
+    pa_sink_set_description(u->sink, pa_modargs_get_value(ma, "description", "NULL sink"));
 
-    pa_gettimeofday(&tv);
-    u->time_event = c->mainloop->time_new(c->mainloop, &tv, time_callback, u);
+    u->n_bytes = 0;
+    pa_gettimeofday(&u->start_time);
+    
+    u->time_event = c->mainloop->time_new(c->mainloop, &u->start_time, time_callback, u);
 
     u->block_size = pa_bytes_per_second(&ss) / 10;