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/bbcamerasession.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/bbcamerasession.cpp')
-rw-r--r-- | src/plugins/qnx/camera/bbcamerasession.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/plugins/qnx/camera/bbcamerasession.cpp b/src/plugins/qnx/camera/bbcamerasession.cpp index d10f4e836..66243187b 100644 --- a/src/plugins/qnx/camera/bbcamerasession.cpp +++ b/src/plugins/qnx/camera/bbcamerasession.cpp @@ -83,7 +83,6 @@ static QString errorToString(camera_error_t error) return QLatin1String("Callback registration failed"); case CAMERA_EMICINUSE: return QLatin1String("Microphone in use already"); -#ifndef Q_OS_BLACKBERRY_TABLET case CAMERA_ENODATA: return QLatin1String("Data does not exist"); case CAMERA_EBUSY: @@ -98,7 +97,6 @@ static QString errorToString(camera_error_t error) return QLatin1String("3A have been locked"); // case CAMERA_EVIEWFINDERFROZEN: // not yet available in 10.2 NDK // return QLatin1String("Freeze flag set"); -#endif default: return QLatin1String("Unknown error"); } @@ -561,7 +559,6 @@ void BbCameraSession::applyVideoSettings() const QSize resolution = m_videoEncoderSettings.resolution(); -#ifndef Q_OS_BLACKBERRY_TABLET QString videoCodec = m_videoEncoderSettings.codec(); if (videoCodec.isEmpty()) videoCodec = QLatin1String("h264"); @@ -599,11 +596,6 @@ void BbCameraSession::applyVideoSettings() CAMERA_IMGPROP_ROTATION, rotationAngle, CAMERA_IMGPROP_VIDEOCODEC, cameraVideoCodec, CAMERA_IMGPROP_AUDIOCODEC, cameraAudioCodec); -#else - result = camera_set_video_property(m_handle, - CAMERA_IMGPROP_WIDTH, resolution.width(), - CAMERA_IMGPROP_HEIGHT, resolution.height()); -#endif if (result != CAMERA_EOK) { qWarning() << "Unable to apply video settings:" << result; @@ -864,13 +856,10 @@ static void viewFinderStatusCallback(camera_handle_t handle, camera_devstatus_t BbCameraSession *session = static_cast<BbCameraSession*>(context); QMetaObject::invokeMethod(session, "focusStatusChanged", Qt::QueuedConnection, Q_ARG(int, value)); return; - } -#ifndef Q_OS_BLACKBERRY_TABLET - else if (status == CAMERA_STATUS_POWERUP) { + } else if (status == CAMERA_STATUS_POWERUP) { BbCameraSession *session = static_cast<BbCameraSession*>(context); QMetaObject::invokeMethod(session, "handleCameraPowerUp", Qt::QueuedConnection); } -#endif } bool BbCameraSession::startViewFinder() @@ -1027,7 +1016,6 @@ static void videoRecordingStatusCallback(camera_handle_t handle, camera_devstatu Q_UNUSED(handle) Q_UNUSED(value) -#ifndef Q_OS_BLACKBERRY_TABLET if (status == CAMERA_STATUS_VIDEO_PAUSE) { BbCameraSession *session = static_cast<BbCameraSession*>(context); QMetaObject::invokeMethod(session, "handleVideoRecordingPaused", Qt::QueuedConnection); @@ -1035,7 +1023,6 @@ static void videoRecordingStatusCallback(camera_handle_t handle, camera_devstatu BbCameraSession *session = static_cast<BbCameraSession*>(context); QMetaObject::invokeMethod(session, "handleVideoRecordingResumed", Qt::QueuedConnection); } -#endif } bool BbCameraSession::startVideoRecording() |