diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:17 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:17 +0200 |
commit | ecd018fe2ee4508e094f631d882ecc1360abec01 (patch) | |
tree | 9b1a8f00e0d6eca0f51768d7af4018f7af0187f8 /src/plugins/sensors/ios/iosaccelerometer.mm | |
parent | 62ec986855e3b3c9fda54a09ca83ae5039663c9c (diff) | |
parent | 724008411c16aaf8fa25c09745e20d0d47d65721 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I14345192d06a8a0ac9000feab6daea0f11b41f72
Diffstat (limited to 'src/plugins/sensors/ios/iosaccelerometer.mm')
-rw-r--r-- | src/plugins/sensors/ios/iosaccelerometer.mm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/plugins/sensors/ios/iosaccelerometer.mm b/src/plugins/sensors/ios/iosaccelerometer.mm index a497d7b4..2d2e27ae 100644 --- a/src/plugins/sensors/ios/iosaccelerometer.mm +++ b/src/plugins/sensors/ios/iosaccelerometer.mm @@ -46,6 +46,8 @@ char const * const IOSAccelerometer::id("ios.accelerometer"); QT_BEGIN_NAMESPACE +int IOSAccelerometer::s_startCount = 0; + IOSAccelerometer::IOSAccelerometer(QSensor *sensor) : QSensorBackend(sensor) , m_motionManager([QIOSMotionManager sharedManager]) @@ -58,16 +60,24 @@ IOSAccelerometer::IOSAccelerometer(QSensor *sensor) void IOSAccelerometer::start() { + if (m_timer != 0) + return; + int hz = sensor()->dataRate(); m_timer = startTimer(1000 / (hz == 0 ? 60 : hz)); - [m_motionManager startAccelerometerUpdates]; + if (++s_startCount == 1) + [m_motionManager startAccelerometerUpdates]; } void IOSAccelerometer::stop() { - [m_motionManager stopAccelerometerUpdates]; + if (m_timer == 0) + return; + killTimer(m_timer); m_timer = 0; + if (--s_startCount == 0) + [m_motionManager stopAccelerometerUpdates]; } void IOSAccelerometer::timerEvent(QTimerEvent *) |