diff options
author | Daniel Mack <daniel@caiaq.de> | 2009-10-08 14:19:47 +0800 |
---|---|---|
committer | Daniel Mack <daniel@caiaq.de> | 2009-10-08 14:19:47 +0800 |
commit | 0b388bff522f689fdb4d98529a39f3701db57c08 (patch) | |
tree | 837b4fb0993078a708dfddb5801220e44a711d32 /src/pulse/context.c | |
parent | 94aa9097f4ded68623160d754a4bf2632b8efc79 (diff) | |
parent | 8ec304d2d1e956cc3f5f35437ac4fe580b36f004 (diff) |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/pulse/context.c')
-rw-r--r-- | src/pulse/context.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c index 23ae30ce..7468d0a9 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -128,6 +128,9 @@ static void reset_callbacks(pa_context *c) { c->event_callback = NULL; c->event_userdata = NULL; + c->ext_device_manager.callback = NULL; + c->ext_device_manager.userdata = NULL; + c->ext_stream_restore.callback = NULL; c->ext_stream_restore.userdata = NULL; } @@ -1434,6 +1437,8 @@ void pa_command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_t if (!strcmp(name, "module-stream-restore")) pa_ext_stream_restore_command(c, tag, t); + else if (!strcmp(name, "module-device-manager")) + pa_ext_device_manager_command(c, tag, t); else pa_log(_("Received message for unknown extension '%s'"), name); |