util: updated NamesArray type

Clement Champetier · Clement Champetier · commit 96aed902c482 · 2016-03-09T17:46:05.000+01:00
It is a map instead of a vector (no need to manage duplicates!).
diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
@@ -127,7 +127,7 @@ NamesArray getAvailableFormatsNames()
         if(!fmt->name)
             continue;
 
-        formatsNames.push_back(
+        formatsNames.insert(
             std::make_pair(std::string(fmt->name), std::string(fmt->long_name ? fmt->long_name : "")));
     }
     return formatsNames;
@@ -145,14 +145,8 @@ NamesArray getAvailableVideoCodecsNames()
             if(!c->name)
                 continue;
 
-            std::pair<std::string, std::string> codecNames(std::string(c->name),
-                                                           std::string(c->long_name ? c->long_name : ""));
-
-            // skip duplicates
-            if(std::find(videoCodecsNames.begin(), videoCodecsNames.end(), codecNames) != videoCodecsNames.end())
-                continue;
-
-            videoCodecsNames.push_back(codecNames);
+            videoCodecsNames.insert(
+                std::make_pair(std::string(c->name), std::string(c->long_name ? c->long_name : "")));
         }
     }
     return videoCodecsNames;
@@ -170,14 +164,8 @@ NamesArray getAvailableAudioCodecsNames()
             if(!c->name)
                 continue;
 
-            const std::pair<std::string, std::string> codecNames(std::string(c->name),
-                                                           std::string(c->long_name ? c->long_name : ""));
-
-            // skip duplicates
-            if(std::find(audioCodecsNames.begin(), audioCodecsNames.end(), codecNames) != audioCodecsNames.end())
-                continue;
-
-            audioCodecsNames.push_back(codecNames);
+            audioCodecsNames.insert(
+                std::make_pair(std::string(c->name), std::string(c->long_name ? c->long_name : "")));
         }
     }
     return audioCodecsNames;
diff --git a/src/AvTranscoder/util.hpp b/src/AvTranscoder/util.hpp
@@ -17,7 +17,7 @@ namespace avtranscoder
 {
 
 typedef std::map<std::string, OptionArray> OptionArrayMap;
-typedef std::vector<std::pair<std::string, std::string> > NamesArray; //< short/long names of format/video codec/audio codec
+typedef std::map<std::string, std::string> NamesArray; //< short/long names of format/video codec/audio codec
 
 /**
  * @brief Check if a format name corresponds to the format of a given filename

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace avtranscoder`
`17`	`17`	`{`
`18`	`18`
`19`	`19`	`typedef std::map<std::string, OptionArray> OptionArrayMap;`
`20`		`-typedef std::vector<std::pair<std::string, std::string> > NamesArray; //< short/long names of format/video codec/audio codec`
	`20`	`+typedef std::map<std::string, std::string> NamesArray; //< short/long names of format/video codec/audio codec`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* @brief Check if a format name corresponds to the format of a given filename`