Merge branch 'master' into merge_v4l2

Former-commit-id: 97b281cc14b3bc239fc5eab1f66c9d15e67f753f
This commit is contained in:
johan
2014-02-23 21:36:39 +01:00
10 changed files with 75 additions and 20 deletions

View File

@@ -1,5 +1,8 @@
#pragma once
#include <string>
#include <algorithm>
/**
* Enumeration of the possible modes in which video can be playing (2D, 3D)
*/
@@ -9,3 +12,21 @@ enum VideoMode
VIDEO_3DSBS,
VIDEO_3DTAB
};
inline VideoMode parse3DMode(std::string videoMode)
{
// convert to lower case
std::transform(videoMode.begin(), videoMode.end(), videoMode.begin(), ::tolower);
if (videoMode == "23DTAB")
{
return VIDEO_3DTAB;
}
else if (videoMode == "3DSBS")
{
return VIDEO_3DSBS;
}
// return the default 2D
return VIDEO_2D;
}