Merge pull request #91 from cchampet/dev_addDefaultAVPROFILES

valnoel · valnoel · commit fdc39f7bfe0b · 2015-02-17T10:31:44.000+01:00
ProfileLoader: add a default profiles location
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,6 +13,9 @@ add_definitions(-DAVTRANSCODER_VERSION_MAJOR=${AVTRANSCODER_VERSION_MAJOR})
 add_definitions(-DAVTRANSCODER_VERSION_MINOR=${AVTRANSCODER_VERSION_MINOR})
 add_definitions(-DAVTRANSCODER_VERSION_MICRO=${AVTRANSCODER_VERSION_MICRO})
 
+# Define AvTranscoder default path to profiles
+add_definitions(-DAVTRANSCODER_DEFAULT_AVPROFILES="${CMAKE_INSTALL_PREFIX}/share/ressource")
+
 # Diplay commands being ran by CMake
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
diff --git a/src/AvTranscoder/ProfileLoader.cpp b/src/AvTranscoder/ProfileLoader.cpp
@@ -40,10 +40,12 @@ void ProfileLoader::loadProfiles( const std::string& avProfilesPath )
 	std::string realAvProfilesPath = avProfilesPath;
 	if( realAvProfilesPath.empty() )
 	{
+		// get custom profiles location from AVPROFILES environment variable
 		if( std::getenv( "AVPROFILES" ) )
 			realAvProfilesPath = std::getenv( "AVPROFILES" );
+		// else get default profiles location
 		else
-			return;
+			realAvProfilesPath = AVTRANSCODER_DEFAULT_AVPROFILES;
 	}
 	
 	std::vector< std::string > paths;

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,12 @@ void ProfileLoader::loadProfiles( const std::string& avProfilesPath )`
`40`	`40`	`std::string realAvProfilesPath = avProfilesPath;`
`41`	`41`	`if( realAvProfilesPath.empty() )`
`42`	`42`	`{`
	`43`	`+ // get custom profiles location from AVPROFILES environment variable`
`43`	`44`	`if( std::getenv( "AVPROFILES" ) )`
`44`	`45`	`realAvProfilesPath = std::getenv( "AVPROFILES" );`
	`46`	`+ // else get default profiles location`
`45`	`47`	`else`
`46`		`- return;`
	`48`	`+ realAvProfilesPath = AVTRANSCODER_DEFAULT_AVPROFILES;`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`std::vector< std::string > paths;`