[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-279-g2654eb7
Lennart Poettering
gitmailer-noreply at 0pointer.de
Tue Jun 23 10:10:58 PDT 2009
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 bcae7969db05c238bba90ee69d38061f3426376e (commit)
- Log -----------------------------------------------------------------
2654eb7 sndfile: fix build on BE archs
0b52bf4 build-sys: don't make pulseaudio binary suid on install anymore
390c275 build-sys: properly drop '-' from major/minor/micro strings
b4b1f03 build-sys: teacch git versioning script to not kill - in version strings
5651c03 build-sys: drop compat with old git versions so that tarballs for -test1 style evrsions are properly created
5b78752 intended-roles: drop quite a few unnecessary includes
ef85558 modules: pass properly initialized userdata pointers to various hooks
b6d0b0e intended-roles: properly initialize split state
d965000 rtclock: make use of constants when converting between nsec and usec
b627d68 intended-roles: fix symdef header inclusion
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 6 +++---
git-version-gen | 27 ++++++++++++++-------------
src/Makefile.am | 1 -
src/modules/module-intended-roles.c | 21 +++++----------------
src/modules/module-rescue-streams.c | 4 ++--
src/modules/module-stream-restore.c | 4 ++--
src/pulsecore/core-rtclock.c | 6 +++---
src/pulsecore/sndfile-util.c | 2 +-
8 files changed, 30 insertions(+), 41 deletions(-)
-----------------------------------------------------------------------
commit b627d68721854352c79facd30ccddeeb0b81cacf
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 23 03:35:34 2009 +0200
intended-roles: fix symdef header inclusion
diff --git a/src/modules/module-intended-roles.c b/src/modules/module-intended-roles.c
index 036600e..ce74a01 100644
--- a/src/modules/module-intended-roles.c
+++ b/src/modules/module-intended-roles.c
@@ -50,7 +50,7 @@
#include <pulsecore/pstream-util.h>
#include <pulsecore/database.h>
-#include "module-stream-restore-symdef.h"
+#include "module-intended-roles-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("Automatically set device of streams based of intended roles of devices");
commit d965000982060bc1c92555897828808ff5d928f5
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 23 03:55:32 2009 +0200
rtclock: make use of constants when converting between nsec and usec
diff --git a/src/pulsecore/core-rtclock.c b/src/pulsecore/core-rtclock.c
index a4a70be..3b3e3a6 100644
--- a/src/pulsecore/core-rtclock.c
+++ b/src/pulsecore/core-rtclock.c
@@ -65,7 +65,7 @@ struct timeval *pa_rtclock_get(struct timeval *tv) {
pa_assert(tv);
tv->tv_sec = ts.tv_sec;
- tv->tv_usec = ts.tv_nsec / 1000;
+ tv->tv_usec = ts.tv_nsec / PA_NSEC_PER_USEC;
return tv;
@@ -82,11 +82,11 @@ pa_bool_t pa_rtclock_hrtimer(void) {
#ifdef CLOCK_MONOTONIC
if (clock_getres(CLOCK_MONOTONIC, &ts) >= 0)
- return ts.tv_sec == 0 && ts.tv_nsec <= PA_HRTIMER_THRESHOLD_USEC*1000;
+ return ts.tv_sec == 0 && ts.tv_nsec <= (long) (PA_HRTIMER_THRESHOLD_USEC*PA_NSEC_PER_USEC);
#endif
pa_assert_se(clock_getres(CLOCK_REALTIME, &ts) == 0);
- return ts.tv_sec == 0 && ts.tv_nsec <= PA_HRTIMER_THRESHOLD_USEC*1000;
+ return ts.tv_sec == 0 && ts.tv_nsec <= (long) (PA_HRTIMER_THRESHOLD_USEC*PA_NSEC_PER_USEC);
#else /* HAVE_CLOCK_GETTIME */
commit b6d0b0e808b76d74c73cae947c1a2dbf8f3b7c3c
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 23 04:23:26 2009 +0200
intended-roles: properly initialize split state
diff --git a/src/modules/module-intended-roles.c b/src/modules/module-intended-roles.c
index ce74a01..38b8f48 100644
--- a/src/modules/module-intended-roles.c
+++ b/src/modules/module-intended-roles.c
@@ -84,7 +84,7 @@ struct userdata {
static pa_bool_t role_match(pa_proplist *proplist, const char *role) {
const char *ir;
char *r;
- const char *state;
+ const char *state = NULL;
if (!(ir = pa_proplist_gets(proplist, PA_PROP_DEVICE_INTENDED_ROLES)))
return FALSE;
commit ef85558abd380254086a81923fa4d35938e9921b
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 23 04:25:45 2009 +0200
modules: pass properly initialized userdata pointers to various hooks
diff --git a/src/modules/module-intended-roles.c b/src/modules/module-intended-roles.c
index 38b8f48..eca67c8 100644
--- a/src/modules/module-intended-roles.c
+++ b/src/modules/module-intended-roles.c
@@ -396,8 +396,8 @@ int pa__init(pa_module*m) {
if (on_rescue) {
/* A little bit later than module-stream-restore, a little bit earlier than module-rescue-streams, ... */
- u->sink_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_LATE+10, (pa_hook_cb_t) sink_unlink_hook_callback, NULL);
- u->source_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE+10, (pa_hook_cb_t) source_unlink_hook_callback, NULL);
+ u->sink_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_LATE+10, (pa_hook_cb_t) sink_unlink_hook_callback, u);
+ u->source_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE+10, (pa_hook_cb_t) source_unlink_hook_callback, u);
}
pa_modargs_free(ma);
diff --git a/src/modules/module-rescue-streams.c b/src/modules/module-rescue-streams.c
index e933cc2..c23fece 100644
--- a/src/modules/module-rescue-streams.c
+++ b/src/modules/module-rescue-streams.c
@@ -148,8 +148,8 @@ int pa__init(pa_module*m) {
m->userdata = u = pa_xnew(struct userdata, 1);
/* A little bit later than module-stream-restore, module-intended-roles... */
- u->sink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_LATE+20, (pa_hook_cb_t) sink_hook_callback, NULL);
- u->source_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE+20, (pa_hook_cb_t) source_hook_callback, NULL);
+ u->sink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_LATE+20, (pa_hook_cb_t) sink_hook_callback, u);
+ u->source_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE+20, (pa_hook_cb_t) source_hook_callback, u);
pa_modargs_free(ma);
return 0;
diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
index 7ae93c7..e60cc73 100644
--- a/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@ -983,8 +983,8 @@ int pa__init(pa_module*m) {
if (restore_device && on_rescue) {
/* A little bit earlier than module-intended-roles, module-rescue-streams, ... */
- u->sink_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) sink_unlink_hook_callback, NULL);
- u->source_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) source_unlink_hook_callback, NULL);
+ u->sink_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) sink_unlink_hook_callback, u);
+ u->source_unlink_hook_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) source_unlink_hook_callback, u);
}
if (restore_volume || restore_muted)
commit 5b78752a04053249f7543af772571815b5034ab5
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 23 16:09:32 2009 +0200
intended-roles: drop quite a few unnecessary includes
diff --git a/src/modules/module-intended-roles.c b/src/modules/module-intended-roles.c
index eca67c8..c697209 100644
--- a/src/modules/module-intended-roles.c
+++ b/src/modules/module-intended-roles.c
@@ -23,14 +23,6 @@
#include <config.h>
#endif
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-
#include <pulse/xmalloc.h>
#include <pulse/volume.h>
#include <pulse/timeval.h>
@@ -45,10 +37,6 @@
#include <pulsecore/sink-input.h>
#include <pulsecore/source-output.h>
#include <pulsecore/namereg.h>
-#include <pulsecore/protocol-native.h>
-#include <pulsecore/pstream.h>
-#include <pulsecore/pstream-util.h>
-#include <pulsecore/database.h>
#include "module-intended-roles-symdef.h"
@@ -69,6 +57,7 @@ static const char* const valid_modargs[] = {
struct userdata {
pa_core *core;
pa_module *module;
+
pa_hook_slot
*sink_input_new_hook_slot,
*source_output_new_hook_slot,
commit 5651c039207696aef8d6898846aa0efc9d582e78
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 23 16:27:38 2009 +0200
build-sys: drop compat with old git versions so that tarballs for -test1 style evrsions are properly created
diff --git a/git-version-gen b/git-version-gen
index 710870c..bb99c3a 100755
--- a/git-version-gen
+++ b/git-version-gen
@@ -106,18 +106,18 @@ then
# tag or the previous older version that did not?
# Newer: v6.10-77-g0f8faeb
# Older: v6.10-g0f8faeb
- case $v in
- *-*-*) : git describe is okay three part flavor ;;
- *-*)
- : git describe is older two part flavor
- # Recreate the number of commits and rewrite such that the
- # result is the same as if we were using the newer version
- # of git describe.
- vtag=`echo "$v" | sed 's/-.*//'`
- numcommits=`git rev-list "$vtag"..HEAD | wc -l`
- v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
- ;;
- esac
+# case $v in
+# *-*-*) : git describe is okay three part flavor ;;
+# *-*)
+# : git describe is older two part flavor
+# # Recreate the number of commits and rewrite such that the
+# # result is the same as if we were using the newer version
+# # of git describe.
+# vtag=`echo "$v" | sed 's/-.*//'`
+# numcommits=`git rev-list "$vtag"..HEAD | wc -l`
+# v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
+# ;;
+# esac
# Change the first '-' to a '.', so version-comparing tools work properly.
# Remove the "g" in git describe's output string, to save a byte.
commit b4b1f0375ca96c0813de5fc3c68feb052d4c2895
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 23 17:13:29 2009 +0200
build-sys: teacch git versioning script to not kill - in version strings
diff --git a/git-version-gen b/git-version-gen
index bb99c3a..ae3988e 100755
--- a/git-version-gen
+++ b/git-version-gen
@@ -121,7 +121,8 @@ then
# Change the first '-' to a '.', so version-comparing tools work properly.
# Remove the "g" in git describe's output string, to save a byte.
- v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+# v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+ :
else
v=UNKNOWN
fi
commit 390c275173e8256af979abec904115bcc48aa4a9
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 23 17:40:33 2009 +0200
build-sys: properly drop '-' from major/minor/micro strings
diff --git a/configure.ac b/configure.ac
index 107a557..d2d8015 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,9 +29,9 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
-m4_define(pa_major, `echo $VERSION | cut -d. -f 1`)
-m4_define(pa_minor, `echo $VERSION | cut -d. -f 2`)
-m4_define(pa_micro, `echo $VERSION | cut -d. -f 3`)
+m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`)
+m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)
+m4_define(pa_micro, `echo $VERSION | cut -d. -f3 | cut -d- -f1`)
AC_SUBST(PA_MAJOR, pa_major)
AC_SUBST(PA_MINOR, pa_minor)
commit 0b52bf4cd11e4191ea359fd8eebaf8d0b446acb8
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 23 18:33:36 2009 +0200
build-sys: don't make pulseaudio binary suid on install anymore
diff --git a/src/Makefile.am b/src/Makefile.am
index c580ece..ae90ae8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1696,7 +1696,6 @@ daemon.conf: daemon/daemon.conf.in Makefile
install-exec-hook:
chown root $(DESTDIR)$(bindir)/pulseaudio ; true
- chmod u+s $(DESTDIR)$(bindir)/pulseaudio
-chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper
ln -sf pacat $(DESTDIR)$(bindir)/parec
ln -sf pacat $(DESTDIR)$(bindir)/pamon
commit 2654eb7781ddcfe53064745bbad77bffe5c8eada
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 23 18:54:17 2009 +0200
sndfile: fix build on BE archs
diff --git a/src/pulsecore/sndfile-util.c b/src/pulsecore/sndfile-util.c
index 032aefc..4f7f8bd 100644
--- a/src/pulsecore/sndfile-util.c
+++ b/src/pulsecore/sndfile-util.c
@@ -113,7 +113,7 @@ int pa_sndfile_write_sample_spec(SF_INFO *sfi, pa_sample_spec *ss) {
break;
case PA_SAMPLE_S32LE:
- case PA_SAMPLE_S32RE:
+ case PA_SAMPLE_S32BE:
ss->format = PA_SAMPLE_S32NE;
sfi->format |= SF_FORMAT_PCM_32;
break;
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list