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/iosmagnetometer.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/iosmagnetometer.mm')
-rw-r--r-- | src/plugins/sensors/ios/iosmagnetometer.mm | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/src/plugins/sensors/ios/iosmagnetometer.mm b/src/plugins/sensors/ios/iosmagnetometer.mm index 6bbad60b..98bef2dd 100644 --- a/src/plugins/sensors/ios/iosmagnetometer.mm +++ b/src/plugins/sensors/ios/iosmagnetometer.mm @@ -44,6 +44,9 @@ QT_BEGIN_NAMESPACE char const * const IOSMagnetometer::id("ios.magnetometer"); +int IOSMagnetometer::s_magnetometerStartCount = 0; +int IOSMagnetometer::s_deviceMotionStartCount = 0; + IOSMagnetometer::IOSMagnetometer(QSensor *sensor) : QSensorBackend(sensor) , m_motionManager([QIOSMotionManager sharedManager]) @@ -61,24 +64,37 @@ IOSMagnetometer::IOSMagnetometer(QSensor *sensor) void IOSMagnetometer::start() { + if (m_timer != 0) + return; + int hz = sensor()->dataRate(); m_timer = startTimer(1000 / (hz == 0 ? 60 : hz)); m_returnGeoValues = static_cast<QMagnetometer *>(sensor())->returnGeoValues(); - if (m_returnGeoValues) - [m_motionManager startDeviceMotionUpdates]; - else - [m_motionManager startMagnetometerUpdates]; + if (m_returnGeoValues) { + if (++s_deviceMotionStartCount == 1) + [m_motionManager startDeviceMotionUpdates]; + } else { + if (++s_magnetometerStartCount == 1) + [m_motionManager startMagnetometerUpdates]; + } } void IOSMagnetometer::stop() { - if (m_returnGeoValues) - [m_motionManager stopDeviceMotionUpdates]; - else - [m_motionManager stopMagnetometerUpdates]; + if (m_timer == 0) + return; + killTimer(m_timer); m_timer = 0; + + if (m_returnGeoValues) { + if (--s_deviceMotionStartCount == 0) + [m_motionManager stopDeviceMotionUpdates]; + } else { + if (--s_magnetometerStartCount == 0) + [m_motionManager stopMagnetometerUpdates]; + } } void IOSMagnetometer::timerEvent(QTimerEvent *) |