MediaMetadatasStructures: switch MetadatasMap from map to vector<pair>

Clement Champetier · Clement Champetier · commit 23b044664820 · 2014-08-12T10:48:48.000+02:00
* Use the typedef as ofter as possible.
* This structure will enable us to give the data with the order we want
(which is not the alphabetic order).
diff --git a/src/AvTranscoder/Metadatas/MediaMetadatasStructures.cpp b/src/AvTranscoder/Metadatas/MediaMetadatasStructures.cpp
@@ -1,6 +1,7 @@
 #include "MediaMetadatasStructures.hpp"
 
 #include <sstream>
+#include <utility>
 
 namespace avtranscoder
 {
@@ -13,19 +14,20 @@ void add( MetadatasMap& dataMap, const std::string& key, const T& value )
 {
 	std::stringstream ss;
 	ss << value;
-	dataMap[key]= ss.str();
+	add( dataMap, key, ss.str() );
 }
 
 template<>
 void add( MetadatasMap& dataMap, const std::string& key, const std::string& value )
 {
-	dataMap[key]= value;
+	dataMap.push_back( std::pair<std::string, std::string>( key, value ) );
 }
 
 template<>
 void add( MetadatasMap& dataMap, const std::string& key, const bool& value )
 {
-	dataMap[key]= ( value ? "True" : "False" );
+	add( dataMap, key, value ? "True" : "False" );
+}
 }
 
 }
diff --git a/src/AvTranscoder/Metadatas/MediaMetadatasStructures.hpp b/src/AvTranscoder/Metadatas/MediaMetadatasStructures.hpp
@@ -13,7 +13,7 @@ namespace avtranscoder
 /**
  * @brief Can get all data of Properties structures by getDataMap(), which return a MetadatasMap.
  */
-typedef std::map<std::string, std::string> MetadatasMap;
+typedef std::vector< std::pair<std::string, std::string> > MetadatasMap;
 
 struct Channel
 {
@@ -150,7 +150,7 @@ struct Properties
 	std::vector< AttachementProperties > attachementStreams;
 	std::vector< UnknownProperties >     unknownStreams;
 
-	std::vector< std::pair< std::string, std::string > > metadatas; // ( key, value )
+	MetadatasMap metadatas;
 
 public:
 	MetadatasMap getDataMap() const;
diff --git a/src/AvTranscoder/Metadatas/Print.hpp b/src/AvTranscoder/Metadatas/Print.hpp
@@ -19,8 +19,8 @@ std::ostream& operator<<( std::ostream& flux, const Properties& properties )
 	flux << std::left;
 	flux << separator << " Wrapper " << separator << std::endl;
 
-	std::map<std::string, std::string> dataMap = properties.getDataMap();
-	for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
+	MetadatasMap dataMap = properties.getDataMap();
+	for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
 	}
@@ -33,8 +33,8 @@ std::ostream& operator<<( std::ostream& flux, const VideoProperties& videoProper
 	flux << std::left;
 	flux << separator << " Video stream " << separator << std::endl;
 
-	std::map<std::string, std::string> dataMap = videoProperties.getDataMap();
-	for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
+	MetadatasMap dataMap = videoProperties.getDataMap();
+	for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
 	}
@@ -47,8 +47,8 @@ std::ostream& operator<<( std::ostream& flux, const AudioProperties& audioProper
 	flux << std::left;
 	flux << separator << " Audio stream " << separator << std::endl;
 
-	std::map<std::string, std::string> dataMap = audioProperties.getDataMap();
-	for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
+	MetadatasMap dataMap = audioProperties.getDataMap();
+	for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
 	}
