Merge branch 'master' into merge_v4l2

Former-commit-id: 97b281cc14b3bc239fc5eab1f66c9d15e67f753f

include/grabber/V4L2Grabber.h

@@ -13,6 +13,9 @@
 #include <utils/ColorRgb.h>
 #include <utils/VideoMode.h>
 
+// grabber includes
+#include <grabber/VideoStandard.h>
+
 /// Capture class for V4L2 devices
 ///
 /// @see http://linuxtv.org/downloads/v4l-dvb-apis/capture-example.html
@@ -20,11 +23,6 @@ class V4L2Grabber : public QObject
 {
 	Q_OBJECT
 
-public:
-	enum VideoStandard {
-		PAL, NTSC, NO_CHANGE
-	};
-
 public:
 	V4L2Grabber(
 			const std::string & device,

include/grabber/VideoStandard.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <string>
+#include <algorithm>
+
+/**
+ * Enumeration of the possible video standards the grabber can be set to
+ */
+enum VideoStandard {
+	VIDEOSTANDARD_PAL,
+	VIDEOSTANDARD_NTSC,
+	VIDEOSTANDARD_NO_CHANGE
+};
+
+inline VideoStandard parseVideoStandard(std::string videoStandard)
+{
+	// convert to lower case
+	std::transform(videoStandard.begin(), videoStandard.end(), videoStandard.begin(), ::tolower);
+
+	if (videoStandard == "pal")
+	{
+		return VIDEOSTANDARD_PAL;
+	}
+	else if (videoStandard == "ntsc")
+	{
+		return VIDEOSTANDARD_NTSC;
+	}
+
+	// return the default NO_CHANGE
+	return VIDEOSTANDARD_NO_CHANGE;
+}