2.1.0: Don't use virtual for override functions.

[casparcg] / modules / decklink / consumer / decklink_consumer.h

diff --git a/modules/decklink/consumer/decklink_consumer.h b/modules/decklink/consumer/decklink_consumer.h
index 41d49bb7669e715bcb99803a7d217ca08fd04156..863d62c8a64db5ddaa543ed03b1b63103e4cd446 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.h
+++ b/modules/decklink/consumer/decklink_consumer.h
@@ -1,25 +1,28 @@
 /*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
 *\r
-*  This file is part of CasparCG.\r
+* This file is part of CasparCG (www.casparcg.com).\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
+* 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
+* 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
+* Author: Robert Nagy, ronag89@gmail.com\r
 */\r
+\r
 #pragma once\r
 \r
-#include <core/consumer/frame_consumer.h>\r
+#include <common/memory.h>\r
+\r
 #include <core/video_format.h>\r
 \r
 #include <boost/property_tree/ptree.hpp>\r
@@ -27,9 +30,15 @@
 #include <string>\r
 #include <vector>\r
 \r
-namespace caspar { \r
-       \r
-safe_ptr<core::frame_consumer> create_decklink_consumer(const std::vector<std::wstring>& params);\r
-safe_ptr<core::frame_consumer> create_decklink_consumer(const boost::property_tree::ptree& ptree);\r
+namespace caspar {\r
+\r
+namespace core {\r
+       class frame_consumer;\r
+}\r
+\r
+namespace decklink {\r
+\r
+spl::shared_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params);\r
+spl::shared_ptr<core::frame_consumer> create_consumer(const boost::property_tree::wptree& ptree);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file