Merge lp:~tiagosh/telepathy-ofono/rtm-1392082 into lp:telepathy-ofono/rtm-14.09

Proposed by Tiago Salem Herrmann on 2015-01-06
Status: Merged
Approved by: Bill Filler on 2015-01-06
Approved revision: 106
Merged at revision: 106
Proposed branch: lp:~tiagosh/telepathy-ofono/rtm-1392082
Merge into: lp:telepathy-ofono/rtm-14.09
Diff against target: 19 lines (+8/-2)
1 file modified
connection.cpp (+8/-2)
To merge this branch: bzr merge lp:~tiagosh/telepathy-ofono/rtm-1392082
Reviewer Review Type Date Requested Status
Bill Filler (community) 2015-01-06 Approve on 2015-01-06
Review via email: mp+245669@code.launchpad.net

Commit message

Give some time before calling enable_normal() so the beeps emitted after a terminated call are played using the right audio output device.

Description of the change

Give some time before calling enable_normal() so the beeps emitted after a terminated call are played using the right audio output device.

To post a comment you must log in.
Bill Filler (bfiller) wrote :

approved

review: Approve

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 2014-12-12 16:09:31 +0000
3+++ connection.cpp 2015-01-06 16:32:31 +0000
4@@ -50,8 +50,14 @@
5 static void enable_normal()
6 {
7 #ifdef USE_PULSEAUDIO
8- QPulseAudioEngine::instance()->setCallMode(QPulseAudioEngine::CallEnded, AudioModeWiredOrSpeaker);
9- QPulseAudioEngine::instance()->setMicMute(false);
10+ QTimer* timer = new QTimer();
11+ timer->setSingleShot(true);
12+ QObject::connect(timer, &QTimer::timeout, [=](){
13+ QPulseAudioEngine::instance()->setCallMode(QPulseAudioEngine::CallEnded, AudioModeWiredOrSpeaker);
14+ QPulseAudioEngine::instance()->setMicMute(false);
15+ timer->deleteLater();
16+ });
17+ timer->start(2000);
18 #endif
19 }
20

Subscribers

People subscribed via source and target branches