itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update device format stuff for (pre-release) API changes.

This commit is contained in:
Colin Guthrie 2011-08-18 17:43:42 +01:00
parent c9b307de5a
commit f58f0da9eb
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pavucontrol.cc
View File

@ -89,7 +89,7 @@ void card_cb(pa_context *, const pa_card_info *i, int eol, void *userdata) {
} }
#if HAVE_EXT_DEVICE_RESTORE_API #if HAVE_EXT_DEVICE_RESTORE_API
static void ext_device_restore_subscribe_cb(pa_context *c, uint32_t idx, void *userdata); static void ext_device_restore_subscribe_cb(pa_context *c, pa_device_type_t type, uint32_t idx, void *userdata);
#endif #endif
void sink_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) { void sink_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) {
@ -110,7 +110,7 @@ void sink_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) {
#if HAVE_EXT_DEVICE_RESTORE_API #if HAVE_EXT_DEVICE_RESTORE_API
if (w->updateSink(*i)) if (w->updateSink(*i))
ext_device_restore_subscribe_cb(c, i->index, w); ext_device_restore_subscribe_cb(c, PA_DEVICE_TYPE_SINK, i->index, w);
#else #else
w->updateSink(*i); w->updateSink(*i);
#endif #endif
@ -284,11 +284,14 @@ void ext_device_restore_read_cb(
w->updateDeviceInfo(*i); w->updateDeviceInfo(*i);
} }
static void ext_device_restore_subscribe_cb(pa_context *c, uint32_t idx, void *userdata) { static void ext_device_restore_subscribe_cb(pa_context *c, pa_device_type_t type, uint32_t idx, void *userdata) {
MainWindow *w = static_cast<MainWindow*>(userdata); MainWindow *w = static_cast<MainWindow*>(userdata);
pa_operation *o; pa_operation *o;
if (!(o = pa_ext_device_restore_read_sink_formats(c, idx, ext_device_restore_read_cb, w))) { if (type != PA_DEVICE_TYPE_SINK)
return;
if (!(o = pa_ext_device_restore_read_formats(c, type, idx, ext_device_restore_read_cb, w))) {
show_error(_("pa_ext_device_restore_read_sink_formats() failed")); show_error(_("pa_ext_device_restore_read_sink_formats() failed"));
return; return;
} }
@ -533,7 +536,7 @@ void context_state_callback(pa_context *c, void *userdata) {
#if HAVE_EXT_DEVICE_RESTORE_API #if HAVE_EXT_DEVICE_RESTORE_API
/* TODO Change this to just the test function */ /* TODO Change this to just the test function */
if ((o = pa_ext_device_restore_read_sink_formats_all(c, ext_device_restore_read_cb, w))) { if ((o = pa_ext_device_restore_read_formats_all(c, ext_device_restore_read_cb, w))) {
pa_operation_unref(o); pa_operation_unref(o);
n_outstanding++; n_outstanding++;

2
src/sinkwidget.cc
View File

@ -182,7 +182,7 @@ void SinkWidget::onEncodingsChange() {
} }
} }
if (!(o = pa_ext_device_restore_save_sink_formats(get_context(), index, n_formats, formats, NULL, NULL))) { if (!(o = pa_ext_device_restore_save_formats(get_context(), PA_DEVICE_TYPE_SINK, index, n_formats, formats, NULL, NULL))) {
show_error(_("pa_ext_device_restore_save_sink_formats() failed")); show_error(_("pa_ext_device_restore_save_sink_formats() failed"));
free(formats); free(formats);
return; return;