Mega patch:

* implement inner loops using liboil
* drop "typeid" stuff
* add support for channel maps
* add support for seperate volumes per channel
* add support for hardware mixer settings (only module-oss implements this for now)
* fix a lot of types for _t suffix


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@463 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 17 insertions, 9 deletions

diff --git a/polyp/source-output.h b/polyp/source-output.h
index ef8f9fa9..f8e4b152 100644
--- a/polyp/source-output.h
+++ b/polyp/source-output.h
@@ -37,20 +37,21 @@ typedef enum {
     PA_SOURCE_OUTPUT_RUNNING,
     PA_SOURCE_OUTPUT_CORKED,
     PA_SOURCE_OUTPUT_DISCONNECTED
-} pa_source_output_state;
+} pa_source_output_state_t;
 
 struct pa_source_output {
     int ref;
-    pa_source_output_state state;
-    
     uint32_t index;
-    pa_typeid_t typeid;
-
-    char *name;
+    pa_source_output_state_t state;
+    
+    char *name, *driver;
     pa_module *owner;
-    pa_client *client;
+
     pa_source *source;
+    pa_client *client;
+
     pa_sample_spec sample_spec;
+    pa_channel_map channel_map;
     
     void (*push)(pa_source_output *o, const pa_memchunk *chunk);
     void (*kill)(pa_source_output* o);
@@ -61,7 +62,14 @@ struct pa_source_output {
     void *userdata;
 };
 
-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);
+pa_source_output* pa_source_output_new(
+    pa_source *s,
+    const char *driver,
+    const char *name,
+    const pa_sample_spec *spec,
+    const pa_channel_map *map,
+    int resample_method);
+
 void pa_source_output_unref(pa_source_output* o);
 pa_source_output* pa_source_output_ref(pa_source_output *o);
 
@@ -79,6 +87,6 @@ pa_usec_t pa_source_output_get_latency(pa_source_output *i);
 
 void pa_source_output_cork(pa_source_output *i, int b);
 
-pa_resample_method pa_source_output_get_resample_method(pa_source_output *o);
+pa_resample_method_t pa_source_output_get_resample_method(pa_source_output *o);
 
 #endif