diff options
-rw-r--r-- | pulseaudio/PulseObj.py | 15 | ||||
-rw-r--r-- | pulsecaster/ui.py | 7 |
2 files changed, 10 insertions, 12 deletions
diff --git a/pulseaudio/PulseObj.py b/pulseaudio/PulseObj.py index bc8ba5f..e354e57 100644 --- a/pulseaudio/PulseObj.py +++ b/pulseaudio/PulseObj.py @@ -271,7 +271,7 @@ class PulseObj: def py_subscribe_cb(self, c, event, index, userdata): print 'py_subscribe_cb: called' - + print 'py_subscribe_cb:', c, event, index, userdata self.complete_action() return 0 @@ -565,14 +565,13 @@ class PulseObj: def pulse_context_set_subscribe_callback(self, callback): "Set subscribe callback" - self.start_action() - print "py_context_set_subscribe_cb:", callback - PA_CONTEXT_SUBSCRIBE_CB = PA_CONTEXT_SUBSCRIBE_CB_T(self.py_subscribe_cb) + print "py_context_set_subscribe_callback:", callback + PA_CONTEXT_SUBSCRIBE_CB = PA_CONTEXT_SUBSCRIBE_CB_T(callback) - self.operation = pa_context_set_subscribe_callback(self.context, - PA_CONTEXT_SUBSCRIBE_CB, - None) - self.pulse_iterate() + # This returns a void, not a PA_OPERATION + pa_context_set_subscribe_callback(self.context, + PA_CONTEXT_SUBSCRIBE_CB, + None) return ### diff --git a/pulsecaster/ui.py b/pulsecaster/ui.py index 6ccaf93..16afbef 100644 --- a/pulsecaster/ui.py +++ b/pulsecaster/ui.py @@ -92,12 +92,11 @@ class PulseCasterUI: # Fill the combo boxes initially self.repop_sources() - self.pa.pulse_context_subscribe(0x0001, self.dummy) - self.pa.pulse_context_subscribe(0x0021, self.dummy) self.pa.pulse_context_set_subscribe_callback(self.dummy) + self.pa.pulse_context_subscribe(0x10, self.dummy) - def dummy(self, *args): - print('Dummy: ', args) + def dummy(self, c, event, index, userdata): + print('Dummy:', c, event, index, userdata) def repop_sources(self, *args): self.sources = self.pa.pulse_source_list() |