Shorten implementation to impl.

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

diff --git a/common/diagnostics/graph.cpp b/common/diagnostics/graph.cpp
index 4bfabdcccc234af108346763c4a09ed1e57610ce..238aba355244fa99e8dd0e0178fdec17e949a368 100644 (file)
--- a/common/diagnostics/graph.cpp
+++ b/common/diagnostics/graph.cpp
@@ -251,14 +251,14 @@ public:
        }\r
 };\r
 \r
-struct graph::implementation : public drawable\r
+struct graph::impl : public drawable\r
 {\r
        tbb::concurrent_unordered_map<std::string, diagnostics::line> lines_;\r
 \r
        tbb::spin_mutex mutex_;\r
        std::wstring text_;\r
                \r
-       implementation()\r
+       impl()\r
        {\r
        }\r
 \r
@@ -355,11 +355,11 @@ private:
                glPopMatrix();\r
        }\r
 \r
-       implementation(implementation&);\r
-       implementation& operator=(implementation&);\r
+       impl(impl&);\r
+       impl& operator=(impl&);\r
 };\r
        \r
-graph::graph() : impl_(new implementation())\r
+graph::graph() : impl_(new impl())\r
 {\r
 }\r
 \r
@@ -381,12 +381,12 @@ void show_graphs(bool value)
 //namespace v2\r
 //{    \r
 //     \r
-//struct line::implementation\r
+//struct line::impl\r
 //{\r
 //     std::wstring name_;\r
 //     boost::circular_buffer<data> ticks_;\r
 //\r
-//     implementation(const std::wstring& name) \r
+//     impl(const std::wstring& name) \r
 //             : name_(name)\r
 //             , ticks_(1024){}\r
 //     \r
@@ -404,22 +404,22 @@ void show_graphs(bool value)
 //};\r
 //\r
 //line::line(){}\r
-//line::line(const std::wstring& name) : impl_(new implementation(name)){}\r
+//line::line(const std::wstring& name) : impl_(new impl(name)){}\r
 //std::wstring line::print() const {return impl_->name_;}\r
 //void line::set_value(float value){impl_->set_value(value);}\r
 //void line::set_value(float value){impl_->set_value(value);}\r
 //boost::circular_buffer<data>& line::ticks() { return impl_->ticks_;}\r
 //\r
-//struct graph::implementation\r
+//struct graph::impl\r
 //{\r
 //     std::map<std::wstring, line> lines_;\r
 //     color                                            color_;\r
 //     printer                                          printer_;\r
 //\r
-//     implementation(const std::wstring& name) \r
+//     impl(const std::wstring& name) \r
 //             : printer_([=]{return name;}){}\r
 //\r
-//     implementation(const printer& parent_printer) \r
+//     impl(const printer& parent_printer) \r
 //             : printer_(parent_printer){}\r
 //     \r
 //     void set_value(const std::wstring& name, float value)\r
@@ -461,8 +461,8 @@ void show_graphs(bool value)
 //     }\r
 //};\r
 //     \r
-//graph::graph(const std::wstring& name) : impl_(new implementation(name)){}\r
-//graph::graph(const printer& parent_printer) : impl_(new implementation(parent_printer)){}\r
+//graph::graph(const std::wstring& name) : impl_(new impl(name)){}\r
+//graph::graph(const printer& parent_printer) : impl_(new impl(parent_printer)){}\r
 //void graph::set_value(const std::wstring& name, float value){impl_->set_value(name, value);}\r
 //void graph::set_value(const std::wstring& name, float value){impl_->set_value(name, value);}\r
 //void graph::set_color(const std::wstring& name, color c){impl_->set_color(name, c);}\r

diff --git a/common/diagnostics/graph.h b/common/diagnostics/graph.h
index 26113525d61385201d9f66472cba932740405b86..78a8aa8b20e8b4270dd1f986fa2dec55e35957cf 100644 (file)
--- a/common/diagnostics/graph.h
+++ b/common/diagnostics/graph.h
@@ -41,8 +41,8 @@ public:
        void set_color(const std::string& name, int color);\r
        void set_tag(const std::string& name);\r
 private:\r
-       struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       struct impl;\r
+       std::shared_ptr<impl> impl_;\r
 };\r
 \r
 void register_graph(const safe_ptr<graph>& graph);\r

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 40dee621229c2254f6b2c4b50dd1607cff9de3de..1a4b3c4b13eb68dec4ef81bdd0396c8e1c00f673 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -45,7 +45,7 @@
 \r
 namespace caspar { namespace core {\r
        \r
-struct output::implementation\r
+struct output::impl\r
 {              \r
        const int                                                                               channel_index_;\r
        const safe_ptr<diagnostics::graph>                              graph_;\r
@@ -62,7 +62,7 @@ struct output::implementation
        executor                                                                                executor_;\r
                \r
 public:\r
-       implementation(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc, int channel_index) \r
+       impl(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc, int channel_index) \r
                : channel_index_(channel_index)\r
                , graph_(graph)\r
                , format_desc_(format_desc)\r
@@ -256,7 +256,7 @@ public:
        }\r
 };\r
 \r
-output::output(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc, int channel_index) : impl_(new implementation(graph, format_desc, channel_index)){}\r
+output::output(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc, int channel_index) : impl_(new impl(graph, format_desc, channel_index)){}\r
 void output::add(int index, const safe_ptr<frame_consumer>& consumer){impl_->add(index, consumer);}\r
 void output::add(const safe_ptr<frame_consumer>& consumer){impl_->add(consumer);}\r
 void output::remove(int index){impl_->remove(index);}\r

diff --git a/core/consumer/output.h b/core/consumer/output.h
index 77d1b1e91c9326a898a8b440e4ceff4d06d6c277..447a9375c6dfd11310203026b508d1a5180e1506 100644 (file)
--- a/core/consumer/output.h
+++ b/core/consumer/output.h
@@ -54,8 +54,8 @@ public:
 \r
        boost::unique_future<boost::property_tree::wptree> info() const;\r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index cc0fb370261de7c54c3ef65238c6556b2f0d23ca..1c211bca34a10906391af13e6d378f6688238ba8 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -64,7 +64,7 @@ struct audio_stream
        audio_buffer_ps         audio_data;\r
 };\r
 \r
-struct audio_mixer::implementation\r
+struct audio_mixer::impl\r
 {\r
        safe_ptr<diagnostics::graph>            graph_;\r
        std::stack<core::frame_transform>       transform_stack_;\r
@@ -74,7 +74,7 @@ struct audio_mixer::implementation
        video_format_desc                                       format_desc_;\r
        \r
 public:\r
-       implementation(const safe_ptr<diagnostics::graph>& graph)\r
+       impl(const safe_ptr<diagnostics::graph>& graph)\r
                : graph_(graph)\r
        {\r
                graph_->set_color("volume", diagnostics::color(1.0f, 0.8f, 0.1f));\r
@@ -193,7 +193,7 @@ public:
        }\r
 };\r
 \r
-audio_mixer::audio_mixer(const safe_ptr<diagnostics::graph>& graph) : impl_(new implementation(graph)){}\r
+audio_mixer::audio_mixer(const safe_ptr<diagnostics::graph>& graph) : impl_(new impl(graph)){}\r
 void audio_mixer::begin(core::basic_frame& frame){impl_->begin(frame);}\r
 void audio_mixer::visit(core::write_frame& frame){impl_->visit(frame);}\r
 void audio_mixer::end(){impl_->end();}\r

diff --git a/core/mixer/audio/audio_mixer.h b/core/mixer/audio/audio_mixer.h
index 7ff1e5f22a4a3c08a76abe93251a7b251d1016d5..760e116924b08d54629ddee3f54983f07b0a1726 100644 (file)
--- a/core/mixer/audio/audio_mixer.h
+++ b/core/mixer/audio/audio_mixer.h
@@ -57,8 +57,8 @@ public:
        audio_buffer operator()(const video_format_desc& format_desc);\r
        \r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/gpu/device_buffer.cpp b/core/mixer/gpu/device_buffer.cpp
index 6aa9164402779af9cc6a25ae9b3c219a13b30a2b..c6dce8ddd37352b02ffa196ca086e5e1fd80f72b 100644 (file)
--- a/core/mixer/gpu/device_buffer.cpp
+++ b/core/mixer/gpu/device_buffer.cpp
@@ -44,7 +44,7 @@ unsigned int format(int stride)
 \r
 static tbb::atomic<int> g_total_count;\r
 \r
-struct device_buffer::implementation : boost::noncopyable\r
+struct device_buffer::impl : boost::noncopyable\r
 {\r
        GLuint id_;\r
 \r
@@ -55,7 +55,7 @@ struct device_buffer::implementation : boost::noncopyable
        fence            fence_;\r
 \r
 public:\r
-       implementation(int width, int height, int stride) \r
+       impl(int width, int height, int stride) \r
                : width_(width)\r
                , height_(height)\r
                , stride_(stride)\r
@@ -71,7 +71,7 @@ public:
                CASPAR_LOG(trace) << "[device_buffer] [" << ++g_total_count << L"] allocated size:" << width*height*stride;     \r
        }       \r
 \r
-       ~implementation()\r
+       ~impl()\r
        {\r
                try\r
                {\r
@@ -114,7 +114,7 @@ public:
        }\r
 };\r
 \r
-device_buffer::device_buffer(int width, int height, int stride) : impl_(new implementation(width, height, stride)){}\r
+device_buffer::device_buffer(int width, int height, int stride) : impl_(new impl(width, height, stride)){}\r
 int device_buffer::stride() const { return impl_->stride_; }\r
 int device_buffer::width() const { return impl_->width_; }\r
 int device_buffer::height() const { return impl_->height_; }\r

diff --git a/core/mixer/gpu/device_buffer.h b/core/mixer/gpu/device_buffer.h
index a8a4d5b7d90fa41f801dc1ed648f95909bfddf07..6e5b113d1c738318a8778ef2d31e184cea271904 100644 (file)
--- a/core/mixer/gpu/device_buffer.h
+++ b/core/mixer/gpu/device_buffer.h
@@ -48,8 +48,8 @@ private:
 \r
        int id() const;\r
 \r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
        \r
 unsigned int format(int stride);\r

