diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2015-02-12 08:04:11 -0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-02-18 15:44:42 +0000 |
| commit | e5ffc6a876631bf27feee793734209271db82bd9 (patch) | |
| tree | b8b8218bcdf0fedcf963d208f03e86e9afd41f3d /src/plugins/qnx/camera/bbcameramediarecordercontrol.cpp | |
| parent | 178c0401685a56541995ca1ac9b5f6a4b543626d (diff) | |
Remove BlackBerry PlayBook support.
Change-Id: I21f9c21bd3badd30f3a989ce3412c9ad03f5f21d
Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Diffstat (limited to 'src/plugins/qnx/camera/bbcameramediarecordercontrol.cpp')
| -rw-r--r-- | src/plugins/qnx/camera/bbcameramediarecordercontrol.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/plugins/qnx/camera/bbcameramediarecordercontrol.cpp b/src/plugins/qnx/camera/bbcameramediarecordercontrol.cpp index f5c04c21b..b8f4cf4e7 100644 --- a/src/plugins/qnx/camera/bbcameramediarecordercontrol.cpp +++ b/src/plugins/qnx/camera/bbcameramediarecordercontrol.cpp @@ -37,14 +37,11 @@ #include <QDebug> #include <QUrl> -#ifndef Q_OS_BLACKBERRY_TABLET #include <audio/audio_manager_device.h> #include <audio/audio_manager_volume.h> -#endif QT_BEGIN_NAMESPACE -#ifndef Q_OS_BLACKBERRY_TABLET static audio_manager_device_t currentAudioInputDevice() { audio_manager_device_t device = AUDIO_DEVICE_HEADSET; @@ -57,7 +54,6 @@ static audio_manager_device_t currentAudioInputDevice() return device; } -#endif BbCameraMediaRecorderControl::BbCameraMediaRecorderControl(BbCameraSession *session, QObject *parent) : QMediaRecorderControl(parent) @@ -99,13 +95,12 @@ bool BbCameraMediaRecorderControl::isMuted() const { bool muted = false; -#ifndef Q_OS_BLACKBERRY_TABLET const int result = audio_manager_get_input_mute(currentAudioInputDevice(), &muted); if (result != EOK) { emit const_cast<BbCameraMediaRecorderControl*>(this)->error(QMediaRecorder::ResourceError, tr("Unable to retrieve mute status")); return false; } -#endif + return muted; } @@ -113,13 +108,11 @@ qreal BbCameraMediaRecorderControl::volume() const { double level = 0.0; -#ifndef Q_OS_BLACKBERRY_TABLET const int result = audio_manager_get_input_level(currentAudioInputDevice(), &level); if (result != EOK) { emit const_cast<BbCameraMediaRecorderControl*>(this)->error(QMediaRecorder::ResourceError, tr("Unable to retrieve audio input volume")); return 0.0; } -#endif return (level / 100); } @@ -136,26 +129,22 @@ void BbCameraMediaRecorderControl::setState(QMediaRecorder::State state) void BbCameraMediaRecorderControl::setMuted(bool muted) { -#ifndef Q_OS_BLACKBERRY_TABLET const int result = audio_manager_set_input_mute(currentAudioInputDevice(), muted); if (result != EOK) { emit error(QMediaRecorder::ResourceError, tr("Unable to set mute status")); } else { emit mutedChanged(muted); } -#endif } void BbCameraMediaRecorderControl::setVolume(qreal volume) { -#ifndef Q_OS_BLACKBERRY_TABLET const int result = audio_manager_set_input_level(currentAudioInputDevice(), (volume * 100)); if (result != EOK) { emit error(QMediaRecorder::ResourceError, tr("Unable to set audio input volume")); } else { emit volumeChanged(volume); } -#endif } QT_END_NAMESPACE |