GNOME/libgnome-volume-control
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libgnome-volume-control.git synced 2024-11-21 16:30:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

mixer-control: Fix selecting Bluetooth input when on A2DP profile

Browse Source 
When on A2DP profile and a Bluetooth input is selected, we first need to
switch the profile to HFP/HSP, then select the default source to be that
profile. In some cases the latter step was forgotten, because
the variable "profile_swapping_device_id" was reset before it was
supposed to be used.

https://bugzilla.gnome.org/show_bug.cgi?id=736943
This commit is contained in:
David Henningsson 2014-09-19 07:21:08 +02:00 committed by Bastien Nocera
parent d52194fce1
commit ce8e4880ce
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gvc-mixer-control.c
View File

@ -1561,10 +1561,10 @@ update_sink (GvcMixerControl *control,
if (gvc_mixer_ui_device_get_stream_id (dev) == gvc_mixer_stream_get_id (stream)) { if (gvc_mixer_ui_device_get_stream_id (dev) == gvc_mixer_stream_get_id (stream)) {
g_debug ("Looks like we profile swapped on a non server default sink"); g_debug ("Looks like we profile swapped on a non server default sink");
gvc_mixer_control_set_default_sink (control, stream); gvc_mixer_control_set_default_sink (control, stream);
}
}
control->priv->profile_swapping_device_id = GVC_MIXER_UI_DEVICE_INVALID; control->priv->profile_swapping_device_id = GVC_MIXER_UI_DEVICE_INVALID;
} }
}
}
if (control->priv->default_sink_name != NULL if (control->priv->default_sink_name != NULL
&& info->name != NULL && info->name != NULL
@ -1679,12 +1679,12 @@ update_source (GvcMixerControl *control,
if (dev != NULL) { if (dev != NULL) {
/* now check to make sure this new stream is the same stream just matched and set on the device object */ /* now check to make sure this new stream is the same stream just matched and set on the device object */
if (gvc_mixer_ui_device_get_stream_id (dev) == gvc_mixer_stream_get_id (stream)) { if (gvc_mixer_ui_device_get_stream_id (dev) == gvc_mixer_stream_get_id (stream)) {
g_debug ("Looks like we profile swapped on a non server default sink"); g_debug ("Looks like we profile swapped on a non server default source");
gvc_mixer_control_set_default_source (control, stream); gvc_mixer_control_set_default_source (control, stream);
}
}
control->priv->profile_swapping_device_id = GVC_MIXER_UI_DEVICE_INVALID; control->priv->profile_swapping_device_id = GVC_MIXER_UI_DEVICE_INVALID;
} }
}
}
if (control->priv->default_source_name != NULL if (control->priv->default_source_name != NULL
&& info->name != NULL && info->name != NULL
&& strcmp (control->priv->default_source_name, info->name) == 0) { && strcmp (control->priv->default_source_name, info->name) == 0) {