From af36c9d7e061b84e82172742afbf3dd0f740fffd Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Tue, 19 Mar 2013 10:13:52 +0100 Subject: iOS: remove unnecessary test for accelerometer available The accelerometer is always available, so no need to check for this. Change-Id: I79411ff023c4350c5b31d4fad048484db2b2fe43 Reviewed-by: Thomas McGuire Reviewed-by: Lorn Potter --- src/plugins/sensors/ios/iosaccelerometer.mm | 31 +++++++++++++---------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/plugins/sensors/ios/iosaccelerometer.mm b/src/plugins/sensors/ios/iosaccelerometer.mm index a01e4186..a815c401 100644 --- a/src/plugins/sensors/ios/iosaccelerometer.mm +++ b/src/plugins/sensors/ios/iosaccelerometer.mm @@ -75,23 +75,20 @@ char const * const IOSAccelerometer::id("ios.accelerometer"); -(void)startAccelerometer { CMMotionManager *motionManager = [QIOSMotionManager sharedManager]; - - if (motionManager.deviceMotionAvailable) { - [motionManager startAccelerometerUpdatesToQueue:m_updateQueue withHandler:^(CMAccelerometerData *data, NSError *error) { - dispatch_async(dispatch_get_main_queue(), ^{ - Q_UNUSED(error); - CMAcceleration acc = data.acceleration; - // Convert from G to m/s2, and flip axes: - const qreal G = 9.8066; - qreal x = qreal(acc.x) * G * -1; - qreal y = qreal(acc.y) * G * -1; - qreal z = qreal(acc.z) * G * -1; - // Convert from NSTimeInterval to microseconds: - quint64 timestamp = quint64(data.timestamp * 1000000); - m_qiosAccelerometer->readingsChanged(timestamp, x, y, z); - }); - }]; - } + [motionManager startAccelerometerUpdatesToQueue:m_updateQueue withHandler:^(CMAccelerometerData *data, NSError *error) { + dispatch_async(dispatch_get_main_queue(), ^{ + Q_UNUSED(error); + CMAcceleration acc = data.acceleration; + // Convert from G to m/s2, and flip axes: + const qreal G = 9.8066; + qreal x = qreal(acc.x) * G * -1; + qreal y = qreal(acc.y) * G * -1; + qreal z = qreal(acc.z) * G * -1; + // Convert from NSTimeInterval to microseconds: + quint64 timestamp = quint64(data.timestamp * 1000000); + m_qiosAccelerometer->readingsChanged(timestamp, x, y, z); + }); + }]; } -(void)stopAccelerometer -- cgit v1.2.3