Cleanup: merge IMessengerLogger into MessengerLogger.

2 files changed, 27 insertions, 28 deletions

diff --git a/src/lib/grok/messenger.h b/src/lib/grok/messenger.h
index a3a23283f..70026b561 100644
--- a/src/lib/grok/messenger.h
+++ b/src/lib/grok/messenger.h
@@ -50,31 +50,17 @@ static const std::string GRK_MSGR_BATCH_FLUSH = "GRK_MSGR_BATCH_FLUSH";
 static const size_t messageBufferLen = 256;
 
 
-struct IMessengerLogger
+struct MessengerLogger
 {
-	virtual ~IMessengerLogger(void) = default;
-	virtual void info(const char* fmt, ...) = 0;
-	virtual void warn(const char* fmt, ...) = 0;
-	virtual void error(const char* fmt, ...) = 0;
-
-  protected:
-	template<typename... Args>
-	std::string log_message(char const* const format, Args&... args) noexcept
+	explicit MessengerLogger(const std::string &preamble)
+		: preamble_(preamble)
 	{
-		constexpr size_t message_size = 512;
-		char message[message_size];
 
-		std::snprintf(message, message_size, format, args...);
-		return std::string(message);
 	}
-};
-
 
-struct MessengerLogger : public IMessengerLogger
-{
-	explicit MessengerLogger(const std::string &preamble) : preamble_(preamble) {}
 	virtual ~MessengerLogger() = default;
-	virtual void info(const char* fmt, ...) override
+
+	virtual void info(const char* fmt, ...)
 	{
 		va_list args;
 		std::string new_fmt = preamble_ + fmt + "\n";
@@ -82,7 +68,8 @@ struct MessengerLogger : public IMessengerLogger
 		vfprintf(stdout, new_fmt.c_str(), args);
 		va_end(args);
 	}
-	virtual void warn(const char* fmt, ...) override
+
+	virtual void warn(const char* fmt, ...)
 	{
 		va_list args;
 		std::string new_fmt = preamble_ + fmt + "\n";
@@ -90,7 +77,8 @@ struct MessengerLogger : public IMessengerLogger
 		vfprintf(stdout, new_fmt.c_str(), args);
 		va_end(args);
 	}
-	virtual void error(const char* fmt, ...) override
+
+	virtual void error(const char* fmt, ...)
 	{
 		va_list args;
 		std::string new_fmt = preamble_ + fmt + "\n";
@@ -99,13 +87,24 @@ struct MessengerLogger : public IMessengerLogger
 		va_end(args);
 	}
 
-  protected:
+protected:
+	template<typename... Args>
+	std::string log_message(char const* const format, Args&... args) noexcept
+	{
+		constexpr size_t message_size = 512;
+		char message[message_size];
+
+		std::snprintf(message, message_size, format, args...);
+		return std::string(message);
+	}
+
 	std::string preamble_;
 };
 
-extern IMessengerLogger* sLogger;
-void setMessengerLogger(IMessengerLogger* logger);
-IMessengerLogger* getMessengerLogger(void);
+
+extern MessengerLogger* sLogger;
+void setMessengerLogger(MessengerLogger* logger);
+MessengerLogger* getMessengerLogger();
 
 
 template<typename Data>
diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index b6ce3ca83..73ec5bd08 100644
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -64,13 +64,13 @@ using namespace dcpomatic;
 
 namespace grk_plugin {
 
-IMessengerLogger* sLogger = nullptr;
+MessengerLogger* sLogger = nullptr;
 
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
-void setMessengerLogger(grk_plugin::IMessengerLogger* logger)
+void setMessengerLogger(grk_plugin::MessengerLogger* logger)
 {
  	delete sLogger;
  	sLogger = logger;
@@ -78,7 +78,7 @@ void setMessengerLogger(grk_plugin::IMessengerLogger* logger)
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
-grk_plugin::IMessengerLogger* getMessengerLogger(void)
+grk_plugin::MessengerLogger* getMessengerLogger()
 {
 	return sLogger;
 }