From 6865de57d4b71ca0a856fcb96579671ff28c5ae5 Mon Sep 17 00:00:00 2001 From: Ankush Jain Date: Mon, 15 Jul 2024 18:22:31 +0530 Subject: [PATCH] changed the function args from pipeline object to name --- base/include/AbsControlModule.h | 4 ++-- base/src/AbsControlModule.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/base/include/AbsControlModule.h b/base/include/AbsControlModule.h index 675c37a6c..ad8aa6b34 100644 --- a/base/include/AbsControlModule.h +++ b/base/include/AbsControlModule.h @@ -15,9 +15,9 @@ class AbsControlModule : public Module { ~AbsControlModule(); bool init(); bool term(); - std::string enrollModule(boost::shared_ptr p, std::string role, + std::string enrollModule(std::string pName, std::string role, boost::shared_ptr module); - std::pair> getModuleofRole(PipeLine p, + std::pair> getModuleofRole(std::string pName, std::string role); virtual void handleMp4MissingVideotrack(std::string previousVideoFile, std::string nextVideoFile) {} virtual void handleMMQExport(Command cmd, bool priority = false) {} diff --git a/base/src/AbsControlModule.cpp b/base/src/AbsControlModule.cpp index 298cc9e1b..01bbefce6 100644 --- a/base/src/AbsControlModule.cpp +++ b/base/src/AbsControlModule.cpp @@ -60,12 +60,12 @@ bool AbsControlModule::process(frame_container& frames) return true; } -std::string AbsControlModule::enrollModule(boost::shared_ptr p, std::string role, boost::shared_ptr module) +std::string AbsControlModule::enrollModule(std::string pName, std::string role, boost::shared_ptr module) { - std::string pipelineRole = mDetail->getPipelineRole(p->getName(), role); + std::string pipelineRole = mDetail->getPipelineRole(pName, role); if (moduleRoles.find(pipelineRole) != moduleRoles.end()) { - std::string errMsg = "Enrollment Failed: This role <" + role + "> already registered with the Module <" + moduleRoles[pipelineRole]->getName() + "> in PipeLine <" + p->getName() + ">"; + std::string errMsg = "Enrollment Failed: This role <" + role + "> already registered with the Module <" + moduleRoles[pipelineRole]->getName() + "> in PipeLine <" + pName + ">"; LOG_ERROR << errMsg; throw AIPException(MODULE_ENROLLMENT_FAILED, errMsg); } @@ -73,9 +73,9 @@ std::string AbsControlModule::enrollModule(boost::shared_ptr p, std::s return pipelineRole; } -std::pair> AbsControlModule::getModuleofRole(PipeLine p, std::string role) +std::pair> AbsControlModule::getModuleofRole(std::string pName, std::string role) { - std::string pipelineRole = mDetail->getPipelineRole(p.getName(), role); + std::string pipelineRole = mDetail->getPipelineRole(pName, role); if (moduleRoles.find(pipelineRole) == moduleRoles.end()) { return std::make_pair>(false, nullptr);