2.0. Updated namespaces.

[casparcg] / modules / bluefish / util / blue_velvet.cpp

diff --git a/modules/bluefish/util/blue_velvet.cpp b/modules/bluefish/util/blue_velvet.cpp
index 0c94b737a30cf083353d52ca71043ffc95d1fc9f..f2accffbd1d4762287664ee4656108731dbfa183 100644 (file)
--- a/modules/bluefish/util/blue_velvet.cpp
+++ b/modules/bluefish/util/blue_velvet.cpp
@@ -6,7 +6,7 @@
 \r
 #include <core/video_format.h>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace bluefish {\r
        \r
 CBlueVelvet4* (*BlueVelvetFactory4)() = nullptr;\r
 void (*BlueVelvetDestroy)(CBlueVelvet4* pObj) = nullptr;\r
@@ -68,6 +68,7 @@ EVideoMode vid_fmt_from_video_format(const core::video_format::type& fmt)
        case core::video_format::x1080p2500:    return VID_FMT_1080P_2500;\r
        case core::video_format::x1080p2997:    return VID_FMT_1080P_2997;\r
        case core::video_format::x1080p3000:    return VID_FMT_1080P_3000;\r
+       case core::video_format::x1080p5000:    return VID_FMT_1080P_5000;\r
        default:                                                                return VID_FMT_INVALID;\r
        }\r
 }\r
@@ -141,7 +142,7 @@ EVideoMode get_video_mode(CBlueVelvet4& blue, const core::video_format_desc& for
                        vid_fmt = videoMode;                    \r
        }\r
        if(vid_fmt == VID_FMT_INVALID)\r
-               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Failed get videomode.") << arg_value_info(narrow(format_desc.name)));\r
+               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("video-mode not supported.") << arg_value_info(narrow(format_desc.name)));\r
 \r
        return vid_fmt;\r
 }\r
@@ -154,4 +155,14 @@ safe_ptr<CBlueVelvet4> create_blue()
        return safe_ptr<CBlueVelvet4>(BlueVelvetFactory4(), BlueVelvetDestroy);\r
 }\r
 \r
-}
\ No newline at end of file
+safe_ptr<CBlueVelvet4> create_blue(size_t device_index)\r
+{\r
+       auto blue = create_blue();\r
+       \r
+       if(BLUE_FAIL(blue->device_attach(device_index, FALSE))) \r
+               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Failed to attach device."));\r
+\r
+       return blue;\r
+}\r
+\r
+}}
\ No newline at end of file