@@ -60,8 +60,8 @@ std::ostream& operator<<( std::ostream& flux, const DataProperties& dataProperti
 {
 	flux << separator << " Data stream " << separator << std::endl;
 
-	std::map<std::string, std::string> dataMap = dataProperties.getDataMap();
-	for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
+	MetadatasMap dataMap = dataProperties.getDataMap();
+	for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
 	}
@@ -73,8 +73,8 @@ std::ostream& operator<<( std::ostream& flux, const SubtitleProperties& subtitle
 {
 	flux << separator << " Subtitle stream " << separator << std::endl;
 
-	std::map<std::string, std::string> dataMap = subtitleProperties.getDataMap();
-	for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
+	MetadatasMap dataMap = subtitleProperties.getDataMap();
+	for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
 	}
@@ -86,8 +86,8 @@ std::ostream& operator<<( std::ostream& flux, const AttachementProperties& attac
 {
 	flux << separator << " Attachement stream " << separator << std::endl;
 
-	std::map<std::string, std::string> dataMap = attachementProperties.getDataMap();
-	for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
+	MetadatasMap dataMap = attachementProperties.getDataMap();
+	for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
 	}
@@ -99,8 +99,8 @@ std::ostream& operator<<( std::ostream& flux, const UnknownProperties& unknownPr
 {
 	flux << separator << " Unknown stream " << separator << std::endl;
 
-	std::map<std::string, std::string> dataMap = unknownProperties.getDataMap();
-	for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
+	MetadatasMap dataMap = unknownProperties.getDataMap();
+	for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )
 	{
 		flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#include "MediaMetadatasStructures.hpp"`
`2`	`2`
`3`	`3`	`#include <sstream>`
	`4`	`+#include <utility>`
`4`	`5`
`5`	`6`	`namespace avtranscoder`
`6`	`7`	`{`
`@@ -13,19 +14,20 @@ void add( MetadatasMap& dataMap, const std::string& key, const T& value )`
`13`	`14`	`{`
`14`	`15`	`std::stringstream ss;`
`15`	`16`	`ss << value;`
`16`		`- dataMap[key]= ss.str();`
	`17`	`+ add( dataMap, key, ss.str() );`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`template<>`
`20`	`21`	`void add( MetadatasMap& dataMap, const std::string& key, const std::string& value )`
`21`	`22`	`{`
`22`		`- dataMap[key]= value;`
	`23`	`+ dataMap.push_back( std::pair<std::string, std::string>( key, value ) );`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`template<>`
`26`	`27`	`void add( MetadatasMap& dataMap, const std::string& key, const bool& value )`
`27`	`28`	`{`
`28`		`- dataMap[key]= ( value ? "True" : "False" );`
	`29`	`+ add( dataMap, key, value ? "True" : "False" );`
	`30`	`+}`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ std::ostream& operator<<( std::ostream& flux, const Properties& properties )`
`19`	`19`	`flux << std::left;`
`20`	`20`	`flux << separator << " Wrapper " << separator << std::endl;`
`21`	`21`
`22`		`- std::map<std::string, std::string> dataMap = properties.getDataMap();`
`23`		`- for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
	`22`	`+ MetadatasMap dataMap = properties.getDataMap();`
	`23`	`+ for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
`24`	`24`	`{`
`25`	`25`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`26`	`26`	`}`
`@@ -33,8 +33,8 @@ std::ostream& operator<<( std::ostream& flux, const VideoProperties& videoProper`
`33`	`33`	`flux << std::left;`
`34`	`34`	`flux << separator << " Video stream " << separator << std::endl;`
`35`	`35`
`36`		`- std::map<std::string, std::string> dataMap = videoProperties.getDataMap();`
`37`		`- for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
	`36`	`+ MetadatasMap dataMap = videoProperties.getDataMap();`
	`37`	`+ for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
`38`	`38`	`{`
`39`	`39`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`40`	`40`	`}`
`@@ -47,8 +47,8 @@ std::ostream& operator<<( std::ostream& flux, const AudioProperties& audioProper`
`47`	`47`	`flux << std::left;`
`48`	`48`	`flux << separator << " Audio stream " << separator << std::endl;`
`49`	`49`
`50`		`- std::map<std::string, std::string> dataMap = audioProperties.getDataMap();`
`51`		`- for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
	`50`	`+ MetadatasMap dataMap = audioProperties.getDataMap();`
	`51`	`+ for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
`52`	`52`	`{`
`53`	`53`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`54`	`54`	`}`
`@@ -60,8 +60,8 @@ std::ostream& operator<<( std::ostream& flux, const DataProperties& dataProperti`
`60`	`60`	`{`
`61`	`61`	`flux << separator << " Data stream " << separator << std::endl;`
`62`	`62`
`63`		`- std::map<std::string, std::string> dataMap = dataProperties.getDataMap();`
`64`		`- for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
	`63`	`+ MetadatasMap dataMap = dataProperties.getDataMap();`
	`64`	`+ for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
`65`	`65`	`{`
`66`	`66`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`67`	`67`	`}`
`@@ -73,8 +73,8 @@ std::ostream& operator<<( std::ostream& flux, const SubtitleProperties& subtitle`
`73`	`73`	`{`
`74`	`74`	`flux << separator << " Subtitle stream " << separator << std::endl;`
`75`	`75`
`76`		`- std::map<std::string, std::string> dataMap = subtitleProperties.getDataMap();`
`77`		`- for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
	`76`	`+ MetadatasMap dataMap = subtitleProperties.getDataMap();`
	`77`	`+ for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
`78`	`78`	`{`
`79`	`79`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`80`	`80`	`}`
`@@ -86,8 +86,8 @@ std::ostream& operator<<( std::ostream& flux, const AttachementProperties& attac`
`86`	`86`	`{`
`87`	`87`	`flux << separator << " Attachement stream " << separator << std::endl;`
`88`	`88`
`89`		`- std::map<std::string, std::string> dataMap = attachementProperties.getDataMap();`
`90`		`- for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
	`89`	`+ MetadatasMap dataMap = attachementProperties.getDataMap();`
	`90`	`+ for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
`91`	`91`	`{`
`92`	`92`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`93`	`93`	`}`
`@@ -99,8 +99,8 @@ std::ostream& operator<<( std::ostream& flux, const UnknownProperties& unknownPr`
`99`	`99`	`{`
`100`	`100`	`flux << separator << " Unknown stream " << separator << std::endl;`
`101`	`101`
`102`		`- std::map<std::string, std::string> dataMap = unknownProperties.getDataMap();`
`103`		`- for( std::map<std::string, std::string>::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
	`102`	`+ MetadatasMap dataMap = unknownProperties.getDataMap();`
	`103`	`+ for( MetadatasMap::iterator it = dataMap.begin(); it != dataMap.end(); ++it )`
`104`	`104`	`{`
`105`	`105`	`flux << std::setw( keyWidth ) << it->first << ": " << it->second << std::endl;`
`106`	`106`	`}`