[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-263-g47a2b17
Lennart Poettering
gitmailer-noreply at 0pointer.de
Thu Jan 15 11:27:13 PST 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 29c7a288177c260cf2b3d8f80e807305b96594ba (commit)
- Log -----------------------------------------------------------------
47a2b17... make proplist inheritance scheme automatic and implicit
e68e4a5... make things compile again
395523a... we don't support glib1.2 anymore
-----------------------------------------------------------------------
Summary of changes:
src/pulse/pulseaudio.h | 1 -
src/pulsecore/namereg.c | 1 -
src/pulsecore/protocol-esound.c | 2 --
src/pulsecore/protocol-native.c | 2 --
src/pulsecore/sink-input.c | 3 +++
src/pulsecore/sink.c | 3 +++
src/pulsecore/source-output.c | 3 +++
src/pulsecore/source.c | 3 +++
8 files changed, 12 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
commit 395523a0bba400aadae41f6adaa59e6d9b183da2
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Jan 15 20:14:58 2009 +0100
we don't support glib1.2 anymore
diff --git a/src/pulse/pulseaudio.h b/src/pulse/pulseaudio.h
index e09caca..5086783 100644
--- a/src/pulse/pulseaudio.h
+++ b/src/pulse/pulseaudio.h
@@ -108,7 +108,6 @@
* modules:
*
* \li libpulse - The asynchronous API and the internal main loop implementation.
- * \li libpulse-mainloop-glib12 - GLIB 1.2 main loop bindings.
* \li libpulse-mainloop-glib - GLIB 2.x main loop bindings.
* \li libpulse-simple - The simple PulseAudio API.
*/
commit e68e4a57bfc5211309db9bec8057a8b038a0bb14
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Jan 15 20:26:41 2009 +0100
make things compile again
diff --git a/src/pulsecore/namereg.c b/src/pulsecore/namereg.c
index 3b9ce88..2734bab 100644
--- a/src/pulsecore/namereg.c
+++ b/src/pulsecore/namereg.c
@@ -30,7 +30,6 @@
#include <pulse/xmalloc.h>
-#include <pulsecore/autoload.h>
#include <pulsecore/source.h>
#include <pulsecore/sink.h>
#include <pulsecore/core-subscribe.h>
commit 47a2b17d01cc0dceb964df07d17e406726d50d45
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Jan 15 20:27:07 2009 +0100
make proplist inheritance scheme automatic and implicit
diff --git a/src/pulsecore/protocol-esound.c b/src/pulsecore/protocol-esound.c
index 97d10df..b1d3909 100644
--- a/src/pulsecore/protocol-esound.c
+++ b/src/pulsecore/protocol-esound.c
@@ -422,7 +422,6 @@ static int esd_proto_stream_play(connection *c, esd_proto_t request, const void
sdata.module = c->options->module;
sdata.client = c->client;
sdata.sink = sink;
- pa_proplist_update(sdata.proplist, PA_UPDATE_MERGE, c->client->proplist);
pa_sink_input_new_data_set_sample_spec(&sdata, &ss);
c->sink_input = pa_sink_input_new(c->protocol->core, &sdata, 0);
@@ -525,7 +524,6 @@ static int esd_proto_stream_record(connection *c, esd_proto_t request, const voi
sdata.module = c->options->module;
sdata.client = c->client;
sdata.source = source;
- pa_proplist_update(sdata.proplist, PA_UPDATE_MERGE, c->client->proplist);
pa_source_output_new_data_set_sample_spec(&sdata, &ss);
c->source_output = pa_source_output_new(c->protocol->core, &sdata, 0);
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 2179752..0a070f4 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -601,7 +601,6 @@ static record_stream* record_stream_new(
pa_source_output_new_data_init(&data);
pa_proplist_update(data.proplist, PA_UPDATE_REPLACE, p);
- pa_proplist_update(data.proplist, PA_UPDATE_MERGE, c->client->proplist);
data.driver = __FILE__;
data.module = c->options->module;
data.client = c->client;
@@ -1001,7 +1000,6 @@ static playback_stream* playback_stream_new(
pa_sink_input_new_data_init(&data);
pa_proplist_update(data.proplist, PA_UPDATE_REPLACE, p);
- pa_proplist_update(data.proplist, PA_UPDATE_MERGE, c->client->proplist);
data.driver = __FILE__;
data.module = c->options->module;
data.client = c->client;
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index 8cdc928..8f18266 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -190,6 +190,9 @@ pa_sink_input* pa_sink_input_new(
pa_return_null_if_fail(data->resample_method < PA_RESAMPLER_MAX);
+ if (data->client)
+ pa_proplist_update(data->proplist, PA_UPDATE_MERGE, data->client->proplist);
+
if (pa_hook_fire(&core->hooks[PA_CORE_HOOK_SINK_INPUT_FIXATE], data) < 0)
return NULL;
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index d1d68cd..2abc848 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -167,6 +167,9 @@ pa_sink* pa_sink_new(
if (!data->muted_is_set)
data->muted = FALSE;
+ if (data->card)
+ pa_proplist_update(data->proplist, PA_UPDATE_MERGE, data->card->proplist);
+
if (pa_hook_fire(&core->hooks[PA_CORE_HOOK_SINK_FIXATE], data) < 0) {
pa_xfree(s);
pa_namereg_unregister(core, name);
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index e04acf9..e314656 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -153,6 +153,9 @@ pa_source_output* pa_source_output_new(
pa_return_null_if_fail(data->resample_method < PA_RESAMPLER_MAX);
+ if (data->client)
+ pa_proplist_update(data->proplist, PA_UPDATE_MERGE, data->client->proplist);
+
if (pa_hook_fire(&core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_FIXATE], data) < 0)
return NULL;
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 676a6b4..57018a2 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -158,6 +158,9 @@ pa_source* pa_source_new(
if (!data->muted_is_set)
data->muted = FALSE;
+ if (data->card)
+ pa_proplist_update(data->proplist, PA_UPDATE_MERGE, data->card->proplist);
+
if (pa_hook_fire(&core->hooks[PA_CORE_HOOK_SOURCE_FIXATE], data) < 0) {
pa_xfree(s);
pa_namereg_unregister(core, name);
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list