2.0. Updated namespaces.

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

diff --git a/modules/bluefish/util/blue_velvet.h b/modules/bluefish/util/blue_velvet.h
index c1c668223234ef159f7ab2da0dec5990da4657b0..79270729ff6742dd67de5ee2a4261ca124127a1b 100644 (file)
--- a/modules/bluefish/util/blue_velvet.h
+++ b/modules/bluefish/util/blue_velvet.h
@@ -19,14 +19,13 @@
 */\r
 #pragma once\r
 \r
-#include "../bluefish_error.h"\r
-\r
 #include <Windows.h>\r
 \r
 #include <BlueVelvet4.h>\r
 #include <BlueHancUtils.h>\r
 \r
 #include <common/memory/safe_ptr.h>\r
+#include <common/exception/exceptions.h>\r
 \r
 namespace caspar { \r
 \r
@@ -36,6 +35,8 @@ struct video_format_desc;
 \r
 }\r
 \r
+namespace bluefish {\r
+\r
 extern const char* (*BlueVelvetVersion)();\r
 extern BLUE_UINT32 (*encode_hanc_frame)(struct hanc_stream_info_struct * hanc_stream_ptr, void * audio_pcm_ptr,BLUE_UINT32 no_audio_ch,BLUE_UINT32 no_audio_samples,BLUE_UINT32 nTypeOfSample,BLUE_UINT32 emb_audio_flag);\r
 extern BLUE_UINT32 (*encode_hanc_frame_ex)(BLUE_UINT32 card_type, struct hanc_stream_info_struct * hanc_stream_ptr, void * audio_pcm_ptr, BLUE_UINT32 no_audio_ch,     BLUE_UINT32 no_audio_samples, BLUE_UINT32 nTypeOfSample, BLUE_UINT32 emb_audio_flag);\r
@@ -43,6 +44,7 @@ extern BLUE_UINT32 (*encode_hanc_frame_ex)(BLUE_UINT32 card_type, struct hanc_st
 void blue_initialize();\r
 \r
 safe_ptr<CBlueVelvet4> create_blue();\r
+safe_ptr<CBlueVelvet4> create_blue(size_t device_index);\r
 bool is_epoch_card(CBlueVelvet4& blue);\r
 std::wstring get_card_desc(CBlueVelvet4& blue);\r
 EVideoMode get_video_mode(CBlueVelvet4& blue, const core::video_format_desc& format_desc);\r
@@ -56,4 +58,4 @@ int set_card_property(T& pSdk, ULONG prop, ULONG value)
        return (pSdk->SetCardProperty(prop,variantValue));\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file