Logger: log function doesn't need level as string

Clement Champetier · Clement Champetier · commit da0b29ff0bcf · 2015-03-03T16:08:33.000+01:00
diff --git a/src/AvTranscoder/common.cpp b/src/AvTranscoder/common.cpp
@@ -17,9 +17,29 @@ void Logger::setLogLevel( const int level )
 	av_log_set_level( level );
 }
 
-void Logger::log( int level, const std::string& levelStr, const std::string& msg )
+void Logger::log( int level, const std::string& msg )
 {
 	std::string avTranscoderMsg( "[avTranscoder - " );
+
+	std::string levelStr;
+	switch( level )
+	{
+		case AV_LOG_DEBUG:
+			levelStr = "debug";
+			break;
+		case AV_LOG_INFO:
+			levelStr = "info";
+			break;
+		case AV_LOG_WARNING:
+			levelStr = "warning";
+			break;
+		case AV_LOG_ERROR:
+			levelStr = "error";
+			break;
+		default:
+			break;
+	}
+
 	avTranscoderMsg += levelStr;
 	avTranscoderMsg += "] ";
 	avTranscoderMsg += msg;
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -59,10 +59,10 @@ typedef AVRational Rational;
 /// Register all the codecs and formats which are enabled at configuration time.
 void AvExport preloadCodecsAndFormats();
 
-#define LOG_DEBUG( ... ) { std::stringstream os; os << __VA_ARGS__; Logger::log( AV_LOG_DEBUG, "debug", os.str() ); }
-#define LOG_INFO( ... ) { std::stringstream os; os << __VA_ARGS__; Logger::log( AV_LOG_INFO, "info", os.str() ); }
-#define LOG_WARN( ... ) { std::stringstream os; os << __VA_ARGS__; Logger::log( AV_LOG_WARNING, "warning", os.str() ); }
-#define LOG_ERROR( ... ) { std::stringstream os; os << __VA_ARGS__; Logger::log( AV_LOG_ERROR, "error", os.str() ); }
+#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() ); }
+#define LOG_ERROR( ... ) { std::stringstream os; os << __VA_ARGS__; Logger::log( AV_LOG_ERROR, os.str() ); }
 
 /// Logger class which contains static functions to use ffmpeg/libav log system
 class AvExport Logger
@@ -81,7 +81,7 @@ class AvExport Logger
 	 * @param msg: the message will be prefixed by '[avTranscoder - <level>]'
 	 * @param msg: the message will be suffixed by '\n'
 	 */
-	static void log( int level, const std::string& levelStr, const std::string& msg );
+	static void log( int level, const std::string& msg );
 };
 
 }
