OptionLoader: fix loadOptions

Clement Champetier · Clement Champetier · commit 5c13b9c2b5f6 · 2014-07-31T15:17:19.000+02:00
* Fix bug when get several child options with the same unit.
* Solution: use multimap instead of map.
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;
@@ -262,19 +262,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;
 }
