Fix api. Setting volume is done through a pa_cvolume struct, not a pa_volume_t

scalar.

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

diff --git a/polyp/polyplib-introspect.c b/polyp/polyplib-introspect.c
index 8c0c4449b0cf766c3d9c994bc30aa4ecbf1cc422..49298a9679687e6608685f8200011a915443a564 100644 (file)
--- a/polyp/polyplib-introspect.c
+++ b/polyp/polyplib-introspect.c
@@ -582,7 +582,7 @@ pa_operation* pa_context_get_source_output_info_list(pa_context *c, void (*cb)(p
 
 /*** Volume manipulation ***/
 
-pa_operation* pa_context_set_sink_volume_by_index(pa_context *c, uint32_t idx, pa_volume_t volume, void (*cb)(pa_context *c, int success, void *userdata), void *userdata) {
+pa_operation* pa_context_set_sink_volume_by_index(pa_context *c, uint32_t idx, const pa_cvolume *volume, void (*cb)(pa_context *c, int success, void *userdata), void *userdata) {
     pa_operation *o;
     pa_tagstruct *t;
     uint32_t tag;
@@ -597,14 +597,14 @@ pa_operation* pa_context_set_sink_volume_by_index(pa_context *c, uint32_t idx, p
     pa_tagstruct_putu32(t, tag = c->ctag++);
     pa_tagstruct_putu32(t, idx);
     pa_tagstruct_puts(t, NULL);
-    pa_tagstruct_putu32(t, volume);
+    pa_tagstruct_put_cvolume(t, volume);
     pa_pstream_send_tagstruct(c->pstream, t);
     pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, pa_context_simple_ack_callback, o);
 
     return pa_operation_ref(o);
 }
 
-pa_operation* pa_context_set_sink_volume_by_name(pa_context *c, const char *name, pa_volume_t volume, void (*cb)(pa_context *c, int success, void *userdata), void *userdata) {
+pa_operation* pa_context_set_sink_volume_by_name(pa_context *c, const char *name, const pa_cvolume *volume, void (*cb)(pa_context *c, int success, void *userdata), void *userdata) {
     pa_operation *o;
     pa_tagstruct *t;
     uint32_t tag;
@@ -619,14 +619,14 @@ pa_operation* pa_context_set_sink_volume_by_name(pa_context *c, const char *name
     pa_tagstruct_putu32(t, tag = c->ctag++);
     pa_tagstruct_putu32(t, PA_INVALID_INDEX);
     pa_tagstruct_puts(t, name);
-    pa_tagstruct_putu32(t, volume);
+    pa_tagstruct_put_cvolume(t, volume);
     pa_pstream_send_tagstruct(c->pstream, t);
     pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, pa_context_simple_ack_callback, o);
 
     return pa_operation_ref(o);
 }
 
-pa_operation* pa_context_set_sink_input_volume(pa_context *c, uint32_t idx, pa_volume_t volume, void (*cb)(pa_context *c, int success, void *userdata), void *userdata) {
+pa_operation* pa_context_set_sink_input_volume(pa_context *c, uint32_t idx, const pa_cvolume *volume, void (*cb)(pa_context *c, int success, void *userdata), void *userdata) {
     pa_operation *o;
     pa_tagstruct *t;
     uint32_t tag;
@@ -640,7 +640,7 @@ pa_operation* pa_context_set_sink_input_volume(pa_context *c, uint32_t idx, pa_v
     pa_tagstruct_putu32(t, PA_COMMAND_SET_SINK_INPUT_VOLUME);
     pa_tagstruct_putu32(t, tag = c->ctag++);
     pa_tagstruct_putu32(t, idx);
-    pa_tagstruct_putu32(t, volume);
+    pa_tagstruct_put_cvolume(t, volume);
     pa_pstream_send_tagstruct(c->pstream, t);
     pa_pdispatch_register_reply(c->pdispatch, tag, DEFAULT_TIMEOUT, pa_context_simple_ack_callback, o);
 

diff --git a/polyp/polyplib-introspect.h b/polyp/polyplib-introspect.h
index 10e6d0e38ee69dfe5e6c7708e115391013c84105..d34899086c2c67550a1df2c698d3307ceacfecdd 100644 (file)
--- a/polyp/polyplib-introspect.h
+++ b/polyp/polyplib-introspect.h
@@ -183,13 +183,13 @@ pa_operation* pa_context_get_source_output_info(pa_context *c, uint32_t idx, voi
 pa_operation* pa_context_get_source_output_info_list(pa_context *c, void (*cb)(pa_context *c, const pa_source_output_info*i, int is_last, void *userdata), void *userdata);
 
 /** Set the volume of a sink device specified by its index */
-pa_operation* pa_context_set_sink_volume_by_index(pa_context *c, uint32_t idx, pa_volume_t volume, void (*cb)(pa_context *c, int success, void *userdata), void *userdata);
+pa_operation* pa_context_set_sink_volume_by_index(pa_context *c, uint32_t idx, const pa_cvolume *volume, void (*cb)(pa_context *c, int success, void *userdata), void *userdata);
 
 /** Set the volume of a sink device specified by its name */
-pa_operation* pa_context_set_sink_volume_by_name(pa_context *c, const char *name, pa_volume_t volume, void (*cb)(pa_context *c, int success, void *userdata), void *userdata);
+pa_operation* pa_context_set_sink_volume_by_name(pa_context *c, const char *name, const pa_cvolume *volume, void (*cb)(pa_context *c, int success, void *userdata), void *userdata);
 
 /** Set the volume of a sink input stream */
-pa_operation* pa_context_set_sink_input_volume(pa_context *c, uint32_t idx, pa_volume_t volume, void (*cb)(pa_context *c, int success, void *userdata), void *userdata);
+pa_operation* pa_context_set_sink_input_volume(pa_context *c, uint32_t idx, const pa_cvolume *volume, void (*cb)(pa_context *c, int success, void *userdata), void *userdata);
 
 /** Memory block statistics */
 typedef struct pa_stat_info {