[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master-tx, updated. v0.9.15-test8-2-g6eaeaea
Lennart Poettering
gitmailer-noreply at 0pointer.de
Fri Apr 10 09:04:26 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-tx branch has been updated
from e011230f877408e78f2572c072a383034ea63d89 (commit)
- Log -----------------------------------------------------------------
6eaeaea Downgrade default log level to NOTICE to follow documentation
a26c945 add missing languages to LINGUAS
3e29fd7 prepare another snapshot
991cb06 set fixed latencies at more places where appropriate
80e18c8 make dbus optional during build
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
po/LINGUAS | 10 ++++++++++
src/daemon/main.c | 2 +-
src/modules/alsa/alsa-sink.c | 10 +++++-----
src/modules/alsa/alsa-source.c | 7 ++++---
src/modules/module-pipe-sink.c | 1 +
src/modules/module-pipe-source.c | 1 +
src/modules/module-sine-source.c | 4 +++-
src/modules/oss/module-oss.c | 2 ++
src/pulse/context.c | 13 +++++++++++++
src/pulse/internal.h | 4 ++++
11 files changed, 45 insertions(+), 11 deletions(-)
-----------------------------------------------------------------------
commit 80e18c8da35eb988d10ccada436ab11710c298f6
Author: Finn Thain <fthain at telegraphics.com.au>
Date: Mon Apr 6 16:29:22 2009 +1000
make dbus optional during build
On Tue, 31 Mar 2009, Lennart Poettering wrote:
[snip]
>
> I have now merged your patch. I had to change a few things to make it
> apply cleanly. Since I have no access to Solaris I am unable to test
> this though, so please check if things still work for you.
>
> I also worked around the realpath() issue mostly. It should work fine on
> Solaris now, as well.
Thanks. 0.9.15-test7 seems to work fine.
The only new issue is that configure --without-dbus no longer builds. I
don't need dbus for my purposes (network audio server) and it seems that
dbus is not included with Solaris. A patch for this follows.
Finn
diff --git a/src/pulse/context.c b/src/pulse/context.c
index 991a886..ef36f09 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -104,7 +104,10 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
[PA_COMMAND_RECORD_BUFFER_ATTR_CHANGED] = pa_command_stream_buffer_attr
};
static void context_free(pa_context *c);
+
+#ifdef HAVE_DBUS
static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, void *userdata);
+#endif
pa_context *pa_context_new(pa_mainloop_api *mainloop, const char *name) {
return pa_context_new_with_proplist(mainloop, name, NULL);
@@ -144,7 +147,9 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char *
if (name)
pa_proplist_sets(c->proplist, PA_PROP_APPLICATION_NAME, name);
+#ifdef HAVE_DBUS
c->system_bus = c->session_bus = NULL;
+#endif
c->mainloop = mainloop;
c->client = NULL;
c->pstream = NULL;
@@ -241,6 +246,7 @@ static void context_free(pa_context *c) {
context_unlink(c);
+#ifdef HAVE_DBUS
if (c->system_bus) {
dbus_connection_remove_filter(pa_dbus_wrap_connection_get(c->system_bus), filter_cb, c);
pa_dbus_wrap_connection_free(c->system_bus);
@@ -250,6 +256,7 @@ static void context_free(pa_context *c) {
dbus_connection_remove_filter(pa_dbus_wrap_connection_get(c->session_bus), filter_cb, c);
pa_dbus_wrap_connection_free(c->session_bus);
}
+#endif
if (c->record_streams)
pa_dynarray_free(c->record_streams, NULL, NULL);
@@ -742,6 +749,7 @@ fail:
static void on_connection(pa_socket_client *client, pa_iochannel*io, void *userdata);
+#ifdef HAVE_DBUS
static void track_pulseaudio_on_dbus(pa_context *c, DBusBusType type, pa_dbus_wrap_connection **conn) {
DBusError error;
@@ -767,6 +775,7 @@ static void track_pulseaudio_on_dbus(pa_context *c, DBusBusType type, pa_dbus_wr
finish:
dbus_error_free(&error);
}
+#endif
static int try_next_connection(pa_context *c) {
char *u = NULL;
@@ -800,12 +809,14 @@ static int try_next_connection(pa_context *c) {
}
#endif
+#ifdef HAVE_DBUS
if (c->no_fail && !c->server_specified) {
if (!c->system_bus)
track_pulseaudio_on_dbus(c, DBUS_BUS_SYSTEM, &c->system_bus);
if (!c->session_bus)
track_pulseaudio_on_dbus(c, DBUS_BUS_SESSION, &c->session_bus);
} else
+#endif
pa_context_fail(c, PA_ERR_CONNECTIONREFUSED);
goto finish;
@@ -864,6 +875,7 @@ finish:
pa_context_unref(c);
}
+#ifdef HAVE_DBUS
static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, void *userdata) {
pa_context *c = userdata;
pa_bool_t is_session;
@@ -895,6 +907,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
finish:
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
+#endif
int pa_context_connect(
pa_context *c,
diff --git a/src/pulse/internal.h b/src/pulse/internal.h
index 344e639..28a989b 100644
--- a/src/pulse/internal.h
+++ b/src/pulse/internal.h
@@ -42,7 +42,9 @@
#include <pulsecore/hashmap.h>
#include <pulsecore/refcnt.h>
#include <pulsecore/time-smoother.h>
+#ifdef HAVE_DBUS
#include <pulsecore/dbus-util.h>
+#endif
#include "client-conf.h"
@@ -51,8 +53,10 @@
struct pa_context {
PA_REFCNT_DECLARE;
+#ifdef HAVE_DBUS
pa_dbus_wrap_connection *system_bus;
pa_dbus_wrap_connection *session_bus;
+#endif
pa_proplist *proplist;
pa_mainloop_api* mainloop;
commit 991cb0613488a81be2eb7d8ed1a8f1b891eb9f13
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Apr 10 02:26:59 2009 +0200
set fixed latencies at more places where appropriate
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index c18c34e..401b003 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -1703,14 +1703,13 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
(double) pa_bytes_to_usec(u->hwbuf_size, &ss) / PA_USEC_PER_MSEC);
pa_sink_set_max_request(u->sink, u->hwbuf_size);
+ pa_sink_set_max_rewind(u->sink, u->hwbuf_size);
if (u->use_tsched) {
- fix_min_sleep_wakeup(u);
- fix_tsched_watermark(u);
-
u->watermark_step = pa_usec_to_bytes(TSCHED_WATERMARK_STEP_USEC, &u->sink->sample_spec);
- pa_sink_set_max_rewind(u->sink, u->hwbuf_size);
+ fix_min_sleep_wakeup(u);
+ fix_tsched_watermark(u);
pa_sink_set_latency_range(u->sink,
0,
@@ -1718,7 +1717,8 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
pa_log_info("Time scheduling watermark is %0.2fms",
(double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC);
- }
+ } else
+ u->sink->fixed_latency = pa_bytes_to_usec(u->hwbuf_size, &ss);
reserve_update(u);
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 9cbd79f..99e825c 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1558,18 +1558,19 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
(double) pa_bytes_to_usec(u->hwbuf_size, &ss) / PA_USEC_PER_MSEC);
if (u->use_tsched) {
+ u->watermark_step = pa_usec_to_bytes(TSCHED_WATERMARK_STEP_USEC, &u->source->sample_spec);
+
fix_min_sleep_wakeup(u);
fix_tsched_watermark(u);
- u->watermark_step = pa_usec_to_bytes(TSCHED_WATERMARK_STEP_USEC, &u->source->sample_spec);
-
pa_source_set_latency_range(u->source,
0,
pa_bytes_to_usec(u->hwbuf_size, &ss));
pa_log_info("Time scheduling watermark is %0.2fms",
(double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC);
- }
+ } else
+ u->source->fixed_latency = pa_bytes_to_usec(u->hwbuf_size, &ss);
reserve_update(u);
diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index 26b6b96..9d3e55d 100644
--- a/src/modules/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -293,6 +293,7 @@ int pa__init(pa_module*m) {
pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
pa_sink_set_rtpoll(u->sink, u->rtpoll);
pa_sink_set_max_request(u->sink, PIPE_BUF);
+ u->sink->fixed_latency = pa_bytes_to_usec(PIPE_BUF, &u->sink->sample_spec);
u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
index 3d40fdf..df72d79 100644
--- a/src/modules/module-pipe-source.c
+++ b/src/modules/module-pipe-source.c
@@ -277,6 +277,7 @@ int pa__init(pa_module*m) {
pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
pa_source_set_rtpoll(u->source, u->rtpoll);
+ u->source->fixed_latency = pa_bytes_to_usec(PIPE_BUF, &u->source->sample_spec);
u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
diff --git a/src/modules/module-sine-source.c b/src/modules/module-sine-source.c
index 50e4730..a5f1ce7 100644
--- a/src/modules/module-sine-source.c
+++ b/src/modules/module-sine-source.c
@@ -260,10 +260,12 @@ int pa__init(pa_module*m) {
u->source->update_requested_latency = source_update_requested_latency_cb;
u->source->userdata = u;
+ u->block_usec = BLOCK_USEC;
+
pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
pa_source_set_rtpoll(u->source, u->rtpoll);
+ u->source->fixed_latency = u->block_usec;
- u->block_usec = BLOCK_USEC;
if (!(u->thread = pa_thread_new(thread_func, u))) {
pa_log("Failed to create thread.");
diff --git a/src/modules/oss/module-oss.c b/src/modules/oss/module-oss.c
index f67f47e..855e8a3 100644
--- a/src/modules/oss/module-oss.c
+++ b/src/modules/oss/module-oss.c
@@ -1326,6 +1326,7 @@ int pa__init(pa_module*m) {
pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
pa_source_set_rtpoll(u->source, u->rtpoll);
u->source->refresh_volume = TRUE;
+ u->source->fixed_latency = pa_bytes_to_usec(u->in_hwbuf_size, &u->source->sample_spec);
if (use_mmap)
u->in_mmap_memblocks = pa_xnew0(pa_memblock*, u->in_nfrags);
@@ -1387,6 +1388,7 @@ int pa__init(pa_module*m) {
pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
pa_sink_set_rtpoll(u->sink, u->rtpoll);
u->sink->refresh_volume = TRUE;
+ u->sink->fixed_latency = pa_bytes_to_usec(u->out_hwbuf_size, &u->sink->sample_spec);
pa_sink_set_max_request(u->sink, u->out_hwbuf_size);
commit 3e29fd7694085f9a1aaf0c1bf9ba953b9d4bf87f
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Apr 10 02:28:43 2009 +0200
prepare another snapshot
diff --git a/configure.ac b/configure.ac
index 097f0a2..e7f3753 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define(pa_major, [0])
m4_define(pa_minor, [9])
m4_define(pa_micro, [15])
-AC_INIT([pulseaudio],[pa_major.pa_minor.pa_micro-test7],[mzchyfrnhqvb (at) 0pointer (dot) net])
+AC_INIT([pulseaudio],[pa_major.pa_minor.pa_micro-test8],[mzchyfrnhqvb (at) 0pointer (dot) net])
AC_CONFIG_SRCDIR([src/daemon/main.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
commit a26c945ed92be4478b61eade30dfcc2b75f1e470
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Apr 10 03:03:15 2009 +0200
add missing languages to LINGUAS
diff --git a/po/LINGUAS b/po/LINGUAS
index 076efa4..41b8248 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,3 +1,5 @@
+as
+bn_IN
ca
cs
de
@@ -5,9 +7,17 @@ el
es
fi
fr
+gu
it
+kn
+mr
+or
pa
pl
pt_BR
+sr at latin
+sr
sv
+ta
+te
zh_CN
commit 6eaeaea581e730461404b5e77729d1e9476dec00
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Apr 10 03:41:25 2009 +0200
Downgrade default log level to NOTICE to follow documentation
Closes #527
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 4c4a905..a4f0af7 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -396,7 +396,7 @@ int main(int argc, char *argv[]) {
#endif
pa_log_set_ident("pulseaudio");
- pa_log_set_level(PA_LOG_INFO);
+ pa_log_set_level(PA_LOG_NOTICE);
pa_log_set_flags(PA_LOG_COLORS|PA_LOG_PRINT_FILE|PA_LOG_PRINT_LEVEL, PA_LOG_RESET);
#if defined(__linux__) && defined(__OPTIMIZE__)
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list