From c86a5faf70703ce3c4736591a3a5d78bc1bbcc0b Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Tue, 24 Feb 2015 03:16:45 +0000
Subject: [PATCH] Fix module list

---
 tools/CommandLineHandle.cpp | 65 ++++++++++++++++++++++---------------
 tools/PlaYUVerTools.cpp     |  1 +
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/tools/CommandLineHandle.cpp b/tools/CommandLineHandle.cpp
index 18ac1e1..0c60759 100644
--- a/tools/CommandLineHandle.cpp
+++ b/tools/CommandLineHandle.cpp
@@ -52,8 +52,9 @@ Int CommandLineHandle::parseToolsArgs()
 
   po::options_description moduleOpts( "Module" );
   moduleOpts.add_options() /**/
-  ( "module", po::value<std::string>(), "select a module" ) /**/
-  ( "module_list", "list supported modules" );
+  ( "module", po::value<std::string>(), "select a module (use internal name)" ) /**/
+  ( "module_list", "list supported modules" ) /**/
+  ( "module_list_full", "detailed list supported modules" );
 
   addOptions( qualityOpts );
   addOptions( moduleOpts );
@@ -73,7 +74,7 @@ Int CommandLineHandle::parseToolsArgs()
     iRet = 1;
   }
 
-  if( getOptionsMap().count( "module_list" ) )
+  if( getOptionsMap().count( "module_list" ) || getOptionsMap().count( "module_list_full" ) )
   {
     listModules();
     iRet = 1;
@@ -84,45 +85,57 @@ Int CommandLineHandle::parseToolsArgs()
 
 Void CommandLineHandle::listModules()
 {
+  Bool bDetailed = false;
+
+  if( getOptionsMap().count( "module_list_full" ) )
+    bDetailed = true;
+
   PlaYUVerModuleIf* pcCurrModuleIf;
   PlaYUVerModuleFactoryMap& PlaYUVerModuleFactoryMap = PlaYUVerModuleFactory::Get()->getMap();
   PlaYUVerModuleFactoryMap::iterator it = PlaYUVerModuleFactoryMap.begin();
 
   printf( "PlaYUVer available modules: \n" );
   //printf( "                                           " );
-  printf( "   [Name]                                  " );
-  printf( "   [Type]        " );
-  printf( "   [Description]" );
+  printf( "   [Internal Name]               " );
+  if( bDetailed )
+  {
+    printf( "   [Full Name]                             " );
+    printf( "   [Type]        " );
+    printf( "   [Description]" );
+  }
   printf( " \n" );
 
   Char ModuleNameString[40];
 
   for( UInt i = 0; it != PlaYUVerModuleFactoryMap.end(); ++it, i++ )
   {
-    ModuleNameString[0] = '\0';
-
-    pcCurrModuleIf = it->second();
-
     printf( "   " );
-    if( pcCurrModuleIf->m_pchModuleCategory )
+    printf( "%-30s", it->first );
+    if( bDetailed )
     {
-      strcat( ModuleNameString, pcCurrModuleIf->m_pchModuleCategory );
-      strcat( ModuleNameString, "/" );
+      ModuleNameString[0] = '\0';
+      pcCurrModuleIf = it->second();
+
+      if( pcCurrModuleIf->m_pchModuleCategory )
+      {
+        strcat( ModuleNameString, pcCurrModuleIf->m_pchModuleCategory );
+        strcat( ModuleNameString, "/" );
+      }
+      strcat( ModuleNameString, pcCurrModuleIf->m_pchModuleName );
+      printf( "   %-40s", ModuleNameString );
+      switch( pcCurrModuleIf->m_iModuleType )
+      {
+      case FRAME_PROCESSING_MODULE:
+        printf( "   Processing    " );
+        break;
+      case FRAME_MEASUREMENT_MODULE:
+        printf( "   Measurement   " );
+        break;
+      }
+      printf( "   %s", pcCurrModuleIf->m_pchModuleTooltip );
+      pcCurrModuleIf->Delete();
     }
-    strcat( ModuleNameString, pcCurrModuleIf->m_pchModuleName );
-    printf( "%-40s", ModuleNameString );
-    switch( pcCurrModuleIf->m_iModuleType )
-    {
-    case FRAME_PROCESSING_MODULE:
-      printf( "   Processing    " );
-      break;
-    case FRAME_MEASUREMENT_MODULE:
-      printf( "   Measurement   " );
-      break;
-    }
-    printf( "   %s", pcCurrModuleIf->m_pchModuleTooltip );
     printf( "\n" );
-    pcCurrModuleIf->Delete();
   }
 
 }
diff --git a/tools/PlaYUVerTools.cpp b/tools/PlaYUVerTools.cpp
index ab461a0..4f39716 100644
--- a/tools/PlaYUVerTools.cpp
+++ b/tools/PlaYUVerTools.cpp
@@ -319,6 +319,7 @@ Int PlaYUVerTools::ModuleOperation()
         abEOF[s] = m_apcInputStreams[s]->checkErrors( PlaYUVerStream::LAST_FRAME );
       }
     }
+
   }
 
   if( m_pcCurrModuleIf->m_iModuleType == FRAME_MEASUREMENT_MODULE )