summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors/winrt/winrtrotationsensor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/sensors/winrt/winrtrotationsensor.cpp')
-rw-r--r--src/plugins/sensors/winrt/winrtrotationsensor.cpp42
1 files changed, 26 insertions, 16 deletions
diff --git a/src/plugins/sensors/winrt/winrtrotationsensor.cpp b/src/plugins/sensors/winrt/winrtrotationsensor.cpp
index 93c19b0a..570ef0bb 100644
--- a/src/plugins/sensors/winrt/winrtrotationsensor.cpp
+++ b/src/plugins/sensors/winrt/winrtrotationsensor.cpp
@@ -38,7 +38,9 @@
#include "winrtcommon.h"
#include <QtSensors/QRotationSensor>
+#include <private/qeventdispatcher_winrt_p.h>
+#include <functional>
#include <wrl.h>
#include <windows.devices.sensors.h>
using namespace Microsoft::WRL;
@@ -109,20 +111,24 @@ WinRtRotationSensor::WinRtRotationSensor(QSensor *sensor)
: QSensorBackend(sensor), d_ptr(new WinRtRotationSensorPrivate(this))
{
Q_D(WinRtRotationSensor);
- HStringReference classId(RuntimeClass_Windows_Devices_Sensors_Inclinometer);
- ComPtr<IInclinometerStatics> factory;
- HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
- if (FAILED(hr)) {
- qCWarning(lcWinRtSensors) << "Unable to initialize rotation sensor factory."
- << qt_error_string(hr);
- sensorError(hr);
- return;
- }
+ HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+ HStringReference classId(RuntimeClass_Windows_Devices_Sensors_Inclinometer);
+ ComPtr<IInclinometerStatics> factory;
+ HRESULT hr = RoGetActivationFactory(classId.Get(), IID_PPV_ARGS(&factory));
+ if (FAILED(hr)) {
+ qCWarning(lcWinRtSensors) << "Unable to initialize rotation sensor factory."
+ << qt_error_string(hr);
+ return hr;
+ }
- hr = factory->GetDefault(&d->sensor);
+ hr = factory->GetDefault(&d->sensor);
+ if (FAILED(hr)) {
+ qCWarning(lcWinRtSensors) << "Unable to get default rotation sensor."
+ << qt_error_string(hr);
+ }
+ return hr;
+ });
if (FAILED(hr) || !d->sensor) {
- qCWarning(lcWinRtSensors) << "Unable to get default rotation sensor."
- << qt_error_string(hr);
sensorError(hr);
return;
}
@@ -153,9 +159,11 @@ void WinRtRotationSensor::start()
if (d->token.value)
return;
- ComPtr<InclinometerReadingHandler> callback =
+ HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+ ComPtr<InclinometerReadingHandler> callback =
Callback<InclinometerReadingHandler>(d, &WinRtRotationSensorPrivate::readingChanged);
- HRESULT hr = d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+ return d->sensor->add_ReadingChanged(callback.Get(), &d->token);
+ });
if (FAILED(hr)) {
qCWarning(lcWinRtSensors) << "Unable to attach to reading changed event."
<< qt_error_string(hr);
@@ -184,14 +192,16 @@ void WinRtRotationSensor::stop()
if (!d->token.value)
return;
- HRESULT hr = d->sensor->remove_ReadingChanged(d->token);
+ HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+ return d->sensor->remove_ReadingChanged(d->token);
+ });
if (FAILED(hr)) {
qCWarning(lcWinRtSensors) << "Unable to detach from reading changed event."
<< qt_error_string(hr);
sensorError(hr);
return;
}
- d->sensor->put_ReportInterval(0);
+ hr = d->sensor->put_ReportInterval(0);
if (FAILED(hr)) {
qCWarning(lcWinRtSensors) << "Unable to reset report interval."
<< qt_error_string(hr);