separate pytwrpper from predictorWrappery

[trackerpp.git] / src / Engine.cpp

diff --git a/src/Engine.cpp b/src/Engine.cpp
index 4f67103..fbdf337 100644 (file)
--- a/src/Engine.cpp
+++ b/src/Engine.cpp
@@ -14,14 +14,13 @@ static EngineWPtr g_instance;
 
 typedef std::shared_ptr<std::vector<Person>> PersonsInfoPtr;
 
-// class Engine
 EnginePtr Engine::create()
 {
     LOG_DEBUG(TAG, "create");
     std::lock_guard<std::mutex> lock(g_mutex);
     if (g_instance.lock()){
         LOG_ERROR(TAG, "already exists");
-        return EnginePtr(); // nullptr
+        return EnginePtr();
     }
     EnginePtr instance (new Engine());
     g_instance = instance;
@@ -30,7 +29,8 @@ EnginePtr Engine::create()
 
 Engine::Engine()
 {
-    detector = std::make_shared<Detector>();
+    //detector = std::make_shared<Detector>();
+    detector = DetectorPtr(new Detector());
 }
 
 Engine::~Engine()
@@ -47,7 +47,6 @@ void Engine::destroy()
     observer_list.clear();
 }
 
-
 void Engine::setVideoSrc(VideoSrcType type, const std::string& url)
 {
     reader = VideoReaderFactory::createVideoReader(type, url);
@@ -79,6 +78,7 @@ void Engine::start()
 
 void Engine::addObserver(EngineObserver *observer)
 {
+    LOG_DEBUG(TAG, "addObserver");
     observer_list.insert(observer);
 }
 
@@ -118,21 +118,14 @@ private:
 
 void Engine::onPersonsOut(const std::vector<Person>& p)
 {
+    LOG_DEBUG(TAG, "onPersonOut");
     PersonsInfoPtr pp = std::make_shared<std::vector<Person>>(p);
     eventThread.enqueue(new PersonOutEventWorkItem(this->observer_list, pp));
 }
 
 void Engine::onPersonsIn(const std::vector<Person>& p)
 {
+    LOG_DEBUG(TAG, "onPersonIn");
     PersonsInfoPtr pp = std::make_shared<std::vector<Person>>(p);
     eventThread.enqueue(new PersonInEventWorkItem(this->observer_list, pp));
 }
-
-void Engine::onStatusChanged()
-{
-    Person pm, p2;
-    std::vector<Person> ps;
-    ps.push_back(pm);
-    ps.push_back(p2);
-    onPersonsOut(ps);
-}