Changeset 288 in pacpusframework for trunk/src/DBITEPlayerLib/DbtPlyEngine.cpp

Timestamp:

03/26/14 21:27:30 (10 years ago)

Author:

Marek Kurdej

Message:

Using boost::shared_ptr for storing components.

File:

• trunk/src/DBITEPlayerLib/DbtPlyEngine.cpp (modified) (7 diffs)

trunk/src/DBITEPlayerLib/DbtPlyEngine.cpp

@@ -10 +10 @@
 #include <Pacpus/kernel/Log.h>
 
-#include <cassert>
+#include <boost/assert.hpp>
 #include <limits>
 #include <QDir>
@@ -226 +226 @@
 void DbtPlyEngine::playEvent()
 {
+    using boost::dynamic_pointer_cast;
+
     LOG_DEBUG("Clicked: play");
 
     // get user interface
     ComponentManager * mgr = ComponentManager::getInstance();
-    DbtPlyUserInterface * ui = dynamic_cast<DbtPlyUserInterface *>(mgr->getComponent("dbiteUserInterface"));
-    assert(ui);
+    boost::shared_ptr<DbtPlyUserInterface> ui = dynamic_pointer_cast<DbtPlyUserInterface>(mgr->getComponent("dbiteUserInterface"));
+    BOOST_ASSERT(ui);
     // get time value from slider
     lastTDbt_ = ui->getTime() + tDbtMin_;
@@ -268 +270 @@
 void DbtPlyEngine::setState(DbtPlyEngineState * newState)
 {
-    assert(newState);
+    BOOST_ASSERT(newState);
     LOG_DEBUG(mCurrentState->toString() << " => " << newState->toString());
     mCurrentState = newState;
@@ -284 +286 @@
         mSpeed = kMaxSpeed;
     }
-    assert(kMinSpeed <= mSpeed);
-    assert(mSpeed <= kMaxSpeed);
+    BOOST_ASSERT(kMinSpeed <= mSpeed);
+    BOOST_ASSERT(mSpeed <= kMaxSpeed);
     LOG_INFO("event: Speed Up, speed = " << mSpeed);
     Q_EMIT displayStateSig(mCurrentState, mSpeed);
@@ -296 +298 @@
         mSpeed = kMinSpeed;
     }
-    assert(kMinSpeed <= mSpeed);
-    assert(mSpeed <= kMaxSpeed);
+    BOOST_ASSERT(kMinSpeed <= mSpeed);
+    BOOST_ASSERT(mSpeed <= kMaxSpeed);
     LOG_INFO("event: Speed Up, speed = " << mSpeed);
     Q_EMIT displayStateSig(mCurrentState, mSpeed);
@@ -304 +306 @@
 void DbtPlyEngine::reset()
 {
+    using boost::dynamic_pointer_cast;
+
     lastTNow_ = road_time();
     lastTDbt_ = tDbtMin_;
@@ -311 +315 @@
     // get user interface
     ComponentManager * mgr = ComponentManager::getInstance();
-    DbtPlyUserInterface * ui = dynamic_cast<DbtPlyUserInterface *>(mgr->getComponent("dbiteUserInterface"));
-    assert(ui);
+    boost::shared_ptr<DbtPlyUserInterface> ui = dynamic_pointer_cast<DbtPlyUserInterface>(mgr->getComponent("dbiteUserInterface"));
+    BOOST_ASSERT(ui);
     // reset time value of the slider
     ui->resetTime();