telepathy-ofono

Merge lp:~tiagosh/telepathy-ofono/play_ringtone_speakers into lp:telepathy-ofono

  1. play_ringtone_speakers
  2. Merge into trunk
Proposed by Tiago Salem Herrmann on 2015-10-30
Status: Merged
Approved by: Bill Filler on 2015-11-04
Approved revision: 165
Merged at revision: 165
Proposed branch: lp:~tiagosh/telepathy-ofono/play_ringtone_speakers
Merge into: lp:telepathy-ofono
Diff against target: 30 lines (+6/-0)
1 file modified
qpulseaudioengine.cpp (+6/-0)
To merge this branch: bzr merge lp:~tiagosh/telepathy-ofono/play_ringtone_speakers
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-10-31
Ubuntu Phablet Team 2015-10-30 Pending
Review via email: mp+276312@code.launchpad.net

Commit Message

Play ringtone on both speaker and wired headset.

Description of the Change

Play ringtone on both speaker and wired headset.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qpulseaudioengine.cpp'
2--- qpulseaudioengine.cpp 2015-07-28 18:10:10 +0000
3+++ qpulseaudioengine.cpp 2015-10-30 19:41:40 +0000
4@@ -272,6 +272,7 @@
5 pa_sink_port_info *wired_headset = NULL, *wired_headphone = NULL;
6 pa_sink_port_info *preferred = NULL;
7 pa_sink_port_info *bluetooth_sco = NULL;
8+ pa_sink_port_info *speaker_and_wired_headphone = NULL;
9 AudioMode audiomodetoset;
10 AudioModes modes;
11
12@@ -288,6 +289,8 @@
13 speaker = info->ports[i];
14 else if (!strcmp(info->ports[i]->name, "output-bluetooth_sco"))
15 bluetooth_sco = info->ports[i];
16+ else if (!strcmp(info->ports[i]->name, "output-speaker+wired_headphone"))
17+ speaker_and_wired_headphone = info->ports[i];
18 }
19
20 if (!earpiece || !speaker)
21@@ -319,6 +322,9 @@
22 preferred = wired_headset ? wired_headset : wired_headphone;
23 audiomodetoset = AudioModeWiredHeadset;
24 }
25+ if (m_callstatus == CallRinging && speaker_and_wired_headphone) {
26+ preferred = speaker_and_wired_headphone;
27+ }
28 if ((m_audiomode & AudioModeBluetooth) && (modes.contains(AudioModeBluetooth))) {
29 preferred = bluetooth_sco;
30 audiomodetoset = AudioModeBluetooth;

Subscribers

People subscribed via source and target branches