From a0ce7cce393c3c68c3fc40ba625e60748434fd38 Mon Sep 17 00:00:00 2001
From: Krisjanis Rijnieks <krisjanis.rijnieks@gmail.com>
Date: Tue, 17 Jan 2017 12:46:43 +0100
Subject: [PATCH] Add SourceTypeHelper.h

Move SourceTypeHelper class code from SourceType.h to new file.
---
 src/Application/SettingsLoader.h |  1 +
 src/Sources/SourceType.h         | 44 ---------------------------
 src/Sources/SourceTypeHelper.h   | 52 ++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 44 deletions(-)
 create mode 100644 src/Sources/SourceTypeHelper.h

diff --git a/src/Application/SettingsLoader.h b/src/Application/SettingsLoader.h
index d785557..060728a 100644
--- a/src/Application/SettingsLoader.h
+++ b/src/Application/SettingsLoader.h
@@ -7,6 +7,7 @@
 #include "MediaServer.h"
 #include "SurfaceFactory.h"
 #include "SurfaceType.h"
+#include "SourceTypeHelper.h"
 
 namespace ofx {
 namespace piMapper {
diff --git a/src/Sources/SourceType.h b/src/Sources/SourceType.h
index 7c2ebac..7b66bb8 100644
--- a/src/Sources/SourceType.h
+++ b/src/Sources/SourceType.h
@@ -1,12 +1,5 @@
 #pragma once
 
-#include "ofLog.h"
-
-#define SOURCE_TYPE_NAME_NONE "none"
-#define SOURCE_TYPE_NAME_IMAGE "image"
-#define SOURCE_TYPE_NAME_VIDEO "video"
-#define SOURCE_TYPE_NAME_FBO "fbo"
-
 namespace ofx {
 namespace piMapper {
 
@@ -17,42 +10,5 @@ enum SourceType {
 	SOURCE_TYPE_FBO
 };
 
-class SourceTypeHelper {
-	public:
-		static string GetSourceTypeHelperName(SourceType sourceTypeEnum){
-			if(sourceTypeEnum == SOURCE_TYPE_IMAGE){
-				return SOURCE_TYPE_NAME_IMAGE;
-			}else if(sourceTypeEnum == SOURCE_TYPE_VIDEO){
-				return SOURCE_TYPE_NAME_VIDEO;
-			}else if(sourceTypeEnum == SOURCE_TYPE_NONE){
-				return SOURCE_TYPE_NAME_NONE;
-			}else if(sourceTypeEnum == SOURCE_TYPE_FBO){
-				return SOURCE_TYPE_NAME_FBO;
-			}else{
-				stringstream ss;
-				ss << "Invalid source type: " << sourceTypeEnum;
-				ofLogFatalError("SourceTypeHelper") << ss.str();
-				exit(EXIT_FAILURE);
-			}
-		}
-
-		static SourceType GetSourceTypeHelperEnum(string sourceTypeName){
-			if(sourceTypeName == SOURCE_TYPE_NAME_IMAGE){
-				return SOURCE_TYPE_IMAGE;
-			}else if(sourceTypeName == SOURCE_TYPE_NAME_VIDEO){
-				return SOURCE_TYPE_VIDEO;
-			}else if(sourceTypeName == SOURCE_TYPE_NAME_NONE){
-				return SOURCE_TYPE_NONE;
-			}else if(sourceTypeName == SOURCE_TYPE_NAME_FBO){
-				return SOURCE_TYPE_FBO;
-			}else{
-				stringstream ss;
-				ss << "Invalid source type name: " << sourceTypeName;
-				ofLogFatalError("SourceTypeHelper") << ss.str();
-				exit(EXIT_FAILURE);
-			}
-		}
-};
-
 } // namespace piMapper
 } // namespace ofx
\ No newline at end of file
diff --git a/src/Sources/SourceTypeHelper.h b/src/Sources/SourceTypeHelper.h
new file mode 100644
index 0000000..6f6acae
--- /dev/null
+++ b/src/Sources/SourceTypeHelper.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include "ofLog.h"
+#include "SourceType.h"
+
+#define SOURCE_TYPE_NAME_NONE "none"
+#define SOURCE_TYPE_NAME_IMAGE "image"
+#define SOURCE_TYPE_NAME_VIDEO "video"
+#define SOURCE_TYPE_NAME_FBO "fbo"
+
+namespace ofx {
+namespace piMapper {
+
+class SourceTypeHelper {
+	public:
+		static string GetSourceTypeHelperName(SourceType sourceTypeEnum){
+			if(sourceTypeEnum == SOURCE_TYPE_IMAGE){
+				return SOURCE_TYPE_NAME_IMAGE;
+			}else if(sourceTypeEnum == SOURCE_TYPE_VIDEO){
+				return SOURCE_TYPE_NAME_VIDEO;
+			}else if(sourceTypeEnum == SOURCE_TYPE_NONE){
+				return SOURCE_TYPE_NAME_NONE;
+			}else if(sourceTypeEnum == SOURCE_TYPE_FBO){
+				return SOURCE_TYPE_NAME_FBO;
+			}else{
+				stringstream ss;
+				ss << "Invalid source type: " << sourceTypeEnum;
+				ofLogFatalError("SourceTypeHelper") << ss.str();
+				exit(EXIT_FAILURE);
+			}
+		}
+
+		static SourceType GetSourceTypeHelperEnum(string sourceTypeName){
+			if(sourceTypeName == SOURCE_TYPE_NAME_IMAGE){
+				return SOURCE_TYPE_IMAGE;
+			}else if(sourceTypeName == SOURCE_TYPE_NAME_VIDEO){
+				return SOURCE_TYPE_VIDEO;
+			}else if(sourceTypeName == SOURCE_TYPE_NAME_NONE){
+				return SOURCE_TYPE_NONE;
+			}else if(sourceTypeName == SOURCE_TYPE_NAME_FBO){
+				return SOURCE_TYPE_FBO;
+			}else{
+				stringstream ss;
+				ss << "Invalid source type name: " << sourceTypeName;
+				ofLogFatalError("SourceTypeHelper") << ss.str();
+				exit(EXIT_FAILURE);
+			}
+		}
+};
+
+} // namespace piMapper
+} // namespace ofx
\ No newline at end of file