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

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Wed May 14 04:44:38 2008
New Revision: 2421

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2421&root=pulseaudio&view=rev
Log:
modernizations

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

Modified: branches/glitch-free/src/modules/module-jack-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/glitch-free/src/modules/module-jack-sink.c?rev=2421&root=pulseaudio&r1=2420&r2=2421&view=diff
==============================================================================
--- branches/glitch-free/src/modules/module-jack-sink.c (original)
+++ branches/glitch-free/src/modules/module-jack-sink.c Wed May 14 04:44:38 2008
@@ -53,7 +53,7 @@
 
 /* General overview:
  *
- * Because JACK has a very unflexible event loop management, which
+ * Because JACK has a very unflexible event loop management which
  * doesn't allow us to add our own event sources to the event thread
  * we cannot use the JACK real-time thread for dispatching our PA
  * work. Instead, we run an additional RT thread which does most of
@@ -276,7 +276,6 @@
     pa_bool_t do_connect = TRUE;
     unsigned i;
     const char **ports = NULL, **p;
-    char *t;
     pa_sink_new_data data;
 
     pa_assert(m);
@@ -364,8 +363,7 @@
     pa_proplist_sets(data.proplist, PA_PROP_DEVICE_API, "jack");
     if (server_name)
         pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, server_name);
-    pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, t = pa_sprintf_malloc("Jack sink (%s)", jack_get_client_name(u->client)));
-    pa_xfree(t);
+    pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Jack sink (%s)", jack_get_client_name(u->client));
     pa_proplist_sets(data.proplist, "jack.client_name", jack_get_client_name(u->client));
 
     u->sink = pa_sink_new(m->core, &data, PA_SINK_LATENCY);

Modified: branches/glitch-free/src/modules/module-jack-source.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/glitch-free/src/modules/module-jack-source.c?rev=2421&root=pulseaudio&r1=2420&r2=2421&view=diff
==============================================================================
--- branches/glitch-free/src/modules/module-jack-source.c (original)
+++ branches/glitch-free/src/modules/module-jack-source.c Wed May 14 04:44:38 2008
@@ -253,7 +253,6 @@
     pa_bool_t do_connect = TRUE;
     unsigned i;
     const char **ports = NULL, **p;
-    char *t;
     pa_source_new_data data;
 
     pa_assert(m);
@@ -335,8 +334,7 @@
     pa_proplist_sets(data.proplist, PA_PROP_DEVICE_API, "jack");
     if (server_name)
         pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, server_name);
-    pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, t = pa_sprintf_malloc("Jack source (%s)", jack_get_client_name(u->client)));
-    pa_xfree(t);
+    pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Jack source (%s)", jack_get_client_name(u->client));
     pa_proplist_sets(data.proplist, "jack.client_name", jack_get_client_name(u->client));
 
     u->source = pa_source_new(m->core, &data, PA_SOURCE_LATENCY);

Modified: branches/glitch-free/src/modules/module-null-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/glitch-free/src/modules/module-null-sink.c?rev=2421&root=pulseaudio&r1=2420&r2=2421&view=diff
==============================================================================
--- branches/glitch-free/src/modules/module-null-sink.c (original)
+++ branches/glitch-free/src/modules/module-null-sink.c Wed May 14 04:44:38 2008
@@ -219,7 +219,7 @@
             pa_rtpoll_set_timer_disabled(u->rtpoll);
 
         /* Hmm, nothing to do. Let's sleep */
-        if ((ret = pa_rtpoll_run(u->rtpoll, 1)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
             goto fail;
 
         if (ret == 0)

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=2421&root=pulseaudio&r1=2420&r2=2421&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:44:38 2008
@@ -153,7 +153,7 @@
         /* Hmm, nothing to do. Let's sleep */
         pollfd->events = u->source->thread_info.state == PA_SOURCE_RUNNING ? POLLIN : 0;
 
-        if ((ret = pa_rtpoll_run(u->rtpoll, 1)) < 0)
+        if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
             goto fail;
 
         if (ret == 0)