Logger: fix build on Windows

Clement Champetier · Clement Champetier · commit 73a658dd7976 · 2015-03-04T11:04:38.000+01:00
* Remove static attribute _logFileName because of a link error with
Microsoft Compiler (MSVC).
* Currently the log file is named avtranscoder.log
diff --git a/src/AvTranscoder/log.cpp b/src/AvTranscoder/log.cpp
@@ -12,13 +12,11 @@ void callbackToWriteInFile( void *ptr, int level, const char *fmt, va_list vl )
 
 	// Print line in log file
 	std::ofstream outputFile;
-	outputFile.open( Logger::getLogFileName().c_str(), std::ios::out | std::ios::app );
+	outputFile.open( LOG_FILE, std::ios::out | std::ios::app );
 	outputFile << line;
 	outputFile.close();
 }
 
-std::string Logger::_logFileName( "avtranscoder.log" );
-
 void Logger::setLogLevel( const int level )
 {
 	av_log_set_level( level );
@@ -60,7 +58,7 @@ void Logger::logInFile()
 
 	// clean log file
 	std::ofstream outputFile;
-	outputFile.open( Logger::getLogFileName().c_str() );
+	outputFile.open( LOG_FILE );
 	outputFile.close();
 }
 
diff --git a/src/AvTranscoder/log.hpp b/src/AvTranscoder/log.hpp
@@ -13,6 +13,7 @@ extern "C" {
 namespace avtranscoder
 {
 
+#define LOG_FILE "avtranscoder.log"
 #define LOG_DEBUG( ... ) { std::stringstream os; os << __VA_ARGS__; Logger::log( AV_LOG_DEBUG, os.str() ); }
 #define LOG_INFO( ... ) { std::stringstream os; os << __VA_ARGS__; Logger::log( AV_LOG_INFO, os.str() ); }
 #define LOG_WARN( ... ) { std::stringstream os; os << __VA_ARGS__; Logger::log( AV_LOG_WARNING, os.str() ); }
@@ -31,28 +32,17 @@ class AvExport Logger
 
 	/**
 	 * @brief Log with the ffmpeg/libav log system
-	 * @note use define LOG_* to log at DEBUG/INFO/WARN/ERROR level
+	 * @note you can use macro LOG_* to log at DEBUG/INFO/WARN/ERROR level
 	 * @param msg: the message will be prefixed by '[avTranscoder - <level>]'
 	 * @param msg: the message will be suffixed by '\n'
 	 */
 	static void log( const int level, const std::string& msg );
 
 	/**
 	 * @brief Log ffmpeg/libav and avtranscoder informations in a text file.
-	 * @note Default log filename is avtranscoder.log
-	 * @see getLogFileName
-	 * @see setLogFileName
+	 * @note log filename is avtranscoder.log
 	 */
 	static void logInFile();
-
-	///@{
-	/// @warning Need to set the expected log filename before calling logInFile
-	static std::string& getLogFileName() { return _logFileName; }
-	static void setLogFileName( const std::string& newLogFileName ) { _logFileName = newLogFileName; }
-	///@}
-
-private:
-	static std::string _logFileName;  ///< Name of the log file
 };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,11 @@ void callbackToWriteInFile( void ptr, int level, const char fmt, va_list vl )`
`12`	`12`
`13`	`13`	`// Print line in log file`
`14`	`14`	`std::ofstream outputFile;`
`15`		`- outputFile.open( Logger::getLogFileName().c_str(), std::ios::out \| std::ios::app );`
	`15`	`+ outputFile.open( LOG_FILE, std::ios::out \| std::ios::app );`
`16`	`16`	`outputFile << line;`
`17`	`17`	`outputFile.close();`
`18`	`18`	`}`
`19`	`19`
`20`		`-std::string Logger::_logFileName( "avtranscoder.log" );`
`21`		`-`
`22`	`20`	`void Logger::setLogLevel( const int level )`
`23`	`21`	`{`
`24`	`22`	`av_log_set_level( level );`
`@@ -60,7 +58,7 @@ void Logger::logInFile()`
`60`	`58`
`61`	`59`	`// clean log file`
`62`	`60`	`std::ofstream outputFile;`
`63`		`- outputFile.open( Logger::getLogFileName().c_str() );`
	`61`	`+ outputFile.open( LOG_FILE );`
`64`	`62`	`outputFile.close();`
`65`	`63`	`}`
`66`	`64`