Merge lp:~diwic/unity-control-center/lp1367693-14.04 into lp:unity-control-center/14.04

Proposed by David Henningsson on 2014-09-19
Status: Merged
Approved by: Sebastien Bacher on 2014-09-22
Approved revision: 12780
Merged at revision: 12779
Proposed branch: lp:~diwic/unity-control-center/lp1367693-14.04
Merge into: lp:unity-control-center/14.04
Diff against target: 60 lines (+12/-9)
2 files modified
panels/sound/gvc-mixer-control.c (+3/-3)
panels/sound/gvc-mixer-dialog.c (+9/-6)
To merge this branch: bzr merge lp:~diwic/unity-control-center/lp1367693-14.04
Reviewer Review Type Date Requested Status
Sebastien Bacher 2014-09-19 Approve on 2014-09-22
Review via email: mp+235243@code.launchpad.net

Commit message

Make sure selecting a bluetooth input works even when the headset is in A2DP mode, and make sure the correct levels are shown in the level bar (Bug 1367693)

Description of the change

I've been asked (by oem-priority) to fix bug 1367693 and SRU it into Trusty. I've come up with fixes for the bug (which turned out to be two bugs in one), but can you review my fixes and help me with the process, i e what else do I need to do (in form of testing etc) to make sure this gets SRUed into 14.04?

So far I've just been running testing my fixes with lp:unity-control-center's trunk on 14.04.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'panels/sound/gvc-mixer-control.c'
--- panels/sound/gvc-mixer-control.c 2013-12-03 02:12:11 +0000
+++ panels/sound/gvc-mixer-control.c 2014-09-19 07:22:23 +0000
@@ -1550,9 +1550,9 @@
1550 if (gvc_mixer_ui_device_get_stream_id (dev) == gvc_mixer_stream_get_id (stream)) {1550 if (gvc_mixer_ui_device_get_stream_id (dev) == gvc_mixer_stream_get_id (stream)) {
1551 g_debug ("Looks like we profile swapped on a non server default sink");1551 g_debug ("Looks like we profile swapped on a non server default sink");
1552 gvc_mixer_control_set_default_sink (control, stream);1552 gvc_mixer_control_set_default_sink (control, stream);
1553 control->priv->profile_swapping_device_id = GVC_MIXER_UI_DEVICE_INVALID;
1553 }1554 }
1554 }1555 }
1555 control->priv->profile_swapping_device_id = GVC_MIXER_UI_DEVICE_INVALID;
1556 }1556 }
15571557
1558 if (control->priv->default_sink_name != NULL1558 if (control->priv->default_sink_name != NULL
@@ -1662,11 +1662,11 @@
1662 if (dev != NULL) {1662 if (dev != NULL) {
1663 /* now check to make sure this new stream is the same stream just matched and set on the device object */1663 /* now check to make sure this new stream is the same stream just matched and set on the device object */
1664 if (gvc_mixer_ui_device_get_stream_id (dev) == gvc_mixer_stream_get_id (stream)) {1664 if (gvc_mixer_ui_device_get_stream_id (dev) == gvc_mixer_stream_get_id (stream)) {
1665 g_debug ("Looks like we profile swapped on a non server default sink");1665 g_debug ("Looks like we profile swapped on a non server default source");
1666 gvc_mixer_control_set_default_source (control, stream);1666 gvc_mixer_control_set_default_source (control, stream);
1667 control->priv->profile_swapping_device_id = GVC_MIXER_UI_DEVICE_INVALID;
1667 }1668 }
1668 }1669 }
1669 control->priv->profile_swapping_device_id = GVC_MIXER_UI_DEVICE_INVALID;
1670 }1670 }
1671 if (control->priv->default_source_name != NULL1671 if (control->priv->default_source_name != NULL
1672 && info->name != NULL1672 && info->name != NULL
16731673
=== modified file 'panels/sound/gvc-mixer-dialog.c'
--- panels/sound/gvc-mixer-dialog.c 2014-03-18 08:35:09 +0000
+++ panels/sound/gvc-mixer-dialog.c 2014-09-19 07:22:23 +0000
@@ -397,8 +397,13 @@
397 res = pa_stream_disconnect (s);397 res = pa_stream_disconnect (s);
398 if (res == 0) {398 if (res == 0) {
399 g_debug("stream has been disconnected");399 g_debug("stream has been disconnected");
400 pa_stream_unref (s);400 }
401 }401 else {
402 g_warning ("pa_stream_disconnect failed, res = %d", res);
403 /* If disconnect failed, at least make sure we don't show the data */
404 pa_stream_set_read_callback (s, NULL, NULL);
405 }
406 pa_stream_unref (s);
402 g_object_set_data (G_OBJECT (dialog->priv->input_level_bar), "pa_stream", NULL); 407 g_object_set_data (G_OBJECT (dialog->priv->input_level_bar), "pa_stream", NULL);
403 }408 }
404 409
@@ -407,10 +412,8 @@
407 if (pa_context_get_server_protocol_version (context) < 13) {412 if (pa_context_get_server_protocol_version (context) < 13) {
408 return;413 return;
409 }414 }
410 if (res == 0) {415 g_object_set_data (G_OBJECT (stream), "has-monitor", GINT_TO_POINTER (FALSE));
411 g_object_set_data (G_OBJECT (stream), "has-monitor", GINT_TO_POINTER (FALSE));416 g_debug ("Stopping monitor");
412 }
413 g_debug ("Stopping monitor for %u", pa_stream_get_index (s));
414 g_object_set_data (G_OBJECT (dialog->priv->input_level_bar), "stream", NULL);417 g_object_set_data (G_OBJECT (dialog->priv->input_level_bar), "stream", NULL);
415}418}
416419

Subscribers

People subscribed via source and target branches