ProfileLoader: renamed 'loadProfile' methods to 'addProfile'

Clement Champetier · Clement Champetier · commit 19663c361664 · 2016-07-20T16:48:30.000+02:00
diff --git a/src/AvTranscoder/profile/ProfileLoader.cpp b/src/AvTranscoder/profile/ProfileLoader.cpp
@@ -12,10 +12,10 @@ namespace avtranscoder
 ProfileLoader::ProfileLoader(const bool autoload)
 {
     if(autoload)
-        loadProfiles();
+        addProfiles();
 }
 
-void ProfileLoader::loadProfile(const std::string& avProfileFileName)
+void ProfileLoader::addProfile(const std::string& avProfileFileName)
 {
     std::ifstream infile;
     infile.open(avProfileFileName.c_str(), std::ifstream::in);
@@ -30,10 +30,10 @@ void ProfileLoader::loadProfile(const std::string& avProfileFileName)
         if(keyValue.size() == 2)
             customProfile[keyValue.at(0)] = keyValue.at(1);
     }
-    loadProfile(customProfile);
+    addProfile(customProfile);
 }
 
-void ProfileLoader::loadProfiles(const std::string& avProfilesPath)
+void ProfileLoader::addProfiles(const std::string& avProfilesPath)
 {
     std::string realAvProfilesPath = avProfilesPath;
     if(realAvProfilesPath.empty())
@@ -59,7 +59,7 @@ void ProfileLoader::loadProfiles(const std::string& avProfilesPath)
             const std::string absPath = (*dirIt) + "/" + (*fileIt);
             try
             {
-                loadProfile(absPath);
+                addProfile(absPath);
             }
             catch(const std::exception& e)
             {
@@ -69,7 +69,7 @@ void ProfileLoader::loadProfiles(const std::string& avProfilesPath)
     }
 }
 
-void ProfileLoader::loadProfile(const Profile& profile)
+void ProfileLoader::addProfile(const Profile& profile)
 {
     // check profile identificator
     if(!profile.count(constants::avProfileIdentificator))
diff --git a/src/AvTranscoder/profile/ProfileLoader.hpp b/src/AvTranscoder/profile/ProfileLoader.hpp
@@ -45,21 +45,21 @@ class AvExport ProfileLoader
     ProfileLoader(const bool autoload = true);
 
     /**
-     * @brief Load profiles from files in avProfilesPath directory
+     * @brief Add profiles from files in avProfilesPath directory
      * @param avProfilesPath: if empty, the path is replaced by value of AVPROFILES environment variable
      */
-    void loadProfiles(const std::string& avProfilesPath = "");
+    void addProfiles(const std::string& avProfilesPath = "");
 
     /**
-     * @brief Load the profile defines in the given file
+     * @brief Add the profile defines in the given file
      */
-    void loadProfile(const std::string& avProfileFileName);
+    void addProfile(const std::string& avProfileFileName);
 
     /**
-     * @brief Load the given profile
+     * @brief Add the given profile
      * @exception throw std::runtime_error if the profile is invalid
      */
-    void loadProfile(const Profile& profile);
+    void addProfile(const Profile& profile);
 
     bool hasProfile(const Profile& profile) const;
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -87,7 +87,7 @@ void Transcoder::addGeneratedStream(const ProfileLoader::Profile& encodingProfil
 {
     // Add profile
     if(!_profileLoader.hasProfile(encodingProfile))
-        _profileLoader.loadProfile(encodingProfile);
+        _profileLoader.addProfile(encodingProfile);
 
     LOG_INFO("Add generated stream with encodingProfile=" << encodingProfile.at(constants::avProfileIdentificatorHuman))
 
@@ -218,7 +218,7 @@ void Transcoder::addTranscodeStream(const std::vector<InputStreamDesc>& inputStr
 {
     // Add profile
     if(!_profileLoader.hasProfile(profile))
-        _profileLoader.loadProfile(profile);
+        _profileLoader.addProfile(profile);
 
     std::stringstream sources;
     for(size_t index = 0; index < inputStreamDescArray.size(); ++index)

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@ namespace avtranscoder`
`12`	`12`	`ProfileLoader::ProfileLoader(const bool autoload)`
`13`	`13`	`{`
`14`	`14`	`if(autoload)`
`15`		`- loadProfiles();`
	`15`	`+ addProfiles();`
`16`	`16`	`}`
`17`	`17`
`18`		`-void ProfileLoader::loadProfile(const std::string& avProfileFileName)`
	`18`	`+void ProfileLoader::addProfile(const std::string& avProfileFileName)`
`19`	`19`	`{`
`20`	`20`	`std::ifstream infile;`
`21`	`21`	`infile.open(avProfileFileName.c_str(), std::ifstream::in);`
`@@ -30,10 +30,10 @@ void ProfileLoader::loadProfile(const std::string& avProfileFileName)`
`30`	`30`	`if(keyValue.size() == 2)`
`31`	`31`	`customProfile[keyValue.at(0)] = keyValue.at(1);`
`32`	`32`	`}`
`33`		`- loadProfile(customProfile);`
	`33`	`+ addProfile(customProfile);`
`34`	`34`	`}`
`35`	`35`
`36`		`-void ProfileLoader::loadProfiles(const std::string& avProfilesPath)`
	`36`	`+void ProfileLoader::addProfiles(const std::string& avProfilesPath)`
`37`	`37`	`{`
`38`	`38`	`std::string realAvProfilesPath = avProfilesPath;`
`39`	`39`	`if(realAvProfilesPath.empty())`
`@@ -59,7 +59,7 @@ void ProfileLoader::loadProfiles(const std::string& avProfilesPath)`
`59`	`59`	`const std::string absPath = (dirIt) + "/" + (fileIt);`
`60`	`60`	`try`
`61`	`61`	`{`
`62`		`- loadProfile(absPath);`
	`62`	`+ addProfile(absPath);`
`63`	`63`	`}`
`64`	`64`	`catch(const std::exception& e)`
`65`	`65`	`{`
`@@ -69,7 +69,7 @@ void ProfileLoader::loadProfiles(const std::string& avProfilesPath)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`-void ProfileLoader::loadProfile(const Profile& profile)`
	`72`	`+void ProfileLoader::addProfile(const Profile& profile)`
`73`	`73`	`{`
`74`	`74`	`// check profile identificator`
`75`	`75`	`if(!profile.count(constants::avProfileIdentificator))`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ void Transcoder::addGeneratedStream(const ProfileLoader::Profile& encodingProfil`
`87`	`87`	`{`
`88`	`88`	`// Add profile`
`89`	`89`	`if(!_profileLoader.hasProfile(encodingProfile))`
`90`		`- _profileLoader.loadProfile(encodingProfile);`
	`90`	`+ _profileLoader.addProfile(encodingProfile);`
`91`	`91`
`92`	`92`	`LOG_INFO("Add generated stream with encodingProfile=" << encodingProfile.at(constants::avProfileIdentificatorHuman))`
`93`	`93`
`@@ -218,7 +218,7 @@ void Transcoder::addTranscodeStream(const std::vector<InputStreamDesc>& inputStr`
`218`	`218`	`{`
`219`	`219`	`// Add profile`
`220`	`220`	`if(!_profileLoader.hasProfile(profile))`
`221`		`- _profileLoader.loadProfile(profile);`
	`221`	`+ _profileLoader.addProfile(profile);`
`222`	`222`
`223`	`223`	`std::stringstream sources;`
`224`	`224`	`for(size_t index = 0; index < inputStreamDescArray.size(); ++index)`