2.1.0: Removed unused code.

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

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index dc926e05986718b446cde8e0de5510de34139d86..9aa8a8f942ea8372ad2aaf548fcff33cb3b5b19c 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -64,7 +64,6 @@ struct mixer::impl : boost::noncopyable
        safe_ptr<diagnostics::graph>                            graph_;\r
        boost::timer                                                            mix_timer_;     \r
 \r
-       mutable tbb::spin_mutex                                         format_desc_mutex_;\r
        video_format_desc                                                       format_desc_;\r
        safe_ptr<ogl_device>                                            ogl_;\r
        \r
@@ -136,17 +135,10 @@ public:
        {\r
                executor_.begin_invoke([=]\r
                {\r
-                       tbb::spin_mutex::scoped_lock lock(format_desc_mutex_);\r
                        format_desc_ = format_desc;\r
                });\r
        }\r
 \r
-       core::video_format_desc get_video_format_desc() const // nothrow\r
-       {\r
-               tbb::spin_mutex::scoped_lock lock(format_desc_mutex_);\r
-               return format_desc_;\r
-       }\r
-\r
        boost::unique_future<boost::property_tree::wptree> info() const\r
        {\r
                boost::promise<boost::property_tree::wptree> info;\r
@@ -158,7 +150,6 @@ public:
 mixer::mixer(const safe_ptr<target_t>& target, const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl) \r
        : impl_(new impl(target, graph, format_desc, ogl)){}\r
 void mixer::send(const std::pair<std::map<int, safe_ptr<core::basic_frame>>, std::shared_ptr<void>>& frames){ impl_->send(frames);}\r
-core::video_format_desc mixer::get_video_format_desc() const { return impl_->get_video_format_desc(); }\r
 void mixer::set_blend_mode(int index, blend_mode::type value){impl_->set_blend_mode(index, value);}\r
 void mixer::set_video_format_desc(const video_format_desc& format_desc){impl_->set_video_format_desc(format_desc);}\r
 boost::unique_future<boost::property_tree::wptree> mixer::info() const{return impl_->info();}\r

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index 1d212c60eaa132a7b856b2bd25ce9858eb6f4ac4..8e5c7003479eae7cad9572c1ecae8a124b77c408 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -60,7 +60,6 @@ public:
                \r
        // mixer\r
                \r
-       core::video_format_desc get_video_format_desc() const; // nothrow\r
        void set_video_format_desc(const video_format_desc& format_desc);\r
        \r
        void set_blend_mode(int index, blend_mode::type value);\r

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index 8a7806ee126c6020f737e1b616ecb9c645c8b666..1ff7e8436dcd95886575ecb112bba4a1f7e8f053 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -76,7 +76,7 @@ public:
        \r
        virtual core::video_format_desc get_video_format_desc() const override// nothrow\r
        {\r
-               return mixer_->get_video_format_desc();\r
+               return format_desc_;\r
        }\r
        \r
        void set_video_format_desc(const video_format_desc& format_desc)\r

diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index bf2e69c801e690f72656203f69b4ab65d6c37690..c332594d9f97006527adb446398ba37740b3deaa 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -89,7 +89,7 @@ struct configuration
        };\r
                \r
        std::wstring    name;\r
-       int                     screen_index;\r
+       int                             screen_index;\r
        stretch                 stretch;\r
        bool                    windowed;\r
        bool                    auto_deinterlace;\r