Merge pull request #36 from cchampet/fix_optionLoader_2

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 323f28b62cd1 · 2014-07-31T15:25:01.000+02:00
Fix OptionLoader
diff --git a/src/AvTranscoder/Option.hpp b/src/AvTranscoder/Option.hpp
@@ -24,7 +24,7 @@ enum OptionType
 	TypeRatio,
 	TypeChoice,
 	TypeGroup,
-	TypeChild, // Option which brelongs to Choice or Group
+	TypeChild, // Option which belongs to Choice or Group
 	TypeUnknown
 };
 
diff --git a/src/AvTranscoder/OptionLoader.cpp b/src/AvTranscoder/OptionLoader.cpp
@@ -223,7 +223,7 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla
 {
 	OptionArray options;
 	
-	std::map<std::string, int> optionUnitToIndex;
+	std::multimap<std::string, int> optionUnitToIndex;
 	std::vector<Option> childOptions;
 	
 	const AVOption* avOption = NULL;
@@ -244,8 +244,6 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla
 
 		OptionType optionType = Option::getTypeFromAVOption( avOption->unit, avOption->type );
 
-		//std::cout << "The option is " << avOption->name << " of type : " << avOption->type << std::endl;
-
 		if( optionType == TypeChild )
 		{
 			childOptions.push_back( Option( *avOption, optionType ) );
@@ -262,19 +260,25 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla
 	}
 
 	// iterate on child options
-	for( std::vector<Option>::iterator it = childOptions.begin(); it != childOptions.end(); ++it )
+	for( std::vector<Option>::iterator itOption = childOptions.begin(); itOption != childOptions.end(); ++itOption )
 	{
-		int indexParentOption = optionUnitToIndex.at( it->getUnit() );
-		Option& parentOption = options.at( indexParentOption );
-		
-		parentOption.appendChild( *it );
-		
-		// child of a Choice
-		if( parentOption.getType() == TypeChoice )
+		for( std::multimap<std::string, int>::iterator itUnit = optionUnitToIndex.begin(); itUnit != optionUnitToIndex.end(); ++itUnit )
 		{
-			if( it->getDefaultValueInt() == parentOption.getDefaultValueInt() )
-				parentOption.setDefaultChildIndex( parentOption.getNbChilds() - 1 );
-		}
+			if( itUnit->first == itOption->getUnit() )
+			{
+				int indexParentOption = itUnit->second;
+				Option& parentOption = options.at( indexParentOption );
+
+				parentOption.appendChild( *itOption );
+
+				// child of a Choice
+				if( parentOption.getType() == TypeChoice )
+				{
+					if( itOption->getDefaultValueInt() == parentOption.getDefaultValueInt() )
+						parentOption.setDefaultChildIndex( parentOption.getNbChilds() - 1 );
+				}
+			}
+        }
 	}
 	return options;
 }
