git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / modules / decklink / util / util.h

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index 349ca14ff818138061577875ed31602431b2daec..c733a319d1e6753b90d0d832a282aa96bb74c885 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -31,7 +31,7 @@
 \r
 #include <string>\r
 \r
-namespace caspar { \r
+namespace caspar { namespace decklink {\r
        \r
 static BMDDisplayMode get_decklink_video_format(core::video_format::type fmt) \r
 {\r
@@ -52,6 +52,7 @@ static BMDDisplayMode get_decklink_video_format(core::video_format::type fmt)
        case core::video_format::x1080p2500:    return bmdModeHD1080p25;\r
        case core::video_format::x1080p2997:    return bmdModeHD1080p2997;\r
        case core::video_format::x1080p3000:    return bmdModeHD1080p30;\r
+       case core::video_format::x1080p5000:    return bmdModeHD1080p50;\r
        default:                                                                return (BMDDisplayMode)ULONG_MAX;\r
        }\r
 }\r
@@ -73,6 +74,7 @@ static core::video_format::type get_caspar_video_format(BMDDisplayMode fmt)
        case bmdModeHD1080p25:                                  return core::video_format::x1080p2500;  \r
        case bmdModeHD1080p2997:                                return core::video_format::x1080p2997;  \r
        case bmdModeHD1080p30:                                  return core::video_format::x1080p3000;  \r
+       case bmdModeHD1080p50:                                  return core::video_format::x1080p5000;  \r
        default:                                                                return core::video_format::invalid;     \r
        }\r
 }\r
@@ -130,7 +132,7 @@ static CComPtr<IDeckLink> get_device(size_t device_index)
 {\r
        CComPtr<IDeckLinkIterator> pDecklinkIterator;\r
        if(FAILED(pDecklinkIterator.CoCreateInstance(CLSID_CDeckLinkIterator)))\r
-               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("No Decklink drivers installed."));\r
+               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Decklink drivers not found."));\r
                \r
        size_t n = 0;\r
        CComPtr<IDeckLink> decklink;\r
@@ -150,4 +152,4 @@ static std::wstring get_model_name(const T& device)
        return std::wstring(pModelName);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file