[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-135-g699bd54

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  5c10b84e0f020de8a0d9f5adc6b0affbae4343cb (commit)

- Log -----------------------------------------------------------------
699bd54 libpulse: introduce PA_CHECK_VERSION macro
e8f7eb6 oss: don't deadlock when we try to resume an OSS device that lacks a mixer
d2198c9 alsa: fix wording, we are speaking of card profiles, not output profiles
-----------------------------------------------------------------------

Summary of changes:
 src/modules/alsa/module-alsa-card.c |    2 +-
 src/modules/oss/module-oss.c        |   11 +++++++----
 src/pulse/version.h.in              |    7 +++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------

commit d2198c9ba1acb070b14747c49afaff87e85daa81
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue May 26 22:29:33 2009 +0200

    alsa: fix wording, we are speaking of card profiles, not output profiles

diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
index 51d466e..d894b9c 100644
--- a/src/modules/alsa/module-alsa-card.c
+++ b/src/modules/alsa/module-alsa-card.c
@@ -135,7 +135,7 @@ static void enumerate_cb(
             bonus += 20000;
     }
 
-    pa_log_info("Found output profile '%s'", t);
+    pa_log_info("Found profile '%s'", t);
 
     p = pa_card_profile_new(n, t, sizeof(struct profile_data));
 

commit e8f7eb616a40dbb66c201509e459e3a8bd5f3e02
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue May 26 22:30:36 2009 +0200

    oss: don't deadlock when we try to resume an OSS device that lacks a mixer

diff --git a/src/modules/oss/module-oss.c b/src/modules/oss/module-oss.c
index ab26137..d6f549c 100644
--- a/src/modules/oss/module-oss.c
+++ b/src/modules/oss/module-oss.c
@@ -477,6 +477,7 @@ static void build_pollfd(struct userdata *u) {
     pollfd->revents = 0;
 }
 
+/* Called from IO context */
 static int suspend(struct userdata *u) {
     pa_assert(u);
     pa_assert(u->fd >= 0);
@@ -526,6 +527,7 @@ static int suspend(struct userdata *u) {
     return 0;
 }
 
+/* Called from IO context */
 static int unsuspend(struct userdata *u) {
     int m;
     pa_sample_spec ss, *ss_original;
@@ -616,10 +618,10 @@ static int unsuspend(struct userdata *u) {
 
     build_pollfd(u);
 
-    if (u->sink)
-        pa_sink_get_volume(u->sink, TRUE, FALSE);
-    if (u->source)
-        pa_source_get_volume(u->source, TRUE);
+    if (u->sink && u->sink->get_volume)
+        u->sink->get_volume(u->sink);
+    if (u->source && u->source->get_volume)
+        u->source->get_volume(u->source);
 
     pa_log_info("Resumed successfully...");
 
@@ -631,6 +633,7 @@ fail:
     return -1;
 }
 
+/* Called from IO context */
 static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
     struct userdata *u = PA_SINK(o)->userdata;
     int ret;

commit 699bd542f3aa51a82bcf3e60c63412c156ea1ab6
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue May 26 22:31:05 2009 +0200

    libpulse: introduce PA_CHECK_VERSION macro

diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in
index 566dd55..3143e98 100644
--- a/src/pulse/version.h.in
+++ b/src/pulse/version.h.in
@@ -60,6 +60,13 @@ const char* pa_get_library_version(void);
 /** The micro version of PA. \since 0.9.15 */
 #define PA_MICRO @PA_MICRO@
 
+/** Evaluates to TRUE if the PulseAudio library version is equal or
+ * newer than the specified. \since 0.9.16 */
+#define PA_CHECK_VERSION(major,minor,micro)                             \
+    ((PA_MAJOR > (major)) ||                                            \
+     (PA_MAJOR == (major) && CA_MINOR > (minor)) ||                     \
+     (PA_MAJOR == (major) && CA_MINOR == (minor) && CA_MICRO >= (micro)))
+
 PA_C_DECL_END
 
 #endif

-- 
hooks/post-receive
PulseAudio Sound Server