summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/sink-input.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-07-31 22:44:53 +0000
committerLennart Poettering <lennart@poettering.net>2007-07-31 22:44:53 +0000
commit0defdfb5607889c35fdefff4af31eb8b0ae0cbcf (patch)
tree8a8a93281aa32baa815185de5b2cb869f30376bf /src/pulsecore/sink-input.h
parenta82505e72f6680258b8162b846c98c64bea45c37 (diff)
A lot of updates, all necessary to get the native protocol ported:
* add an int64_t argument to pa_asyncmsgq because it is very difficult to pass 64 values otherwise * simplify subclassing in pa_object * s/drop/unlink/ at some places * port the native protocol to the lock-free core (not tested, compiles fine) * move synchronisation of playback streams into pa_sink_input * add "start_corked" field to pa_sink_input_new_data * allow casting of NULL values in pa_object git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1562 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/sink-input.h')
-rw-r--r--src/pulsecore/sink-input.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/pulsecore/sink-input.h b/src/pulsecore/sink-input.h
index fe62917a..af3db95e 100644
--- a/src/pulsecore/sink-input.h
+++ b/src/pulsecore/sink-input.h
@@ -71,6 +71,8 @@ struct pa_sink_input {
pa_sample_spec sample_spec;
pa_channel_map channel_map;
+ pa_sink_input *sync_prev, *sync_next;
+
pa_cvolume volume;
int muted;
@@ -97,6 +99,8 @@ struct pa_sink_input {
/* size_t move_silence; */
pa_memblock *silence_memblock; /* may be NULL */
+ pa_sink_input *sync_prev, *sync_next;
+
pa_cvolume volume;
int muted;
} thread_info;
@@ -133,6 +137,9 @@ typedef struct pa_sink_input_new_data {
int muted_is_set;
pa_resample_method_t resample_method;
+
+ int start_corked;
+ pa_sink_input *sync_base;
} pa_sink_input_new_data;
pa_sink_input_new_data* pa_sink_input_new_data_init(pa_sink_input_new_data *data);
@@ -179,6 +186,6 @@ pa_sink_input_state_t pa_sink_input_get_state(pa_sink_input *i);
int pa_sink_input_peek(pa_sink_input *i, pa_memchunk *chunk, pa_cvolume *volume);
void pa_sink_input_drop(pa_sink_input *i, size_t length);
-int pa_sink_input_process_msg(pa_msgobject *o, int code, void *userdata, pa_memchunk *chunk);
+int pa_sink_input_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offset, pa_memchunk *chunk);
#endif