Merge lp:~phablet-team/qtubuntu-camera/audio-role-staging into lp:qtubuntu-camera/staging

Proposed by Jim Hodapp on 2016-03-21
Status: Merged
Approved by: Florian Boucault on 2016-03-23
Approved revision: 187
Merged at revision: 184
Proposed branch: lp:~phablet-team/qtubuntu-camera/audio-role-staging
Merge into: lp:qtubuntu-camera/staging
Diff against target: 15 lines (+0/-4)
1 file modified
src/aalimagecapturecontrol.cpp (+0/-4)
To merge this branch: bzr merge lp:~phablet-team/qtubuntu-camera/audio-role-staging
Reviewer Review Type Date Requested Status
Florian Boucault (community) 2016-03-21 Needs Fixing on 2016-03-23
Review via email: mp+289641@code.launchpad.net

Commit message

Get rid of using the old QMediaPlayer::Alert role and use the new
QAudio::NotificationRole for vivid and xenial.

Description of the change

Get rid of using the old QMediaPlayer::Alert role and use the new
QAudio::NotificationRole for vivid and xenial.

To post a comment you must log in.
Florian Boucault (fboucault) wrote :

Commit and description do not seem to correspond to what was done "Get rid of using the old QMediaPlayer::Alert role and use the new QAudio::NotificationRole for vivid and xenial."

review: Needs Fixing
Florian Boucault (fboucault) wrote :

No need for the debian changelog, it will be done automatically later

review: Needs Fixing
187. By Jim Hodapp on 2016-03-23

Remove no longer needed debian/changelog entry

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/aalimagecapturecontrol.cpp'
--- src/aalimagecapturecontrol.cpp 2016-02-09 08:54:12 +0000
+++ src/aalimagecapturecontrol.cpp 2016-03-23 12:41:33 +0000
@@ -50,11 +50,7 @@
50{50{
51 m_galleryPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);51 m_galleryPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
52 m_audioPlayer->setMedia(QUrl::fromLocalFile("/system/media/audio/ui/camera_click.ogg"));52 m_audioPlayer->setMedia(QUrl::fromLocalFile("/system/media/audio/ui/camera_click.ogg"));
53#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
54 m_audioPlayer->setAudioRole(QMediaPlayer::AlertRole);
55#else
56 m_audioPlayer->setAudioRole(QAudio::NotificationRole);53 m_audioPlayer->setAudioRole(QAudio::NotificationRole);
57#endif
5854
59 QObject::connect(&m_storageManager, &StorageManager::previewReady,55 QObject::connect(&m_storageManager, &StorageManager::previewReady,
60 this, &AalImageCaptureControl::imageCaptured);56 this, &AalImageCaptureControl::imageCaptured);

Subscribers

People subscribed via source and target branches

to all changes: