2.0.0.2: - bluefish: Replaced bluefish_exception with caspar_exception.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@860 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/bluefish/bluefish.vcxproj b/modules/bluefish/bluefish.vcxproj
index e01cc8f56f4e2a944c5e9c2dbc10d380e61b71af..0995347e1f96127750f8971d71e95e10aec3cc1f 100644 (file)
--- a/modules/bluefish/bluefish.vcxproj
+++ b/modules/bluefish/bluefish.vcxproj
@@ -239,7 +239,6 @@
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClInclude Include="bluefish.h" />\r
-    <ClInclude Include="bluefish_error.h" />\r
     <ClInclude Include="consumer\bluefish_consumer.h" />\r
     <ClInclude Include="StdAfx.h" />\r
     <ClInclude Include="util\memory.h" />\r

diff --git a/modules/bluefish/bluefish.vcxproj.filters b/modules/bluefish/bluefish.vcxproj.filters
index 47ff2583ded3d711b77939a31867b739caa9e206..26b8d083e181a0ae024dc4f19a622f9ba65d90cf 100644 (file)
--- a/modules/bluefish/bluefish.vcxproj.filters
+++ b/modules/bluefish/bluefish.vcxproj.filters
@@ -17,7 +17,6 @@
     <ClInclude Include="util\memory.h">\r
       <Filter>util</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="bluefish_error.h" />\r
     <ClInclude Include="util\blue_velvet.h">\r
       <Filter>util</Filter>\r
     </ClInclude>\r

diff --git a/modules/bluefish/bluefish_error.h b/modules/bluefish/bluefish_error.h
deleted file mode 100644 (file)
index 93e2fe6..0000000
--- a/modules/bluefish/bluefish_error.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once\r
-\r
-#include <common/exception/exceptions.h>\r
-\r
-namespace caspar {\r
-       \r
-struct bluefish_exception : virtual caspar_exception{};\r
-\r
-}
\ No newline at end of file

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index afcac5196a95e40e00658a0a5e2d4f9d461d7a71..baf41a0f655e46436ef263fabaac1ccd8e481127 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -76,7 +76,7 @@ public:
                , executor_(print())\r
        {\r
                if(BLUE_FAIL(blue_->device_attach(device_index, FALSE))) \r
-                       BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info("Failed to attach device."));\r
+                       BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Failed to attach device."));\r
 \r
                executor_.set_capacity(CONSUMER_BUFFER_DEPTH);\r
 \r
@@ -90,24 +90,24 @@ public:
                        \r
                //Setting output Video mode\r
                if(BLUE_FAIL(set_card_property(blue_, VIDEO_MODE, vid_fmt_))) \r
-                       BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info(narrow(print()) + " Failed to set videomode."));\r
+                       BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to set videomode."));\r
 \r
                //Select Update Mode for output\r
                if(BLUE_FAIL(set_card_property(blue_, VIDEO_UPDATE_TYPE, UPD_FMT_FRAME))) \r
-                       BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info(narrow(print()) + " Failed to set update type."));\r
+                       BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to set update type."));\r
        \r
                disable_video_output();\r
 \r
                //Enable dual link output\r
                if(BLUE_FAIL(set_card_property(blue_, VIDEO_DUAL_LINK_OUTPUT, 1)))\r
-                       BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info(narrow(print()) + " Failed to enable dual link."));\r
+                       BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to enable dual link."));\r
 \r
                if(BLUE_FAIL(set_card_property(blue_, VIDEO_DUAL_LINK_OUTPUT_SIGNAL_FORMAT_TYPE, Signal_FormatType_4224)))\r
-                       BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info(narrow(print()) + " Failed to set dual link format type to 4:2:2:4."));\r
+                       BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to set dual link format type to 4:2:2:4."));\r
                        \r
                //Select output memory format\r
                if(BLUE_FAIL(set_card_property(blue_, VIDEO_MEMORY_FORMAT, MEM_FMT_ARGB_PC))) \r
-                       BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info(narrow(print()) + " Failed to set memory format."));\r
+                       BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to set memory format."));\r
                \r
                //Select image orientation\r
                if(BLUE_FAIL(set_card_property(blue_, VIDEO_IMAGE_ORIENTATION, ImageOrientation_Normal)))\r
@@ -144,7 +144,7 @@ public:
        \r
                unsigned long engine_mode = VIDEO_ENGINE_FRAMESTORE;\r
                if(BLUE_FAIL(blue_->set_video_engine(engine_mode)))\r
-                       BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info(narrow(print()) + " Failed to set video engine."));\r
+                       BOOST_THROW_EXCEPTION(caspar_exception() << msg_info(narrow(print()) + " Failed to set video engine."));\r
 \r
                enable_video_output();\r
                                                \r

diff --git a/modules/bluefish/consumer/bluefish_consumer.h b/modules/bluefish/consumer/bluefish_consumer.h
index baf566210395824def8abb3300df52e9bb0dec1a..b53addd35ebc98706dcc39152e9a528608eb64a9 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.h
+++ b/modules/bluefish/consumer/bluefish_consumer.h
@@ -19,10 +19,8 @@
 */\r
 #pragma once\r
 \r
-#include "../bluefish_error.h"\r
-\r
-#include <core/video_format.h>\r
 #include <core/consumer/frame_consumer.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/property_tree/ptree.hpp>\r
 \r

diff --git a/modules/bluefish/util/blue_velvet.cpp b/modules/bluefish/util/blue_velvet.cpp
index fbef2ef7a7f1d59e832a8e24ed71da12941af273..0c94b737a30cf083353d52ca71043ffc95d1fc9f 100644 (file)
--- a/modules/bluefish/util/blue_velvet.cpp
+++ b/modules/bluefish/util/blue_velvet.cpp
@@ -141,7 +141,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(bluefish_exception() << msg_info("Failed get videomode.") << arg_value_info(narrow(format_desc.name)));\r
+               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Failed get videomode.") << arg_value_info(narrow(format_desc.name)));\r
 \r
        return vid_fmt;\r
 }\r

diff --git a/modules/bluefish/util/blue_velvet.h b/modules/bluefish/util/blue_velvet.h
index c1c668223234ef159f7ab2da0dec5990da4657b0..c66375d146979350a76d35badba80582796cc9ce 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