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-140/rift-140.cpp | 10 +++------- tracker-rift-140/rift-140.hpp | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'tracker-rift-140') diff --git a/tracker-rift-140/rift-140.cpp b/tracker-rift-140/rift-140.cpp index ebcc7654..9880cb1e 100644 --- a/tracker-rift-140/rift-140.cpp +++ b/tracker-rift-140/rift-140.cpp @@ -35,7 +35,7 @@ rift_tracker_140::~rift_tracker_140() } } -void rift_tracker_140::start_tracker(QFrame*) +module_status rift_tracker_140::start_tracker(QFrame*) { if (OVR_FAILURE(ovr_Initialize(nullptr))) goto error; @@ -43,7 +43,7 @@ void rift_tracker_140::start_tracker(QFrame*) if(OVR_FAILURE(ovr_Create(&hmd, &luid))) goto error; - return; + return status_ok(); error: hmd = nullptr; @@ -56,11 +56,7 @@ error: ovr_Shutdown(); - QMessageBox::warning(nullptr, - "Error", - QCoreApplication::translate("rift_tracker_140", "Unable to start Rift tracker: %1").arg(strerror), - QMessageBox::Ok, - QMessageBox::NoButton); + return error(strerror); } void rift_tracker_140::data(double *data) diff --git a/tracker-rift-140/rift-140.hpp b/tracker-rift-140/rift-140.hpp index 47eb7cd2..13bebed4 100644 --- a/tracker-rift-140/rift-140.hpp +++ b/tracker-rift-140/rift-140.hpp @@ -25,7 +25,7 @@ class rift_tracker_140 : public ITracker public: rift_tracker_140(); ~rift_tracker_140() 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