[pulseaudio-commits] 5 commits - configure.ac Makefile.am src/modules src/pulsecore
Colin Guthrie
colin at kemper.freedesktop.org
Sun Nov 4 01:11:57 PST 2012
Makefile.am | 11 ++++++++++-
configure.ac | 5 ++++-
src/modules/module-device-restore.c | 16 ++++++++++------
src/pulsecore/resampler.c | 5 ++++-
4 files changed, 28 insertions(+), 9 deletions(-)
New commits:
commit 7ce7464c169444ae2710b2fc2300ad3eef3b6c9d
Author: Deng Zhengrong <dzrongg at gmail.com>
Date: Thu Jul 19 16:41:31 2012 +0800
build: fix Mac OS X configure process
The original header file doesn't exist on Lion (10.7.4).
diff --git a/configure.ac b/configure.ac
index 5c70632..b63b0d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -500,7 +500,10 @@ if test "x$os_is_darwin" = "x1" ; then
# How do I check a framework "library" - AC_CHECK_LIB prob. won't work??, just assign LIBS & hope
AC_CHECK_HEADER([/Developer/Headers/FlatCarbon/CoreServices.h],
[LIBS="$LIBS -framework CoreServices"],
- [AC_MSG_ERROR([CoreServices.h header file not found])]
+ [AC_CHECK_HEADERS([/System/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h],
+ [LIBS="$LIBS -framework CoreServices"],
+ [AC_MSG_ERROR([CoreServices.h header file not found])]
+ )]
)
AC_MSG_RESULT([ok])
commit 153e17e3bb4d73ddecbf0fe5df5cca5188698c32
Author: Frédéric Dalleau <frederic.dalleau at linux.intel.com>
Date: Wed Aug 22 15:42:16 2012 +0200
resampler: Fix crash if 'auto' resampler chooses ffmpeg with variable rate
To reproduce, add resampler-method = ffmpeg in daemon.conf
then start PA, and load module-loopback
Program received signal SIGSEGV, Segmentation fault.
[Switching to Thread 0xb2f1db40 (LWP 23047)]
0x00000000 in ?? ()
(gdb) bt
0 0x00000000 in ?? ()
1 0xb7c463cb in pa_resampler_set_input_rate (r=0x80e9438, rate=44011) at pulsecore/resampler.c:365
2 0xb7c6321d in pa_sink_input_process_msg (o=0x80e87a0, code=3, userdata=0xabeb, offset=0, chunk=0x0)
at pulsecore/sink-input.c:1833
3 0xb7e9840b in sink_input_process_msg_cb (obj=0x80e87a0, code=3, data=0xabeb, offset=0, chunk=0x0)
at modules/module-loopback.c:538
4 0xb7c2709b in pa_asyncmsgq_dispatch (object=0x80e87a0, code=3, userdata=0xabeb, offset=0, memchunk=0xb2f1d17c)
at pulsecore/asyncmsgq.c:322
5 0xb7c4c6e3 in asyncmsgq_read_work (i=0x80dd580) at pulsecore/rtpoll.c:564
6 0xb7c4b34a in pa_rtpoll_run (p=0x80fb7e0, wait_op=true) at pulsecore/rtpoll.c:238
7 0xb7dd90af in thread_func (userdata=0x80afe88) at modules/alsa/alsa-sink.c:1785
8 0xb7bf3291 in internal_thread_func (userdata=0x8095d08) at pulsecore/thread-posix.c:83
9 0xb7ab9d4c in start_thread (arg=0xb2f1db40) at pthread_create.c:308
10 0xb79f3ace in clone () at ../sysdeps/unix/sysv/linux/i386/clone.S:130
diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
index 38c5202..a13e700 100644
--- a/src/pulsecore/resampler.c
+++ b/src/pulsecore/resampler.c
@@ -237,7 +237,10 @@ pa_resampler* pa_resampler_new(
#ifdef HAVE_SPEEX
method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3;
#else
- method = PA_RESAMPLER_FFMPEG;
+ if (flags & PA_RESAMPLER_VARIABLE_RATE)
+ method = PA_RESAMPLER_TRIVIAL;
+ else
+ method = PA_RESAMPLER_FFMPEG;
#endif
}
commit 45c27ca29a4f9465c89762c695ecee8ba379d697
Author: Tanu Kaskinen <tanuk at iki.fi>
Date: Sat Oct 6 14:42:46 2012 +0300
build: Add PROTOCOL to EXTRA_DIST.
It's useful documentation, no reason to leave it out of the tarball.
diff --git a/Makefile.am b/Makefile.am
index e4bfbe5..b3ee078 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST = \
doxygen/Makefile.am \
doxygen/Makefile.in \
doxygen/doxygen.conf.in \
+ PROTOCOL \
README \
todo \
vala/libpulse.deps \
commit 485106d5608224b43952d1c0a58ee7f84c72740b
Author: Tanu Kaskinen <tanu.kaskinen at jollamobile.com>
Date: Tue Oct 23 18:55:42 2012 +0300
device-restore: When restoring volume, print the restored volume to the log.
diff --git a/src/modules/module-device-restore.c b/src/modules/module-device-restore.c
index b9bd498..16acfd8 100644
--- a/src/modules/module-device-restore.c
+++ b/src/modules/module-device-restore.c
@@ -779,12 +779,13 @@ static pa_hook_result_t sink_fixate_hook_callback(pa_core *c, pa_sink_new_data *
if (!new_data->volume_is_set) {
pa_cvolume v;
+ char buf[PA_CVOLUME_SNPRINT_MAX];
pa_log_info("Restoring volume for sink %s.", new_data->name);
-
v = e->volume;
pa_cvolume_remap(&v, &e->channel_map, &new_data->channel_map);
pa_sink_new_data_set_volume(new_data, &v);
+ pa_log_info("Restored volume: %s", pa_cvolume_snprint(buf, PA_CVOLUME_SNPRINT_MAX, &new_data->volume));
new_data->save_volume = TRUE;
} else
@@ -823,14 +824,15 @@ static pa_hook_result_t sink_port_hook_callback(pa_core *c, pa_sink *sink, struc
if ((e = perportentry_read(u, name, (sink->active_port ? sink->active_port->name : NULL)))) {
if (u->restore_volume && e->volume_valid) {
-
pa_cvolume v;
+ char buf[PA_CVOLUME_SNPRINT_MAX];
pa_log_info("Restoring volume for sink %s.", sink->name);
-
v = e->volume;
pa_cvolume_remap(&v, &e->channel_map, &sink->channel_map);
pa_sink_set_volume(sink, &v, TRUE, FALSE);
+ pa_log_info("Restored volume: %s", pa_cvolume_snprint(buf, PA_CVOLUME_SNPRINT_MAX, &sink->reference_volume));
+
sink->save_volume = TRUE;
}
@@ -920,12 +922,13 @@ static pa_hook_result_t source_fixate_hook_callback(pa_core *c, pa_source_new_da
if (!new_data->volume_is_set) {
pa_cvolume v;
+ char buf[PA_CVOLUME_SNPRINT_MAX];
pa_log_info("Restoring volume for source %s.", new_data->name);
-
v = e->volume;
pa_cvolume_remap(&v, &e->channel_map, &new_data->channel_map);
pa_source_new_data_set_volume(new_data, &v);
+ pa_log_info("Restored volume: %s", pa_cvolume_snprint(buf, PA_CVOLUME_SNPRINT_MAX, &new_data->volume));
new_data->save_volume = TRUE;
} else
@@ -964,14 +967,15 @@ static pa_hook_result_t source_port_hook_callback(pa_core *c, pa_source *source,
if ((e = perportentry_read(u, name, (source->active_port ? source->active_port->name : NULL)))) {
if (u->restore_volume && e->volume_valid) {
-
pa_cvolume v;
+ char buf[PA_CVOLUME_SNPRINT_MAX];
pa_log_info("Restoring volume for source %s.", source->name);
-
v = e->volume;
pa_cvolume_remap(&v, &e->channel_map, &source->channel_map);
pa_source_set_volume(source, &v, TRUE, FALSE);
+ pa_log_info("Restored volume: %s", pa_cvolume_snprint(buf, PA_CVOLUME_SNPRINT_MAX, &source->reference_volume));
+
source->save_volume = TRUE;
}
commit 3e5b872dc2f8372824dc21324152d257b990d9f8
Author: Tanu Kaskinen <tanuk at iki.fi>
Date: Sat Oct 6 15:05:08 2012 +0300
build: Add .gitignore files to EXTRA_DIST.
As a packager, I want to be able to do "git format-patch
v3.0..origin/master" and I want the generated patches to apply cleanly
against the 3.0 tarball. The patches don't currently apply cleanly if
there are any changes to the .gitignore files, because the .gitignore
files are not shipped in the tarball. This patch fixes that problem.
diff --git a/Makefile.am b/Makefile.am
index 8a94a7c..e4bfbe5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,15 @@ EXTRA_DIST = \
vala/libpulse.deps \
vala/libpulse.vapi \
vala/libpulse-mainloop-glib.deps \
- vala/libpulse-mainloop-glib.vapi
+ vala/libpulse-mainloop-glib.vapi \
+ .gitignore \
+ doxygen/.gitignore \
+ m4/.gitignore \
+ man/.gitignore \
+ po/.gitignore \
+ src/.gitignore \
+ src/daemon/.gitignore \
+ src/pulse/.gitignore
SUBDIRS = src doxygen man po
More information about the pulseaudio-commits
mailing list