[pulseaudio-discuss] [PATCH] bluetooth: Add missing return statement.

2011-05-14 Thread Tanu Kaskinen 
---
 src/modules/bluetooth/module-bluetooth-device.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/modules/bluetooth/module-bluetooth-device.c 
b/src/modules/bluetooth/module-bluetooth-device.c
index 086fce9..ae522bc 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -1957,6 +1957,8 @@ static int sco_over_pcm_state_update(struct userdata *u, 
pa_bool_t changed) {
 
 return 0;
 }
+
+return 0;
 }
 
 static pa_hook_result_t sink_state_changed_cb(pa_core *c, pa_sink *s, struct 
userdata *u) {
-- 
1.7.5.1

___
pulseaudio-discuss mailing list
pulseaudio-discuss@mail.0pointer.de
https://tango.0pointer.de/mailman/listinfo/pulseaudio-discuss

[pulseaudio-discuss] [PATCH] loopback: Add a modarg for disabling remixing.

2011-05-14 Thread Tanu Kaskinen 
---
 src/modules/module-loopback.c |   18 +-
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c
index 9a8640b..024337f 100644
--- a/src/modules/module-loopback.c
+++ b/src/modules/module-loopback.c
@@ -59,7 +59,8 @@ PA_MODULE_USAGE(
 sink_input_role=media.role for the sink input 
 source_output_role=media.role for the source output 
 source_dont_move=boolean 
-sink_dont_move=boolean);
+sink_dont_move=boolean 
+remix=remix channels? );
 
 #define DEFAULT_LATENCY_MSEC 200
 
@@ -120,6 +121,7 @@ static const char* const valid_modargs[] = {
 source_output_role,
 source_dont_move,
 sink_dont_move,
+remix,
 NULL,
 };
 
@@ -407,7 +409,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t 
nbytes, pa_memchunk *chunk
 u-in_pop = FALSE;
 
 if (pa_memblockq_peek(u-memblockq, chunk)  0) {
-pa_log_info(Coud not peek into queue);
+pa_log_info(Could not peek into queue);
 return -1;
 }
 
