[pulseaudio-commits] r2418 - in /branches/glitch-free/src/modules: module-pipe-sink.c module-pipe-source.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Wed May 14 04:03:01 2008
New Revision: 2418

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2418&root=pulseaudio&view=rev
Log:
update pipe source for glitch-free, too

Modified:
    branches/glitch-free/src/modules/module-pipe-sink.c
    branches/glitch-free/src/modules/module-pipe-source.c

Modified: branches/glitch-free/src/modules/module-pipe-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/glitch-free/src/modules/module-pipe-sink.c?rev=2418&root=pulseaudio&r1=2417&r2=2418&view=diff
==============================================================================
--- branches/glitch-free/src/modules/module-pipe-sink.c (original)
+++ branches/glitch-free/src/modules/module-pipe-sink.c Wed May 14 04:03:01 2008
@@ -230,7 +230,6 @@
     pa_sample_spec ss;
     pa_channel_map map;
     pa_modargs *ma;
-    char *t;
     struct pollfd *pollfd;
     pa_sink_new_data data;
 

Modified: branches/glitch-free/src/modules/module-pipe-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/glitch-free/src/modules/module-pipe-source.c?rev=2418&root=pulseaudio&r1=2417&r2=2418&view=diff
==============================================================================
--- branches/glitch-free/src/modules/module-pipe-source.c (original)
+++ branches/glitch-free/src/modules/module-pipe-source.c Wed May 14 04:03:01 2008
@@ -160,6 +160,7 @@
             goto finish;
 
         pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
+
         if (pollfd->revents & ~POLLIN) {
             pa_log("FIFO shutdown.");
             goto fail;
@@ -182,7 +183,6 @@
     pa_sample_spec ss;
     pa_channel_map map;
     pa_modargs *ma;
-    char *t;
     struct pollfd *pollfd;
     pa_source_new_data data;
 
@@ -207,7 +207,7 @@
     u->rtpoll = pa_rtpoll_new();
     pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
 
-    u->filename = pa_xstrdup(pa_modargs_get_value(ma, "file", DEFAULT_FILE_NAME));
+    u->filename = pa_runtime_path(pa_modargs_get_value(ma, "file", DEFAULT_FILE_NAME));
 
     mkfifo(u->filename, 0666);
     if ((u->fd = open(u->filename, O_RDWR|O_NOCTTY)) < 0) {
@@ -233,8 +233,7 @@
     data.module = m;
     pa_source_new_data_set_name(&data, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME));
     pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, u->filename);
-    pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, t = pa_sprintf_malloc("Unix FIFO source %s", u->filename));
-    pa_xfree(t);
+    pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Unix FIFO source %s", u->filename);
     pa_source_new_data_set_sample_spec(&data, &ss);
     pa_source_new_data_set_channel_map(&data, &map);