summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-07-31 22:56:35 +0000
committerLennart Poettering <lennart@poettering.net>2007-07-31 22:56:35 +0000
commitd3eca287cfc177fc5084ddf72ccfdbe9bee23cae (patch)
tree82adbde63d144be390001ce0f572a5a1066ddd17
parent0defdfb5607889c35fdefff4af31eb8b0ae0cbcf (diff)
rename pa_source_output_new_data::corked to start_corked to match pa_sink_input_new_data::start_corked
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1563 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/protocol-native.c2
-rw-r--r--src/pulsecore/sink-input.h1
-rw-r--r--src/pulsecore/source-output.c2
-rw-r--r--src/pulsecore/source-output.h2
4 files changed, 4 insertions, 3 deletions
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 3be5eae8..03f2708e 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -443,7 +443,7 @@ static record_stream* record_stream_new(
data.source = source;
data.driver = __FILE__;
data.name = name;
- data.corked = corked;
+ data.start_corked = corked;
pa_source_output_new_data_set_sample_spec(&data, ss);
pa_source_output_new_data_set_channel_map(&data, map);
diff --git a/src/pulsecore/sink-input.h b/src/pulsecore/sink-input.h
index af3db95e..0168805a 100644
--- a/src/pulsecore/sink-input.h
+++ b/src/pulsecore/sink-input.h
@@ -131,6 +131,7 @@ typedef struct pa_sink_input_new_data {
int sample_spec_is_set;
pa_channel_map channel_map;
int channel_map_is_set;
+
pa_cvolume volume;
int volume_is_set;
int muted;
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index c3ecf3a2..9b828e1a 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -135,7 +135,7 @@ pa_source_output* pa_source_output_new(
o->parent.process_msg = pa_source_output_process_msg;
o->core = core;
- o->state = data->corked ? PA_SOURCE_OUTPUT_CORKED : PA_SOURCE_OUTPUT_RUNNING;
+ o->state = data->start_corked ? PA_SOURCE_OUTPUT_CORKED : PA_SOURCE_OUTPUT_RUNNING;
o->flags = flags;
o->name = pa_xstrdup(data->name);
o->driver = pa_xstrdup(data->driver);
diff --git a/src/pulsecore/source-output.h b/src/pulsecore/source-output.h
index 9f982a9a..47cc8c40 100644
--- a/src/pulsecore/source-output.h
+++ b/src/pulsecore/source-output.h
@@ -104,7 +104,7 @@ typedef struct pa_source_output_new_data {
pa_resample_method_t resample_method;
- int corked;
+ int start_corked;
} pa_source_output_new_data;
pa_source_output_new_data* pa_source_output_new_data_init(pa_source_output_new_data *data);