@@ -645,6 +647,7 @@ int pa__init(pa_module *m) {
 pa_memchunk silence;
 uint32_t adjust_time_sec;
 const char *n;
+pa_bool_t remix = TRUE;
 
 pa_assert(m);
 
@@ -663,6 +666,11 @@ int pa__init(pa_module *m) {
 goto fail;
 }
 
+if (pa_modargs_get_value_boolean(ma, remix, remix)  0) {
+pa_log(Invalid boolean remix parameter);
+goto fail;
+}
+
 ss = sink-sample_spec;
 map = sink-channel_map;
 if (pa_modargs_get_sample_spec_and_channel_map(ma, ss, map, 
PA_CHANNEL_MAP_DEFAULT)  0) {
@@ -713,7 +721,7 @@ int pa__init(pa_module *m) {
 
 pa_sink_input_new_data_set_sample_spec(sink_input_data, ss);
 pa_sink_input_new_data_set_channel_map(sink_input_data, map);
-sink_input_data.flags = PA_SINK_INPUT_VARIABLE_RATE;
+sink_input_data.flags = PA_SINK_INPUT_VARIABLE_RATE | (remix ? 0 : 
PA_SINK_INPUT_NO_REMIX);
 
 sink_dont_move = FALSE;
 if (pa_modargs_get_value_boolean(ma, sink_dont_move, sink_dont_move)  
0) {
@@ -764,8 +772,8 @@ int pa__init(pa_module *m) {
 pa_proplist_sets(source_output_data.proplist, PA_PROP_MEDIA_ICON_NAME, 
n);
 
 pa_source_output_new_data_set_sample_spec(source_output_data, ss);
-pa_sink_input_new_data_set_channel_map(sink_input_data, map);
-source_output_data.flags = (pa_source_output_flags_t)0;
+pa_source_output_new_data_set_channel_map(source_output_data, map);
+source_output_data.flags = (remix ? 0 : PA_SOURCE_OUTPUT_NO_REMIX);
 
 source_dont_move = FALSE;
 if (pa_modargs_get_value_boolean(ma, source_dont_move, 
source_dont_move)  0) {
-- 
1.7.5.1

___
pulseaudio-discuss mailing list
pulseaudio-discuss@mail.0pointer.de
https://tango.0pointer.de/mailman/listinfo/pulseaudio-discuss

Re: [pulseaudio-discuss] [PATCH] loopback: Add a modarg for disabling remixing.

2011-05-14 Thread mar...@saepia.net 
Wow, thank you!

m.

2011/5/14 Tanu Kaskinen ta...@iki.fi:
 ---
  src/modules/module-loopback.c |   18 +-
  1 files changed, 13 insertions(+), 5 deletions(-)

 diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c
 index 9a8640b..024337f 100644
 --- a/src/modules/module-loopback.c
 +++ b/src/modules/module-loopback.c
 @@ -59,7 +59,8 @@ PA_MODULE_USAGE(
         sink_input_role=media.role for the sink input 
         source_output_role=media.role for the source output 
         source_dont_move=boolean 
 -        sink_dont_move=boolean);
 +        sink_dont_move=boolean 
 +        remix=remix channels? );

  #define DEFAULT_LATENCY_MSEC 200

 @@ -120,6 +121,7 @@ static const char* const valid_modargs[] = {
     source_output_role,
     source_dont_move,
     sink_dont_move,
 +    remix,
     NULL,
  };

 @@ -407,7 +409,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t 
 nbytes, pa_memchunk *chunk
     u-in_pop = FALSE;

     if (pa_memblockq_peek(u-memblockq, chunk)  0) {
 -        pa_log_info(Coud not peek into queue);
 +        pa_log_info(Could not peek into queue);
         return -1;
     }

 @@ -645,6 +647,7 @@ int pa__init(pa_module *m) {
     pa_memchunk silence;
     uint32_t adjust_time_sec;
     const char *n;
 +    pa_bool_t remix = TRUE;

     pa_assert(m);

 @@ -663,6 +666,11 @@ int pa__init(pa_module *m) {
         goto fail;
     }

 +    if (pa_modargs_get_value_boolean(ma, remix, remix)  0) {
 +        pa_log(Invalid boolean remix parameter);
 +        goto fail;
 +    }
 +
     ss = sink-sample_spec;
     map = sink-channel_map;
     if (pa_modargs_get_sample_spec_and_channel_map(ma, ss, map, 
 PA_CHANNEL_MAP_DEFAULT)  0) {
 @@ -713,7 +721,7 @@ int pa__init(pa_module *m) {

     pa_sink_input_new_data_set_sample_spec(sink_input_data, ss);
     pa_sink_input_new_data_set_channel_map(sink_input_data, map);
 -    sink_input_data.flags = PA_SINK_INPUT_VARIABLE_RATE;
 +    sink_input_data.flags = PA_SINK_INPUT_VARIABLE_RATE | (remix ? 0 : 
 PA_SINK_INPUT_NO_REMIX);

     sink_dont_move = FALSE;
     if (pa_modargs_get_value_boolean(ma, sink_dont_move, sink_dont_move)  
 0) {
 @@ -764,8 +772,8 @@ int pa__init(pa_module *m) {
         pa_proplist_sets(source_output_data.proplist, 
 PA_PROP_MEDIA_ICON_NAME, n);

     pa_source_output_new_data_set_sample_spec(source_output_data, ss);
 -    pa_sink_input_new_data_set_channel_map(sink_input_data, map);
 -    source_output_data.flags = (pa_source_output_flags_t)0;
 +    pa_source_output_new_data_set_channel_map(source_output_data, map);
 +    source_output_data.flags = (remix ? 0 : PA_SOURCE_OUTPUT_NO_REMIX);

     source_dont_move = FALSE;
     if (pa_modargs_get_value_boolean(ma, source_dont_move, 
 source_dont_move)  0) {
 --
 1.7.5.1

 ___
 pulseaudio-discuss mailing list
 pulseaudio-discuss@mail.0pointer.de
 https://tango.0pointer.de/mailman/listinfo/pulseaudio-discuss

___
pulseaudio-discuss mailing list
pulseaudio-discuss@mail.0pointer.de
https://tango.0pointer.de/mailman/listinfo/pulseaudio-discuss

[pulseaudio-discuss] multiseat and PulseAudio?

2011-05-14 Thread Tomasz Chmielewski 
Traditionally, UNIX systems were supporting multiseat desktop sessions 
(i.e. multiple keyboards, video cards, monitors attached to one PC).


According to:

http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode

What is wrong with system mode?

Or with other words: if you run it that way on your desktop,
then you are doing it the wrong way.


What is the correct way to use PulseAudio with multiseat systems?


--
Tomasz Chmielewski
http://wpkg.org
___
pulseaudio-discuss mailing list
pulseaudio-discuss@mail.0pointer.de
https://tango.0pointer.de/mailman/listinfo/pulseaudio-discuss

Re: [pulseaudio-discuss] review+pull-request: Passthrough support

2011-05-14 Thread Arun Raghavan 
On Tue, 2011-05-03 at 09:25 +0100, Colin Guthrie wrote:
 'Twas brillig, and Arun Raghavan at 02/05/11 07:49 did gyre and gimble:
   In e193c2bf55326a48e2297bcacadc9d1848a40d7d and
   948d0f19bef353208ffb5b1b8c520b6b489b94a6
   
   Can you make sure that pactl and pacmd stay as in-sync as possible?
  I held off because I thought that pacmd was going to be dropped before
  too long. Is this not the case? Sink port information seems to have not
  been added, I'll sync that as well if required.
 
 Hmm, not sure. Ideally I'd prefer to just have one tool and only add to
 pacmd the things that cannot easily be done via the protocol, but I'm
 not sure of the overall strategy.
 
 I'll add this to the discussion points for Saturday's chat.

Was this discussed? Any news?

   In bb7cc499f1815de1c90b0ef1850152224df96ff9
   
   I don't see why this asserts in the current form nor what has actually
   changed.
  It should not assert since we want to gracefully fail (that is the
  original code should not have been an assert).
 
 I still don't see any asserts in the original code. The only difference
 I can see is that a pa_log_debug() is not printed... (the log message
 says the word Assertion but it doesn't actually assert AFAICT...)
 
 This might be intended (i.e. don't print the log message), but if that's
 the case the commit message is still wrong to mention asserts...

Ah, I see what you mean. Commit message amended.

   General Question:
   
   Has this broken tunnels? (we manage to do this quite often with stream
   protocol changes...
  Indeed, it does. I've put fixing this on my TODO list. Will try to get
  to it soon.
 
 Cool, thanks :)

Done and pushed to my tree. :)

Cheers,
Arun

___
pulseaudio-discuss mailing list
pulseaudio-discuss@mail.0pointer.de
https://tango.0pointer.de/mailman/listinfo/pulseaudio-discuss