diff --git a/core/mixer/gpu/fence.cpp b/core/mixer/gpu/fence.cpp
index 286b90ad3d6ffb56520d75d078c04efc8e79e52e..600c82e876c7b91cb1ed18f1e3091f1a64e42e65 100644 (file)
--- a/core/mixer/gpu/fence.cpp
+++ b/core/mixer/gpu/fence.cpp
@@ -31,12 +31,12 @@
 \r
 namespace caspar { namespace core {\r
 \r
-struct fence::implementation\r
+struct fence::impl\r
 {\r
        GLsync sync_;\r
 \r
-       implementation() : sync_(0){}\r
-       ~implementation(){glDeleteSync(sync_);}\r
+       impl() : sync_(0){}\r
+       ~impl(){glDeleteSync(sync_);}\r
                \r
        void set()\r
        {\r
@@ -92,7 +92,7 @@ fence::fence()
        static bool log_flag = false;\r
 \r
        if(GLEW_ARB_sync)\r
-               impl_.reset(new implementation());\r
+               impl_.reset(new impl());\r
        else if(!log_flag)\r
        {\r
                CASPAR_LOG(warning) << "[fence] GL_SYNC not supported, running without fences. This might cause performance degradation when running multiple channels and short buffer depth.";\r

diff --git a/core/mixer/gpu/fence.h b/core/mixer/gpu/fence.h
index f5662314927db8514c3c0789c67bb391d89e6741..075a60c6376af7f961612a66b4d7436e7efbcf0b 100644 (file)
--- a/core/mixer/gpu/fence.h
+++ b/core/mixer/gpu/fence.h
@@ -38,8 +38,8 @@ public:
        bool ready() const;\r
        void wait(ogl_device& ogl);\r
 private:\r
-       struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       struct impl;\r
+       std::shared_ptr<impl> impl_;\r
 };\r
 \r
 }}\r

diff --git a/core/mixer/gpu/host_buffer.cpp b/core/mixer/gpu/host_buffer.cpp
index f8fcbecdd5d1eaa43819d2d99066196d3a911b3b..28cd21b34e2374dc8e51dc58761a94fcae2c6523 100644 (file)
--- a/core/mixer/gpu/host_buffer.cpp
+++ b/core/mixer/gpu/host_buffer.cpp
@@ -39,7 +39,7 @@ namespace caspar { namespace core {
 static tbb::atomic<int> g_w_total_count;\r
 static tbb::atomic<int> g_r_total_count;\r
                                                                                                                                                                                                                                                                                                                                \r
-struct host_buffer::implementation : boost::noncopyable\r
+struct host_buffer::impl : boost::noncopyable\r
 {      \r
        GLuint                  pbo_;\r
        const int       size_;\r
@@ -49,7 +49,7 @@ struct host_buffer::implementation : boost::noncopyable
        fence                   fence_;\r
 \r
 public:\r
-       implementation(int size, usage_t usage) \r
+       impl(int size, usage_t usage) \r
                : size_(size)\r
                , data_(nullptr)\r
                , pbo_(0)\r
@@ -68,7 +68,7 @@ public:
                CASPAR_LOG(trace) << "[host_buffer] [" << ++(usage_ == write_only ? g_w_total_count : g_r_total_count) << L"] allocated size:" << size_ << " usage: " << (usage == write_only ? "write_only" : "read_only");\r
        }       \r
 \r
-       ~implementation()\r
+       ~impl()\r
        {\r
                try\r
                {\r
@@ -137,7 +137,7 @@ public:
        }\r
 };\r
 \r
-host_buffer::host_buffer(int size, usage_t usage) : impl_(new implementation(size, usage)){}\r
+host_buffer::host_buffer(int size, usage_t usage) : impl_(new impl(size, usage)){}\r
 const void* host_buffer::data() const {return impl_->data_;}\r
 void* host_buffer::data() {return impl_->data_;}\r
 void host_buffer::map(){impl_->map();}\r

diff --git a/core/mixer/gpu/host_buffer.h b/core/mixer/gpu/host_buffer.h
index 1d7b76ddbd3d2856100980448307b331ecc8ba2c..0edbef4a521f34f40e3f39967b25eaa9aae4488e 100644 (file)
--- a/core/mixer/gpu/host_buffer.h
+++ b/core/mixer/gpu/host_buffer.h
@@ -55,8 +55,8 @@ private:
        friend class ogl_device;\r
        host_buffer(int size, usage_t usage);\r
 \r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/gpu/shader.cpp b/core/mixer/gpu/shader.cpp
index ffd20de2788f46fba708809cf08edfd140bfa881..5628f82878ed807b370a0630eb755414668dfa8a 100644 (file)
--- a/core/mixer/gpu/shader.cpp
+++ b/core/mixer/gpu/shader.cpp
@@ -31,13 +31,13 @@
 \r
 namespace caspar { namespace core {\r
 \r
-struct shader::implementation : boost::noncopyable\r
+struct shader::impl : boost::noncopyable\r
 {\r
        GLuint program_;\r
        std::unordered_map<std::string, GLint> locations_;\r
 public:\r
 \r
-       implementation(const std::string& vertex_source_str, const std::string& fragment_source_str) : program_(0)\r
+       impl(const std::string& vertex_source_str, const std::string& fragment_source_str) : program_(0)\r
        {\r
                GLint success;\r
        \r
@@ -100,7 +100,7 @@ public:
                GL(glUseProgramObjectARB(program_));\r
        }\r
        \r
-       ~implementation()\r
+       ~impl()\r
        {\r
                glDeleteProgram(program_);\r
        }\r
@@ -135,7 +135,7 @@ public:
 };\r
 \r
 \r
-shader::shader(const std::string& vertex_source_str, const std::string& fragment_source_str) : impl_(new implementation(vertex_source_str, fragment_source_str)){}\r
+shader::shader(const std::string& vertex_source_str, const std::string& fragment_source_str) : impl_(new impl(vertex_source_str, fragment_source_str)){}\r
 void shader::set(const std::string& name, bool value){impl_->set(name, value);}\r
 void shader::set(const std::string& name, int value){impl_->set(name, value);}\r
 void shader::set(const std::string& name, float value){impl_->set(name, value);}\r

diff --git a/core/mixer/gpu/shader.h b/core/mixer/gpu/shader.h
index 4be183b6edec7c6ac15c8a741d1824d1c0077cb2..3d079939780dc72cb270c4c196769f51cd13d9e5 100644 (file)
--- a/core/mixer/gpu/shader.h
+++ b/core/mixer/gpu/shader.h
@@ -39,8 +39,8 @@ public:
        void set(const std::string& name, double value);\r
 private:\r
        friend class ogl_device;\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 \r
        int id() const;\r
 };\r

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index d373dcef9d48ddeb6f559797f60c67496686d56b..1677da14b3feec827aebd324d050d5ff62c43fd6 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -54,13 +54,13 @@ GLubyte lower_pattern[] = {
        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,\r
        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff};\r
 \r
-struct image_kernel::implementation : boost::noncopyable\r
+struct image_kernel::impl : boost::noncopyable\r
 {      \r
        safe_ptr<ogl_device>    ogl_;\r
        safe_ptr<shader>                shader_;\r
        bool                                    blend_modes_;\r
                                                        \r
-       implementation(const safe_ptr<ogl_device>& ogl)\r
+       impl(const safe_ptr<ogl_device>& ogl)\r
                : ogl_(ogl)\r
                , shader_(ogl_->invoke([&]{return get_image_shader(*ogl, blend_modes_);}))\r
        {\r
@@ -233,7 +233,7 @@ struct image_kernel::implementation : boost::noncopyable
        }\r
 };\r
 \r
-image_kernel::image_kernel(const safe_ptr<ogl_device>& ogl) : impl_(new implementation(ogl)){}\r
+image_kernel::image_kernel(const safe_ptr<ogl_device>& ogl) : impl_(new impl(ogl)){}\r
 void image_kernel::draw(draw_params&& params)\r
 {\r
        impl_->draw(std::move(params));\r

diff --git a/core/mixer/image/image_kernel.h b/core/mixer/image/image_kernel.h
index 8737c64bc5b6991600afb95c59b371d3d99ce2a2..1d5902d6914eb643f6d6209ab5a4ab1b45a83d7f 100644 (file)
--- a/core/mixer/image/image_kernel.h
+++ b/core/mixer/image/image_kernel.h
@@ -68,8 +68,8 @@ public:
        image_kernel(const safe_ptr<ogl_device>& ogl);\r
        void draw(draw_params&& params);\r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 72e71245458981a694d78f548f6b720e821158b6..2bebf2b63338fe521c13ca8ca59c06bcebc33d9b 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -236,14 +236,14 @@ private:
        }\r
 };\r
                \r
-struct image_mixer::implementation : boost::noncopyable\r
+struct image_mixer::impl : boost::noncopyable\r
 {      \r
        safe_ptr<ogl_device>                    ogl_;\r
        image_renderer                                  renderer_;\r
        std::vector<frame_transform>    transform_stack_;\r
        std::vector<layer>                              layers_; // layer/stream/items\r
 public:\r
-       implementation(const safe_ptr<ogl_device>& ogl) \r
+       impl(const safe_ptr<ogl_device>& ogl) \r
                : ogl_(ogl)\r
                , renderer_(ogl)\r
                , transform_stack_(1)   \r
@@ -285,7 +285,7 @@ public:
        }\r
 };\r
 \r
-image_mixer::image_mixer(const safe_ptr<ogl_device>& ogl) : impl_(new implementation(ogl)){}\r
+image_mixer::image_mixer(const safe_ptr<ogl_device>& ogl) : impl_(new impl(ogl)){}\r
 void image_mixer::begin(basic_frame& frame){impl_->begin(frame);}\r
 void image_mixer::visit(write_frame& frame){impl_->visit(frame);}\r
 void image_mixer::end(){impl_->end();}\r

diff --git a/core/mixer/image/image_mixer.h b/core/mixer/image/image_mixer.h
index 1b413fe1da6631df964fa307ab5af349c9fd75c3..7ca5a5f5ff5ec1791712f85621a9720ff655bb9a 100644 (file)
--- a/core/mixer/image/image_mixer.h
+++ b/core/mixer/image/image_mixer.h
@@ -54,8 +54,8 @@ public:
        boost::unique_future<safe_ptr<host_buffer>> operator()(const video_format_desc& format_desc);\r
                \r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index 90b7405c5b331dd6a04a55578ee2bc50cedf2c1b..41e94b835154dada7b460d54343e6137f564c097 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -57,7 +57,7 @@
 \r
 namespace caspar { namespace core {\r
                \r
-struct mixer::implementation : boost::noncopyable\r
+struct mixer::impl : boost::noncopyable\r
 {              \r
        safe_ptr<diagnostics::graph>                            graph_;\r
        boost::timer                                                            mix_timer_;\r
@@ -76,7 +76,7 @@ struct mixer::implementation : boost::noncopyable
        executor executor_;\r
 \r
 public:\r
-       implementation(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl) \r
+       impl(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl) \r
                : graph_(graph)\r
                , format_desc_(format_desc)\r
                , ogl_(ogl)\r
@@ -169,7 +169,7 @@ public:
 };\r
        \r
 mixer::mixer(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl) \r
-       : impl_(new implementation(graph, format_desc, ogl)){}\r
+       : impl_(new impl(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
 void mixer::link_target(const std::weak_ptr<target_t>& target){impl_->link_target(target);}\r
 core::video_format_desc mixer::get_video_format_desc() const { return impl_->get_video_format_desc(); }\r

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index d675dd8938ad002e5c06a6d6c8af87c627e52d9f..48b4c7b40ebd42dcbf70398c9e44b38fc87c029a 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -70,8 +70,8 @@ public:
        boost::unique_future<boost::property_tree::wptree> info() const;\r
        \r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/read_frame.cpp b/core/mixer/read_frame.cpp
index 31d7d0247f77dbda184533750b3afb5aaf006692..1ed63799fb1d080baa2eb64a607b23b298a781ca 100644 (file)
--- a/core/mixer/read_frame.cpp
+++ b/core/mixer/read_frame.cpp
@@ -31,7 +31,7 @@
 \r
 namespace caspar { namespace core {\r
                                                                                                                                                                                                                                                                                                                        \r
-struct read_frame::implementation : boost::noncopyable\r
+struct read_frame::impl : boost::noncopyable\r
 {\r
        safe_ptr<ogl_device>            ogl_;\r
        int                                                     width_;\r
@@ -41,7 +41,7 @@ struct read_frame::implementation : boost::noncopyable
        audio_buffer                            audio_data_;\r
 \r
 public:\r
-       implementation(const safe_ptr<ogl_device>& ogl, int width, int height, safe_ptr<host_buffer>&& image_data, audio_buffer&& audio_data) \r
+       impl(const safe_ptr<ogl_device>& ogl, int width, int height, safe_ptr<host_buffer>&& image_data, audio_buffer&& audio_data) \r
                : ogl_(ogl)\r
                , width_(width)\r
                , height_(height)\r
@@ -70,7 +70,7 @@ public:
 };\r
 \r
 read_frame::read_frame(const safe_ptr<ogl_device>& ogl, int width, int height, safe_ptr<host_buffer>&& image_data, audio_buffer&& audio_data) \r
-       : impl_(new implementation(ogl, width, height, std::move(image_data), std::move(audio_data))){}\r
+       : impl_(new impl(ogl, width, height, std::move(image_data), std::move(audio_data))){}\r
 read_frame::read_frame(){}\r
 const boost::iterator_range<const uint8_t*> read_frame::image_data()\r
 {\r

diff --git a/core/mixer/read_frame.h b/core/mixer/read_frame.h
index e6d2d059761f612f6c6c8a97157b895fe6aa547b..d72f07b71e2703f2caba5aaa8977a3bdf47cc7d6 100644 (file)
--- a/core/mixer/read_frame.h
+++ b/core/mixer/read_frame.h
@@ -50,8 +50,8 @@ public:
        int height() const;\r
                \r
 private:\r
-       struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       struct impl;\r
+       std::shared_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/write_frame.cpp b/core/mixer/write_frame.cpp
index 17ec64a8694e433e8e9daf199fedf4af05ccee89..78f2c3d604a17ba64bce3a5fe57ee0e1838f1bfb 100644 (file)
--- a/core/mixer/write_frame.cpp
+++ b/core/mixer/write_frame.cpp
@@ -34,7 +34,7 @@
 \r
 namespace caspar { namespace core {\r
                                                                                                                                                                                                                                                                                                                        \r
-struct write_frame::implementation\r
+struct write_frame::impl\r
 {                              \r
        std::shared_ptr<ogl_device>                                     ogl_;\r
        std::vector<std::shared_ptr<host_buffer>>       buffers_;\r
@@ -44,12 +44,12 @@ struct write_frame::implementation
        const void*                                                                     tag_;\r
        core::field_mode::type                                          mode_;\r
 \r
-       implementation(const void* tag)\r
+       impl(const void* tag)\r
                : tag_(tag)\r
        {\r
        }\r
 \r
-       implementation(const safe_ptr<ogl_device>& ogl, const void* tag, const core::pixel_format_desc& desc) \r
+       impl(const safe_ptr<ogl_device>& ogl, const void* tag, const core::pixel_format_desc& desc) \r
                : ogl_(ogl)\r
                , desc_(desc)\r
                , tag_(tag)\r
@@ -108,10 +108,10 @@ struct write_frame::implementation
        }\r
 };\r
        \r
-write_frame::write_frame(const void* tag) : impl_(new implementation(tag)){}\r
+write_frame::write_frame(const void* tag) : impl_(new impl(tag)){}\r
 write_frame::write_frame(const safe_ptr<ogl_device>& ogl, const void* tag, const core::pixel_format_desc& desc) \r
-       : impl_(new implementation(ogl, tag, desc)){}\r
-write_frame::write_frame(const write_frame& other) : impl_(new implementation(*other.impl_)){}\r
+       : impl_(new impl(ogl, tag, desc)){}\r
+write_frame::write_frame(const write_frame& other) : impl_(new impl(*other.impl_)){}\r
 write_frame::write_frame(write_frame&& other) : impl_(std::move(other.impl_)){}\r
 write_frame& write_frame::operator=(const write_frame& other)\r
 {\r

diff --git a/core/mixer/write_frame.h b/core/mixer/write_frame.h
index 29c25c8d379ee426c4e9bdb6f2d31a982ba63ee6..0702f1e97d5a97304000f5561f308a912b846b68 100644 (file)
--- a/core/mixer/write_frame.h
+++ b/core/mixer/write_frame.h
@@ -78,8 +78,8 @@ private:
        \r
        const std::vector<safe_ptr<device_buffer>>& get_textures() const;\r
 \r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 \r

diff --git a/core/producer/frame/basic_frame.cpp b/core/producer/frame/basic_frame.cpp
index cccafecff61bc75404732808dc6d8940bd068a8d..60fb854806f858fc2723a0886499d4ccaa951070 100644 (file)
--- a/core/producer/frame/basic_frame.cpp
+++ b/core/producer/frame/basic_frame.cpp
@@ -30,24 +30,24 @@
 \r
 namespace caspar { namespace core {\r
                                                                                                                                                                                                                                                                                                                \r
-struct basic_frame::implementation\r
+struct basic_frame::impl\r
 {              \r
        std::vector<safe_ptr<basic_frame>> frames_;\r
 \r
        frame_transform frame_transform_;       \r
        \r
 public:\r
-       implementation(const std::vector<safe_ptr<basic_frame>>& frames) : frames_(frames) \r
+       impl(const std::vector<safe_ptr<basic_frame>>& frames) : frames_(frames) \r
        {\r
        }\r
-       implementation(std::vector<safe_ptr<basic_frame>>&& frames) : frames_(std::move(frames))\r
+       impl(std::vector<safe_ptr<basic_frame>>&& frames) : frames_(std::move(frames))\r
        {\r
        }\r
-       implementation(safe_ptr<basic_frame>&& frame) \r
+       impl(safe_ptr<basic_frame>&& frame) \r
        {\r
                frames_.push_back(std::move(frame));\r
        }\r
-       implementation(const safe_ptr<basic_frame>& frame)              \r
+       impl(const safe_ptr<basic_frame>& frame)                \r
        { \r
                frames_.push_back(frame);\r
        }\r
@@ -61,12 +61,12 @@ public:
        }       \r
 };\r
        \r
-basic_frame::basic_frame() : impl_(new implementation(std::vector<safe_ptr<basic_frame>>())){}\r
-basic_frame::basic_frame(const std::vector<safe_ptr<basic_frame>>& frames) : impl_(new implementation(frames)){}\r
-basic_frame::basic_frame(const basic_frame& other) : impl_(new implementation(*other.impl_)){}\r
-basic_frame::basic_frame(std::vector<safe_ptr<basic_frame>>&& frames) : impl_(new implementation(frames)){}\r
-basic_frame::basic_frame(const safe_ptr<basic_frame>& frame) : impl_(new implementation(frame)){}\r
-basic_frame::basic_frame(safe_ptr<basic_frame>&& frame)  : impl_(new implementation(std::move(frame))){}\r
+basic_frame::basic_frame() : impl_(new impl(std::vector<safe_ptr<basic_frame>>())){}\r
+basic_frame::basic_frame(const std::vector<safe_ptr<basic_frame>>& frames) : impl_(new impl(frames)){}\r
+basic_frame::basic_frame(const basic_frame& other) : impl_(new impl(*other.impl_)){}\r
+basic_frame::basic_frame(std::vector<safe_ptr<basic_frame>>&& frames) : impl_(new impl(frames)){}\r
+basic_frame::basic_frame(const safe_ptr<basic_frame>& frame) : impl_(new impl(frame)){}\r
+basic_frame::basic_frame(safe_ptr<basic_frame>&& frame)  : impl_(new impl(std::move(frame))){}\r
 basic_frame::basic_frame(basic_frame&& other) : impl_(std::move(other.impl_)){}\r
 basic_frame& basic_frame::operator=(const basic_frame& other)\r
 {\r

diff --git a/core/producer/frame/basic_frame.h b/core/producer/frame/basic_frame.h
index 06dbce553c8f59754e3a50649b3886c45d0f09db..e207dc7f32a753e644426f34565970ff0ca1443f 100644 (file)
--- a/core/producer/frame/basic_frame.h
+++ b/core/producer/frame/basic_frame.h
@@ -74,8 +74,8 @@ public:
        \r
        virtual void accept(frame_visitor& visitor);\r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
        \r
 safe_ptr<basic_frame> disable_audio(const safe_ptr<basic_frame>& frame);\r

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 27732d69e2af10c1a24591d6e309e2c015443679..91235762f4b77f7aaba299f2c18b2699c9a8f8fe 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -31,7 +31,7 @@
 \r
 namespace caspar { namespace core {\r
 \r
-struct layer::implementation\r
+struct layer::impl\r
 {                              \r
        safe_ptr<frame_producer>        foreground_;\r
        safe_ptr<frame_producer>        background_;\r
@@ -40,7 +40,7 @@ struct layer::implementation
        bool                                            is_paused_;\r
 \r
 public:\r
-       implementation() \r
+       impl() \r
                : foreground_(frame_producer::empty())\r
                , background_(frame_producer::empty())\r
                , frame_number_(0)\r
@@ -155,14 +155,14 @@ public:
        }\r
 };\r
 \r
-layer::layer() : impl_(new implementation()){}\r
+layer::layer() : impl_(new impl()){}\r
 layer::layer(layer&& other) : impl_(std::move(other.impl_)){}\r
 layer& layer::operator=(layer&& other)\r
 {\r
        impl_ = std::move(other.impl_);\r
        return *this;\r
 }\r
-layer::layer(const layer& other) : impl_(new implementation(*other.impl_)){}\r
+layer::layer(const layer& other) : impl_(new impl(*other.impl_)){}\r
 layer& layer::operator=(const layer& other)\r
 {\r
        layer temp(other);\r

diff --git a/core/producer/layer.h b/core/producer/layer.h
index 8d29fb82d05871ce10b13cefe69110b4233de49d..f3d680a943beef67c60748133aef9c0fdaa1f1b8 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -63,8 +63,8 @@ public:
 \r
        boost::property_tree::wptree info() const;\r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 9154c7148e2e1f08511eac8b5376a80f435107ba..7b06fa3d2d035778a5b180d0604172057592b36a 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -77,7 +77,7 @@ public:
        }\r
 };\r
 \r
-struct stage::implementation : public std::enable_shared_from_this<implementation>\r
+struct stage::impl : public std::enable_shared_from_this<impl>\r
                                                         , boost::noncopyable\r
 {              \r
        safe_ptr<diagnostics::graph>                                                    graph_;\r
@@ -93,7 +93,7 @@ struct stage::implementation : public std::enable_shared_from_this<implementatio
 \r
        executor                                                                                                executor_;\r
 public:\r
-       implementation(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc)  \r
+       impl(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc)  \r
                : graph_(graph)\r
                , format_desc_(format_desc)\r
                , executor_(L"stage")\r
@@ -104,7 +104,7 @@ public:
 \r
        void spawn_token()\r
        {\r
-               std::weak_ptr<implementation> self = shared_from_this();\r
+               std::weak_ptr<impl> self = shared_from_this();\r
                executor_.begin_invoke([=]{tick(self);});\r
        }\r
 \r
@@ -113,7 +113,7 @@ public:
                targets_.push_back(target);\r
        }\r
 \r
-       void tick(const std::weak_ptr<implementation>& self)\r
+       void tick(const std::weak_ptr<impl>& self)\r
        {               \r
                try\r
                {\r
@@ -357,7 +357,7 @@ public:
        }\r
 };\r
 \r
-stage::stage(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc) : impl_(new implementation(graph, format_desc)){}\r
+stage::stage(const safe_ptr<diagnostics::graph>& graph, const video_format_desc& format_desc) : impl_(new impl(graph, format_desc)){}\r
 void stage::link_target(const std::weak_ptr<target_t>& target){impl_->link_target(target);}\r
 void stage::set_frame_transform(int index, const core::frame_transform& transform, unsigned int mix_duration, const std::wstring& tween){impl_->set_transform(index, transform, mix_duration, tween);}\r
 void stage::apply_frame_transform(int index, const std::function<core::frame_transform(core::frame_transform)>& transform, unsigned int mix_duration, const std::wstring& tween){impl_->apply_transform(index, transform, mix_duration, tween);}\r

diff --git a/core/producer/stage.h b/core/producer/stage.h
index 8bf798995819ac56aa172931c8584265cd8fbd31..b8e13c8e6bb62c5b0d34d1cc898e4656a0305378 100644 (file)
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -75,8 +75,8 @@ public:
        void set_video_format_desc(const video_format_desc& format_desc);\r
 \r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index c66743de9be18f531af7bd8e0991a3177ce73fa1..45d8339a7f0c69a0790fc8975c28e1a729440235 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -40,7 +40,7 @@
 \r
 namespace caspar { namespace core {\r
 \r
-struct video_channel::implementation sealed : public frame_factory\r
+struct video_channel::impl sealed : public frame_factory\r
 {\r
        const int                                               index_;\r
        video_format_desc                               format_desc_;\r
@@ -52,7 +52,7 @@ struct video_channel::implementation sealed : public frame_factory
        safe_ptr<caspar::core::stage>   stage_;\r
        \r
 public:\r
-       implementation(int index, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl)  \r
+       impl(int index, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl)  \r
                : index_(index)\r
                , format_desc_(format_desc)\r
                , ogl_(ogl)\r
@@ -128,7 +128,7 @@ public:
        }\r
 };\r
 \r
-video_channel::video_channel(int index, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl) : impl_(new implementation(index, format_desc, ogl)){}\r
+video_channel::video_channel(int index, const video_format_desc& format_desc, const safe_ptr<ogl_device>& ogl) : impl_(new impl(index, format_desc, ogl)){}\r
 safe_ptr<stage> video_channel::stage() { return impl_->stage_;} \r
 safe_ptr<mixer> video_channel::mixer() { return impl_->mixer_;} \r
 safe_ptr<frame_factory> video_channel::frame_factory() { return impl_;} \r

diff --git a/core/video_channel.h b/core/video_channel.h
index 3cf3b0b0bc4e4b491de1eea58f68ca12d31f0dc0..2f31728f0dfb95f626686c12d90a5dc1d5c547ba 100644 (file)
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -52,8 +52,8 @@ public:
        boost::property_tree::wptree info() const;\r
 \r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index c39fcf6160e283df3e5ffd321c3a96ceca6694da..3fbcb42c3fbdb78b02dad3a6c7f6bf28d5e4f67d 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -51,7 +51,7 @@ extern "C"
 \r
 namespace caspar { namespace ffmpeg {\r
        \r
-struct audio_decoder::implementation : boost::noncopyable\r
+struct audio_decoder::impl : boost::noncopyable\r
 {      \r
        int                                                                                                                     index_;\r
        const safe_ptr<AVCodecContext>                                                          codec_context_;         \r
@@ -66,7 +66,7 @@ struct audio_decoder::implementation : boost::noncopyable
        const int64_t                                                                                           nb_frames_;\r
        tbb::atomic<uint32_t>                                                                           file_frame_number_;\r
 public:\r
-       explicit implementation(const safe_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc) \r
+       explicit impl(const safe_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc) \r
                : format_desc_(format_desc)     \r
                , codec_context_(open_codec(*context, AVMEDIA_TYPE_AUDIO, index_))\r
                , resampler_(format_desc.audio_channels,        codec_context_->channels,\r
@@ -145,7 +145,7 @@ public:
        }\r
 };\r
 \r
-audio_decoder::audio_decoder(const safe_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc) : impl_(new implementation(context, format_desc)){}\r
+audio_decoder::audio_decoder(const safe_ptr<AVFormatContext>& context, const core::video_format_desc& format_desc) : impl_(new impl(context, format_desc)){}\r
 void audio_decoder::push(const std::shared_ptr<AVPacket>& packet){impl_->push(packet);}\r
 bool audio_decoder::ready() const{return impl_->ready();}\r
 std::shared_ptr<core::audio_buffer> audio_decoder::poll(){return impl_->poll();}\r

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.h b/modules/ffmpeg/producer/audio/audio_decoder.h
index 415886e1b45873616769335b10e1036a09d13186..102e20c9dae23fba86a82452fb322e7f96d84f49 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -53,8 +53,8 @@ public:
        \r
        uint32_t file_frame_number() const;\r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/audio/audio_resampler.cpp b/modules/ffmpeg/producer/audio/audio_resampler.cpp
index ef29ff53e5dddffa640cd117f32ed202b6705e48..f60234b99c1e3c3cb6f09c6115e5806654e97e22 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_resampler.cpp
+++ b/modules/ffmpeg/producer/audio/audio_resampler.cpp
@@ -40,7 +40,7 @@ extern "C"
 \r
 namespace caspar { namespace ffmpeg {\r
 \r
-struct audio_resampler::implementation\r
+struct audio_resampler::impl\r
 {      \r
        std::shared_ptr<ReSampleContext> resampler_;\r
        \r
@@ -53,7 +53,7 @@ struct audio_resampler::implementation
        const int                       input_channels_;\r
        const AVSampleFormat    input_sample_format_;\r
 \r
-       implementation(int output_channels, int input_channels, int output_sample_rate, int input_sample_rate, AVSampleFormat output_sample_format, AVSampleFormat input_sample_format)\r
+       impl(int output_channels, int input_channels, int output_sample_rate, int input_sample_rate, AVSampleFormat output_sample_format, AVSampleFormat input_sample_format)\r
                : output_channels_(output_channels)\r
                , output_sample_format_(output_sample_format)\r
                , input_channels_(input_channels)\r
@@ -101,7 +101,7 @@ struct audio_resampler::implementation
 \r
 \r
 audio_resampler::audio_resampler(int output_channels, int input_channels, int output_sample_rate, int input_sample_rate, AVSampleFormat output_sample_format, AVSampleFormat input_sample_format)\r
-                               : impl_(new implementation(output_channels, input_channels, output_sample_rate, input_sample_rate, output_sample_format, input_sample_format)){}\r
+                               : impl_(new impl(output_channels, input_channels, output_sample_rate, input_sample_rate, output_sample_format, input_sample_format)){}\r
 std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>> audio_resampler::resample(std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>>&& data){return impl_->resample(std::move(data));}\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/audio/audio_resampler.h b/modules/ffmpeg/producer/audio/audio_resampler.h
index 74c1f9acb31a182ac820e03cbc5b5eea8e495b23..7048d1e7b8779fda3d19885657b60708daad774d 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_resampler.h
+++ b/modules/ffmpeg/producer/audio/audio_resampler.h
@@ -36,8 +36,8 @@ public:
        \r
        std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>> resample(std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>>&& data);\r
 private:\r
-       struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       struct impl;\r
+       std::shared_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp
index 2ac13ff9c828dd420ac667ae11f31985afc9dc41..598d6a72c90ea90fafcf790bf40fb14369189b10 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.cpp
+++ b/modules/ffmpeg/producer/filter/filter.cpp
@@ -102,7 +102,7 @@ static int query_formats_410(AVFilterContext *ctx)
     return 0;\r
 }\r
 \r
-struct filter::implementation\r
+struct filter::impl\r
 {\r
        std::wstring                                    filters_;\r
        std::shared_ptr<AVFilterGraph>  graph_; \r
@@ -112,7 +112,7 @@ struct filter::implementation
        std::vector<PixelFormat>                pix_fmts_;\r
        std::queue<safe_ptr<AVFrame>>   bypass_;\r
                \r
-       implementation(const std::wstring& filters, const std::vector<PixelFormat>& pix_fmts) \r
+       impl(const std::wstring& filters, const std::vector<PixelFormat>& pix_fmts) \r
                : filters_(filters)\r
                , parallel_yadif_ctx_(nullptr)\r
                , pix_fmts_(pix_fmts)\r
@@ -314,7 +314,7 @@ struct filter::implementation
        }\r
 };\r
 \r
-filter::filter(const std::wstring& filters, const std::vector<PixelFormat>& pix_fmts) : impl_(new implementation(filters, pix_fmts)){}\r
+filter::filter(const std::wstring& filters, const std::vector<PixelFormat>& pix_fmts) : impl_(new impl(filters, pix_fmts)){}\r
 filter::filter(filter&& other) : impl_(std::move(other.impl_)){}\r
 filter& filter::operator=(filter&& other){impl_ = std::move(other.impl_); return *this;}\r
 void filter::push(const std::shared_ptr<AVFrame>& frame){impl_->push(frame);}\r

diff --git a/modules/ffmpeg/producer/filter/filter.h b/modules/ffmpeg/producer/filter/filter.h
index f1989201b729803c4dac927065b4c16572076046..ae1d6463814370bfad91d516ee90085c711e8d0f 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.h
+++ b/modules/ffmpeg/producer/filter/filter.h
@@ -90,8 +90,8 @@ public:
                return is_deinterlacing(filter_str());\r
        }\r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index 23441b06f5a992214a4f4a424c426eecea970d3e..13fc0e80de31077691653fdf0194ccc9c071e913 100644 (file)
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -64,7 +64,7 @@ static const size_t MAX_BUFFER_COUNT = 100;
 static const size_t MIN_BUFFER_COUNT = 4;\r
 static const size_t MAX_BUFFER_SIZE  = 16 * 1000000;\r
        \r
-struct input::implementation : boost::noncopyable\r
+struct input::impl : boost::noncopyable\r
 {              \r
        safe_ptr<diagnostics::graph>                                                            graph_;\r
 \r
@@ -88,7 +88,7 @@ struct input::implementation : boost::noncopyable
 \r
        tbb::recursive_mutex                                                                            mutex_;\r
 \r
-       explicit implementation(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, uint32_t start, uint32_t length) \r
+       explicit impl(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, uint32_t start, uint32_t length) \r
                : graph_(graph)\r
                , format_context_(open_input(filename))         \r
                , default_stream_index_(av_find_default_stream_index(format_context_.get()))\r
@@ -114,7 +114,7 @@ struct input::implementation : boost::noncopyable
                CASPAR_LOG(info) << print() << L" Initialized.";\r
        }\r
 \r
-       ~implementation()\r
+       ~impl()\r
        {\r
                is_running_ = false;\r
                buffer_cond_.notify_all();\r
@@ -279,7 +279,7 @@ struct input::implementation : boost::noncopyable
 };\r
 \r
 input::input(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, uint32_t start, uint32_t length) \r
-       : impl_(new implementation(graph, filename, loop, start, length)){}\r
+       : impl_(new impl(graph, filename, loop, start, length)){}\r
 bool input::eof() const {return impl_->is_eof_;}\r
 bool input::try_pop(std::shared_ptr<AVPacket>& packet){return impl_->try_pop(packet);}\r
 safe_ptr<AVFormatContext> input::context(){return impl_->format_context_;}\r

diff --git a/modules/ffmpeg/producer/input/input.h b/modules/ffmpeg/producer/input/input.h
index 197fb117dc225d91582085a4722073f5a498e012..b306e70191b4f217ed339c7fcb250d268a560372 100644 (file)
--- a/modules/ffmpeg/producer/input/input.h
+++ b/modules/ffmpeg/producer/input/input.h
@@ -57,8 +57,8 @@ public:
 \r
        safe_ptr<AVFormatContext> context();\r
 private:\r
-       struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       struct impl;\r
+       std::shared_ptr<impl> impl_;\r
 };\r
 \r
        \r

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index 643dd4c1a1baa593da3b715caf692f4dce59d695..86a132ea43da9035a9fb0b8649a40b639d32ff05 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -65,7 +65,7 @@ using namespace caspar::core;
 \r
 namespace caspar { namespace ffmpeg {\r
        \r
-struct frame_muxer::implementation : boost::noncopyable\r
+struct frame_muxer::impl : boost::noncopyable\r
 {      \r
        std::queue<std::queue<safe_ptr<write_frame>>>   video_streams_;\r
        std::queue<core::audio_buffer>                                  audio_streams_;\r
@@ -84,7 +84,7 @@ struct frame_muxer::implementation : boost::noncopyable
        const std::wstring                                                              filter_str_;\r
        bool                                                                                    force_deinterlacing_;\r
                \r
-       implementation(double in_fps, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter_str)\r
+       impl(double in_fps, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter_str)\r
                : display_mode_(display_mode::invalid)\r
                , in_fps_(in_fps)\r
                , format_desc_(frame_factory->get_video_format_desc())\r
@@ -373,7 +373,7 @@ struct frame_muxer::implementation : boost::noncopyable
 };\r
 \r
 frame_muxer::frame_muxer(double in_fps, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter)\r
-       : impl_(new implementation(in_fps, frame_factory, filter)){}\r
+       : impl_(new impl(in_fps, frame_factory, filter)){}\r
 void frame_muxer::push(const std::shared_ptr<AVFrame>& video_frame, int flags){impl_->push(video_frame, flags);}\r
 void frame_muxer::push(const std::shared_ptr<core::audio_buffer>& audio_samples){return impl_->push(audio_samples);}\r
 std::shared_ptr<basic_frame> frame_muxer::poll(){return impl_->poll();}\r

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.h b/modules/ffmpeg/producer/muxer/frame_muxer.h
index 33c5eb9376961b38806bbaa63469d6b304812de7..f92e0fadf1201a9698725f9e0ead5e9ebeb97eb5 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.h
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.h
@@ -60,8 +60,8 @@ public:
 \r
        uint32_t calc_nb_frames(uint32_t nb_frames) const;\r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index aee1b5c15e00405e5150cba67383cb4bd9208332..e5d8f07cbe7f841d66dfe02bbdc6c9fcd4b12438 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -51,7 +51,7 @@ extern "C"
 \r
 namespace caspar { namespace ffmpeg {\r
        \r
-struct video_decoder::implementation : boost::noncopyable\r
+struct video_decoder::impl : boost::noncopyable\r
 {\r
        int                                                                             index_;\r
        const safe_ptr<AVCodecContext>                  codec_context_;\r
@@ -67,7 +67,7 @@ struct video_decoder::implementation : boost::noncopyable
        tbb::atomic<uint32_t>                                   file_frame_number_;\r
 \r
 public:\r
-       explicit implementation(const safe_ptr<AVFormatContext>& context) \r
+       explicit impl(const safe_ptr<AVFormatContext>& context) \r
                : codec_context_(open_codec(*context, AVMEDIA_TYPE_VIDEO, index_))\r
                , nb_frames_(static_cast<uint32_t>(context->streams[index_]->nb_frames))\r
                , width_(codec_context_->width)\r
@@ -147,7 +147,7 @@ public:
        }\r
 };\r
 \r
-video_decoder::video_decoder(const safe_ptr<AVFormatContext>& context) : impl_(new implementation(context)){}\r
+video_decoder::video_decoder(const safe_ptr<AVFormatContext>& context) : impl_(new impl(context)){}\r
 void video_decoder::push(const std::shared_ptr<AVPacket>& packet){impl_->push(packet);}\r
 std::shared_ptr<AVFrame> video_decoder::poll(){return impl_->poll();}\r
 bool video_decoder::ready() const{return impl_->ready();}\r

diff --git a/modules/ffmpeg/producer/video/video_decoder.h b/modules/ffmpeg/producer/video/video_decoder.h
index b30c701137dfdd5fe9424de96d187421a1603013..65127b6ea298e29cf6c35574a162b96ac472fb04 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.h
+++ b/modules/ffmpeg/producer/video/video_decoder.h
@@ -56,8 +56,8 @@ public:
        bool     is_progressive() const;\r
 \r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/flash/producer/cg_producer.cpp b/modules/flash/producer/cg_producer.cpp
index 86fbb5a7fd97cbf9170bea0b91a18545e34d63aa..a7fdd2fed20c143edf1ed64843d5e38620363c98 100644 (file)
--- a/modules/flash/producer/cg_producer.cpp
+++ b/modules/flash/producer/cg_producer.cpp
@@ -37,11 +37,11 @@
                \r
 namespace caspar { namespace flash {\r
        \r
-struct cg_producer::implementation : boost::noncopyable\r
+struct cg_producer::impl : boost::noncopyable\r
 {\r
        safe_ptr<core::frame_producer> flash_producer_;\r
 public:\r
-       implementation(const safe_ptr<core::frame_producer>& frame_producer) \r
+       impl(const safe_ptr<core::frame_producer>& frame_producer) \r
                : flash_producer_(frame_producer)\r
        {}\r
        \r
@@ -240,7 +240,7 @@ safe_ptr<core::frame_producer> create_cg_producer(const safe_ptr<core::frame_fac
        return make_safe<cg_producer>(flash::create_producer(frame_factory, boost::assign::list_of<std::wstring>()));   \r
 }\r
 \r
-cg_producer::cg_producer(const safe_ptr<core::frame_producer>& frame_producer) : impl_(new implementation(frame_producer)){}\r
+cg_producer::cg_producer(const safe_ptr<core::frame_producer>& frame_producer) : impl_(new impl(frame_producer)){}\r
 cg_producer::cg_producer(cg_producer&& other) : impl_(std::move(other.impl_)){}\r
 safe_ptr<core::basic_frame> cg_producer::receive(int flags){return impl_->receive(flags);}\r
 safe_ptr<core::basic_frame> cg_producer::last_frame() const{return impl_->last_frame();}\r

diff --git a/modules/flash/producer/cg_producer.h b/modules/flash/producer/cg_producer.h
index 020d2493c1e5a206e63079d8a42df67ae87baa61..ce0674d3630455bdfeaf8189db45650d9c536af2 100644 (file)
--- a/modules/flash/producer/cg_producer.h
+++ b/modules/flash/producer/cg_producer.h
@@ -61,8 +61,8 @@ public:
        std::wstring template_host_info();\r
 \r
 private:\r
-       struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       struct impl;\r
+       std::shared_ptr<impl> impl_;\r
 };\r
 safe_ptr<cg_producer> get_default_cg_producer(const safe_ptr<core::video_channel>& video_channel, int layer_index = cg_producer::DEFAULT_LAYER);\r
 \r

diff --git a/protocol/util/AsyncEventServer.cpp b/protocol/util/AsyncEventServer.cpp
index 9c55c89400ac15e38c93bc499f17f0ec8e8c6ebe..c50bdbe07a8bcae6787220684243b906c1798569 100644 (file)
--- a/protocol/util/AsyncEventServer.cpp
+++ b/protocol/util/AsyncEventServer.cpp
@@ -20,7 +20,7 @@
 */\r
 \r
  \r
-// AsyncEventServer.cpp: implementation of the AsyncEventServer class.\r
+// AsyncEventServer.cpp: impl of the AsyncEventServer class.\r
 //\r
 //////////////////////////////////////////////////////////////////////\r
 \r

diff --git a/shell/server.cpp b/shell/server.cpp
index a5d3f20f7f3705369108924c623c015772d82701..57b5f41c9652a918fff5c9ed2fb9942947cad6e4 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -60,13 +60,13 @@ namespace caspar {
 using namespace core;\r
 using namespace protocol;\r
 \r
-struct server::implementation : boost::noncopyable\r
+struct server::impl : boost::noncopyable\r
 {\r
        safe_ptr<ogl_device>                                            ogl_;\r
        std::vector<safe_ptr<IO::AsyncEventServer>> async_servers_;     \r
        std::vector<safe_ptr<video_channel>>            channels_;\r
 \r
-       implementation()                \r
+       impl()          \r
                : ogl_(ogl_device::create())\r
        {                       \r
                ffmpeg::init();\r
@@ -97,7 +97,7 @@ struct server::implementation : boost::noncopyable
                CASPAR_LOG(info) << L"Initialized controllers.";\r
        }\r
 \r
-       ~implementation()\r
+       ~impl()\r
        {               \r
                image::uninit();\r
                ffmpeg::uninit();\r
@@ -183,7 +183,7 @@ struct server::implementation : boost::noncopyable
        }\r
 };\r
 \r
-server::server() : impl_(new implementation()){}\r
+server::server() : impl_(new impl()){}\r
 \r
 const std::vector<safe_ptr<video_channel>> server::get_channels() const\r
 {\r

diff --git a/shell/server.h b/shell/server.h
index 4506b01be4b82836c58f3ad92fc79f8d414ed704..ec37e1387d3c4138bf61f482dc4189c3cfcc7555 100644 (file)
--- a/shell/server.h
+++ b/shell/server.h
@@ -39,8 +39,8 @@ public:
        server();\r
        const std::vector<safe_ptr<core::video_channel>> get_channels() const;\r
 private:\r
-       struct implementation;\r
-       safe_ptr<implementation> impl_;\r
+       struct impl;\r
+       safe_ptr<impl> impl_;\r
 };\r
 \r
 }
\ No newline at end of file