fix sink iunput and source output stuff

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

diff --git a/polyp/protocol-native.c b/polyp/protocol-native.c
index 35c78f6..1fafc98 100644 (file)
--- a/polyp/protocol-native.c
+++ b/polyp/protocol-native.c
@@ -1246,7 +1246,7 @@ static void command_set_volume(struct pa_pdispatch *pd, uint32_t command, uint32
             sink = pa_namereg_get(c->protocol->core, *name ? name : NULL, PA_NAMEREG_SINK, 1);
     }  else {
         assert(command == PA_COMMAND_SET_SINK_INPUT_VOLUME);
-        si = pa_idxset_get_by_index(c->protocol->core->sinks, index);
+        si = pa_idxset_get_by_index(c->protocol->core->sink_inputs, index);
     }
 
     if (!si && !sink) {

diff --git a/polyp/sink-input.c b/polyp/sink-input.c
index cf255a0..99ff8fe 100644 (file)
--- a/polyp/sink-input.c
+++ b/polyp/sink-input.c
@@ -170,7 +170,7 @@ void pa_sink_input_drop(struct pa_sink_input *i, size_t length) {
 }
 
 void pa_sink_input_set_volume(struct pa_sink_input *i, uint32_t volume) {
-    assert(i);
+    assert(i && i->sink && i->sink->core);
 
     if (i->volume != volume) {
         i->volume = volume;