Merge lp:~tiagosh/telepathy-ofono/fix-1519007 into lp:telepathy-ofono

Proposed by Tiago Salem Herrmann on 2015-11-24
Status: Needs review
Proposed branch: lp:~tiagosh/telepathy-ofono/fix-1519007
Merge into: lp:telepathy-ofono
Diff against target: 26 lines (+3/-2)
2 files modified
connection.cpp (+1/-1)
qpulseaudioengine.h (+2/-1)
To merge this branch: bzr merge lp:~tiagosh/telepathy-ofono/fix-1519007
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing on 2016-06-14
PS Jenkins bot continuous-integration Approve on 2015-11-24
Ubuntu Phablet Team 2015-11-24 Pending
Review via email: mp+278451@code.launchpad.net

Commit message

Set bluetooth device when playing the ringtone.

Description of the change

Set bluetooth device when playing the ringtone.

To post a comment you must log in.

FAILED: Continuous integration, rev:171
https://jenkins.canonical.com/system-apps/job/lp-telepathy-ofono-ci/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/575/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/575
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/557
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/557
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/551/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/551
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/551/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/551
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/551/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/551
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/551/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/551
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/551/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/551/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-telepathy-ofono-ci/4/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

171. By Tiago Salem Herrmann on 2015-11-24

Set bluetooth device when playing the ringtone

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'connection.cpp'
2--- connection.cpp 2015-10-13 19:29:54 +0000
3+++ connection.cpp 2015-11-24 13:54:24 +0000
4@@ -72,7 +72,7 @@
5 static void enable_ringtone()
6 {
7 #ifdef USE_PULSEAUDIO
8- QPulseAudioEngine::instance()->setCallMode(CallRinging, AudioModeWiredOrSpeaker);
9+ QPulseAudioEngine::instance()->setCallMode(CallRinging, AudioModeBtOrWiredOrSpeaker);
10 #endif
11 }
12
13
14=== modified file 'qpulseaudioengine.h'
15--- qpulseaudioengine.h 2015-07-28 18:10:10 +0000
16+++ qpulseaudioengine.h 2015-11-24 13:54:24 +0000
17@@ -32,7 +32,8 @@
18 AudioModeBluetooth = 0x0008,
19 AudioModeBtOrWiredOrEarpiece = AudioModeBluetooth | AudioModeWiredHeadset | AudioModeEarpiece,
20 AudioModeWiredOrEarpiece = AudioModeWiredHeadset | AudioModeEarpiece,
21- AudioModeWiredOrSpeaker = AudioModeWiredHeadset | AudioModeSpeaker
22+ AudioModeWiredOrSpeaker = AudioModeWiredHeadset | AudioModeSpeaker,
23+ AudioModeBtOrWiredOrSpeaker = AudioModeBluetooth | AudioModeWiredOrSpeaker
24 };
25
26 Q_DECLARE_METATYPE(AudioMode)

Subscribers

People subscribed via source and target branches