From 1f0961368f58a9fec319d86c79a86a9f0d008cf5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 11 Jan 2006 01:17:39 +0000 Subject: * remove a lot of compiler warnings introduced by using some new GCC flags * add typedefs for public structs and enums and drop the struct/enum prefixs from all uses where it makes sense git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@447 fefdeb5f-60dc-0310-8127-8f9354f1896f --- polyp/source-output.h | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'polyp/source-output.h') diff --git a/polyp/source-output.h b/polyp/source-output.h index f3187aa9..ef8f9fa9 100644 --- a/polyp/source-output.h +++ b/polyp/source-output.h @@ -24,6 +24,8 @@ #include +typedef struct pa_source_output pa_source_output; + #include "source.h" #include "sample.h" #include "memblockq.h" @@ -31,52 +33,52 @@ #include "module.h" #include "client.h" -enum pa_source_output_state { +typedef enum { PA_SOURCE_OUTPUT_RUNNING, PA_SOURCE_OUTPUT_CORKED, PA_SOURCE_OUTPUT_DISCONNECTED -}; +} pa_source_output_state; struct pa_source_output { int ref; - enum pa_source_output_state state; + pa_source_output_state state; uint32_t index; pa_typeid_t typeid; char *name; - struct pa_module *owner; - struct pa_client *client; - struct pa_source *source; - struct pa_sample_spec sample_spec; + pa_module *owner; + pa_client *client; + pa_source *source; + pa_sample_spec sample_spec; - void (*push)(struct pa_source_output *o, const struct pa_memchunk *chunk); - void (*kill)(struct pa_source_output* o); - pa_usec_t (*get_latency) (struct pa_source_output *i); + void (*push)(pa_source_output *o, const pa_memchunk *chunk); + void (*kill)(pa_source_output* o); + pa_usec_t (*get_latency) (pa_source_output *i); - struct pa_resampler* resampler; + pa_resampler* resampler; void *userdata; }; -struct pa_source_output* pa_source_output_new(struct pa_source *s, pa_typeid_t typeid, const char *name, const struct pa_sample_spec *spec, int resample_method); -void pa_source_output_unref(struct pa_source_output* o); -struct pa_source_output* pa_source_output_ref(struct pa_source_output *o); +pa_source_output* pa_source_output_new(pa_source *s, pa_typeid_t typeid, const char *name, const pa_sample_spec *spec, int resample_method); +void pa_source_output_unref(pa_source_output* o); +pa_source_output* pa_source_output_ref(pa_source_output *o); /* To be called by the implementing module only */ -void pa_source_output_disconnect(struct pa_source_output*o); +void pa_source_output_disconnect(pa_source_output*o); /* External code may request disconnection with this funcion */ -void pa_source_output_kill(struct pa_source_output*o); +void pa_source_output_kill(pa_source_output*o); -void pa_source_output_push(struct pa_source_output *o, const struct pa_memchunk *chunk); +void pa_source_output_push(pa_source_output *o, const pa_memchunk *chunk); -void pa_source_output_set_name(struct pa_source_output *i, const char *name); +void pa_source_output_set_name(pa_source_output *i, const char *name); -pa_usec_t pa_source_output_get_latency(struct pa_source_output *i); +pa_usec_t pa_source_output_get_latency(pa_source_output *i); -void pa_source_output_cork(struct pa_source_output *i, int b); +void pa_source_output_cork(pa_source_output *i, int b); -enum pa_resample_method pa_source_output_get_resample_method(struct pa_source_output *o); +pa_resample_method pa_source_output_get_resample_method(pa_source_output *o); #endif -- cgit