Make module instances unique ptrs

This commit is contained in:
jfmcarreira committed 2021-09-04 13:57:12 +01:00
1 parent 8ef5b31268
commit 463e1a58b9
10 files changed
+34 -43

No files matched your search

+2 -4
View File
@@ -47,11 +47,10 @@
#include <vector>
#include "CalypToolsCmdParser.h"
#include "lib/CalypFrame.h"
#include "lib/CalypModuleIf.h"
class CalypFrame;
class CalypStream;
class CalypModuleIf;
#define MAX_NUMBER_INPUTS 255
#define MAX_NUMBER_CHANNELS 4
@@ -101,8 +100,7 @@ private:
int m_uiQualityMetric;
int QualityOperation();
CalypModuleIf* m_pcCurrModuleIf;
//CalypFrame* applyFrameModule();
CalypModulePtr m_pcCurrModuleIf;
int ModuleOperation();
int ListStatistics();
};
+2 -5
View File
@@ -110,7 +110,6 @@ int CalypToolsCmdParser::parseToolsArgs( int argc, char* argv[] )
void CalypToolsCmdParser::listModuleHelp()
{
ClpString moduleName = m_strModule;
CalypModuleIf* pcCurrModuleIf = NULL;
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
@@ -118,10 +117,10 @@ void CalypToolsCmdParser::listModuleHelp()
{
if( strcmp( it->first, moduleName.c_str() ) == 0 )
{
pcCurrModuleIf = it->second();
break;
}
}
auto pcCurrModuleIf = it->second();
if( pcCurrModuleIf )
{
printf( "Usage: calypTools --module=%s options:\n", it->first );
@@ -136,7 +135,6 @@ void CalypToolsCmdParser::listModules()
if( m_cOptions.hasOpt( "module_list_full" ) )
bDetailed = true;
CalypModuleIf* pcCurrModuleIf;
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
@@ -157,7 +155,7 @@ void CalypToolsCmdParser::listModules()
if( bDetailed )
{
ClpString ModuleNameString;
pcCurrModuleIf = it->second();
auto pcCurrModuleIf = it->second();
if( pcCurrModuleIf->m_pchModuleCategory )
{
@@ -176,7 +174,6 @@ void CalypToolsCmdParser::listModules()
break;
}
printf( " %s", pcCurrModuleIf->m_pchModuleTooltip );
pcCurrModuleIf->Delete();
}
printf( "\n" );
}