]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 13 Jan 2011 13:36:27 +0000 (13:36 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 13 Jan 2011 13:36:27 +0000 (13:36 +0000)
common/concurrency/executor.h
core/channel.cpp
core/processor/device_buffer.h
core/processor/host_buffer.h

index 0229f3b9389eb539672e33a75c94248cc87c6dbb..4ce264aac663077afd76e959b643a6a040d309b9 100644 (file)
@@ -30,7 +30,7 @@ public:
                f_ = f != nullptr ? f : [this]{run();};\r
        }\r
 \r
-       ~executor()\r
+       virtual ~executor()\r
        {\r
                stop();\r
        }\r
index d92e2fc262d44672ba93a21ff4b960d0424612c3..8dabf1664ca4ed0cfcb77b51f49670914d5af68d 100644 (file)
@@ -161,8 +161,7 @@ public:
 };\r
 \r
 channel::channel(channel&& other) : impl_(std::move(other.impl_)){}\r
-channel::channel(const video_format_desc& format_desc, const std::vector<safe_ptr<frame_consumer>>& consumers)\r
-       : impl_(new implementation(format_desc, consumers)){}\r
+channel::channel(const video_format_desc& format_desc, const std::vector<safe_ptr<frame_consumer>>& consumers) : impl_(new implementation(format_desc, consumers)){}\r
 void channel::load(int index, const safe_ptr<frame_producer>& producer, bool autoplay){impl_->load(index, producer, autoplay);}\r
 void channel::preview(int index, const safe_ptr<frame_producer>& producer){impl_->preview(index, producer);}\r
 void channel::pause(int index){impl_->pause(index);}\r
index 3d86813add090d6639acdcc435121a8fd1e32f74..35b76713979de9bb127cb4c5e9b47a8b5de14670 100644 (file)
@@ -8,7 +8,7 @@
 \r
 namespace caspar { namespace core {\r
        \r
-class device_buffer \r
+class device_buffer : boost::noncopyable\r
 {\r
 public:\r
        device_buffer(size_t width, size_t height, size_t stride);\r
index 1b434b511f9673ab2c56195f528f748b6dd2d7c7..24b9e11eabe1f3bcd20947ae7177fbc03af4d24d 100644 (file)
@@ -6,7 +6,7 @@
 \r
 namespace caspar { namespace core {\r
                \r
-class host_buffer \r
+class host_buffer : boost::noncopyable\r
 {\r
 public:\r
        enum usage_t\r