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

diff --git a/core/consumer/bluefish/bluefish_consumer.cpp b/core/consumer/bluefish/bluefish_consumer.cpp
index 27cf5a2f0fd364b662e76f5baee8fdded54717ac..edbceaa4c2b3ab5088fe02bdba3f7f02ba9d9b5d 100644 (file)
--- a/core/consumer/bluefish/bluefish_consumer.cpp
+++ b/core/consumer/bluefish/bluefish_consumer.cpp
@@ -22,10 +22,8 @@
 \r
 #ifndef DISABLE_BLUEFISH\r
 \r
-#include "fwd.h"\r
 #include "bluefish_consumer.h"\r
 #include "util.h"\r
-#include "exception.h"\r
 #include "memory.h"\r
 \r
 #include "../../processor/read_frame.h"\r
@@ -37,6 +35,8 @@
 #include <BlueVelvet4.h>\r
 #include <BlueHancUtils.h>\r
 \r
+#include <memory>\r
+\r
 namespace caspar { namespace core { namespace bluefish {\r
        \r
 struct consumer::implementation : boost::noncopyable\r
@@ -44,7 +44,7 @@ struct consumer::implementation : boost::noncopyable
        boost::unique_future<void> active_;\r
        executor executor_;\r
                        \r
-       BlueVelvetPtr sdk_;\r
+       std::shared_ptr<CBlueVelvet4> sdk_;\r
        \r
        unsigned int device_index_;\r
        video_format_desc format_desc_;\r

diff --git a/core/consumer/bluefish/bluefish_consumer.h b/core/consumer/bluefish/bluefish_consumer.h
index 21f5fdf30222f2ec7221388a796e84acaebd48a0..71804c20c683cf0d6fb0a75d47105a65eda94c6f 100644 (file)
--- a/core/consumer/bluefish/bluefish_consumer.h
+++ b/core/consumer/bluefish/bluefish_consumer.h
@@ -24,6 +24,8 @@
 \r
 namespace caspar { namespace core { namespace bluefish {\r
        \r
+struct bluefish_exception : public caspar_exception{};\r
+\r
 class consumer : public frame_consumer\r
 {\r
 public:\r

diff --git a/core/consumer/bluefish/exception.h b/core/consumer/bluefish/exception.h
deleted file mode 100644 (file)
index 35868f2..0000000
--- a/core/consumer/bluefish/exception.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
-#pragma once\r
-\r
-#include "../../../common/exception/exceptions.h"\r
-\r
-namespace caspar { namespace core { namespace bluefish {\r
-\r
-struct bluefish_exception : public caspar_exception{};\r
-\r
-}}}
\ No newline at end of file

diff --git a/core/consumer/bluefish/fwd.h b/core/consumer/bluefish/fwd.h
deleted file mode 100644 (file)
index 1daaa51..0000000
--- a/core/consumer/bluefish/fwd.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once\r
-\r
-class CBlueVelvet4;\r
-\r
-namespace caspar { namespace core { namespace bluefish {\r
-\r
-typedef std::tr1::shared_ptr<CBlueVelvet4> BlueVelvetPtr;\r
-\r
-class consumer;\r
-typedef std::shared_ptr<consumer> consumer_ptr;\r
-\r
-}}}
\ No newline at end of file

diff --git a/core/consumer/bluefish/memory.h b/core/consumer/bluefish/memory.h
index 1d19dfe38275f9414b64a7acf4802781a76bd1ab..54baef178d4935bd2af40c4222243aa411e5fd22 100644 (file)
--- a/core/consumer/bluefish/memory.h
+++ b/core/consumer/bluefish/memory.h
@@ -4,7 +4,6 @@
 \r
 #include <BlueVelvet4.h>\r
 #include "../../format/video_format.h"\r
-#include "exception.h"\r
 \r
 #include <tbb/mutex.h>\r
 \r
@@ -38,7 +37,7 @@ public:
                        workingSetMaxSize += size;\r
 \r
                        if(!::SetProcessWorkingSetSize(::GetCurrentProcess(), workingSetMinSize, workingSetMaxSize))            \r
-                               BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info("Failed set workingset."));              \r
+                               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Failed set workingset."));                \r
                }\r
        }\r
 \r
@@ -54,7 +53,7 @@ public:
                        workingSetMaxSize += static_cast<SIZE_T>(static_cast<int>(workingSetMaxSize) - static_cast<int>(size));\r
 \r
                        if(!::SetProcessWorkingSetSize(::GetCurrentProcess(), workingSetMinSize, workingSetMaxSize))            \r
-                               BOOST_THROW_EXCEPTION(bluefish_exception() << msg_info("Failed set workingset."));              \r
+                               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("Failed set workingset."));                \r
                }\r
        }\r
 \r

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 511964facf9e3205e55ffef6821d213a849fbcda..0e2fe4cdf60161974812d0763c1fdcf285cbf796 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -153,8 +153,6 @@
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClInclude Include="channel.h" />\r
-    <ClInclude Include="consumer\bluefish\exception.h" />\r
-    <ClInclude Include="consumer\bluefish\fwd.h" />\r
     <ClInclude Include="consumer\bluefish\memory.h" />\r
     <ClInclude Include="consumer\bluefish\bluefish_consumer.h" />\r
     <ClInclude Include="consumer\bluefish\util.h" />\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index 2bf35a6d4cd7a89912fd67a5164bd47110e41d21..2d0c1e0b305b5ea190d766eb6c7196aabce119c7 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -159,15 +159,9 @@
     <ClInclude Include="consumer\bluefish\util.h">\r
       <Filter>Source\channel\consumer\bluefish</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="consumer\bluefish\exception.h">\r
-      <Filter>Source\channel\consumer\bluefish</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="consumer\bluefish\memory.h">\r
       <Filter>Source\channel\consumer\bluefish</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="consumer\bluefish\fwd.h">\r
-      <Filter>Source\channel\consumer\bluefish</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="consumer\ogl\ogl_consumer.h">\r
       <Filter>Source\channel\consumer\ogl</Filter>\r
     </ClInclude>\r