From b256886a5cb9f2ae3ebda70a2045b19ed9f4233e Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 3 Dec 2017 22:23:08 +0100 Subject: api: add status check for modules --- tracker-rift-080/ftnoir_tracker_rift_080.cpp | 10 +++------- tracker-rift-080/ftnoir_tracker_rift_080.h | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'tracker-rift-080') diff --git a/tracker-rift-080/ftnoir_tracker_rift_080.cpp b/tracker-rift-080/ftnoir_tracker_rift_080.cpp index 00f3d5b3..4d351dbc 100644 --- a/tracker-rift-080/ftnoir_tracker_rift_080.cpp +++ b/tracker-rift-080/ftnoir_tracker_rift_080.cpp @@ -35,7 +35,7 @@ rift_tracker_080::~rift_tracker_080() ovr_Shutdown(); } -void rift_tracker_080::start_tracker(QFrame*) +module_status rift_tracker_080::start_tracker(QFrame*) { ovrResult code; ovrGraphicsLuid luid = {{0}}; @@ -52,7 +52,7 @@ void rift_tracker_080::start_tracker(QFrame*) ovrTrackingCap_Orientation | ovrTrackingCap_MagYawCorrection | ovrTrackingCap_Position, ovrTrackingCap_Orientation); - return; + return status_ok(); error: ovrErrorInfo err; err.Result = code; @@ -63,11 +63,7 @@ error: if (strerror.size() == 0) strerror = "Unknown reason"; - QMessageBox::warning(nullptr, - "Error", - QStringLiteral("Unable to start Rift tracker: %1").arg(strerror), - QMessageBox::Ok, - QMessageBox::NoButton); + return error(strerror); } void rift_tracker_080::data(double *data) diff --git a/tracker-rift-080/ftnoir_tracker_rift_080.h b/tracker-rift-080/ftnoir_tracker_rift_080.h index e5ad9c3a..e7fccb5e 100644 --- a/tracker-rift-080/ftnoir_tracker_rift_080.h +++ b/tracker-rift-080/ftnoir_tracker_rift_080.h @@ -25,7 +25,7 @@ class rift_tracker_080 : public ITracker public: rift_tracker_080(); ~rift_tracker_080() override; - void start_tracker(QFrame *) override; + module_status start_tracker(QFrame *) override; void data(double *data) override; private: double old_yaw; -- cgit v1.2.3