2.1.0: Changed naming conventions for getters.

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

diff --git a/accelerator/cpu/image/image_mixer.cpp b/accelerator/cpu/image/image_mixer.cpp
index e1eb0caef515234d04a63079b02273eba4766735..ab24ad91969a948bc82855ac2158360e3483759e 100644 (file)
--- a/accelerator/cpu/image/image_mixer.cpp
+++ b/accelerator/cpu/image/image_mixer.cpp
@@ -318,18 +318,18 @@ public:
                if(frame == nullptr)\r
                        return;\r
 \r
-               if(frame->get_pixel_format_desc().format == core::pixel_format::invalid)\r
+               if(frame->pixel_format_desc().format == core::pixel_format::invalid)\r
                        return;\r
 \r
-               if(frame->get_buffers().empty())\r
+               if(frame->buffers().empty())\r
                        return;\r
 \r
                if(transform_stack_.back().field_mode == core::field_mode::empty)\r
                        return;\r
 \r
                item item;\r
-               item.pix_desc                   = frame->get_pixel_format_desc();\r
-               item.buffers                    = frame->get_buffers();                         \r
+               item.pix_desc                   = frame->pixel_format_desc();\r
+               item.buffers                    = frame->buffers();                             \r
                item.transform                  = transform_stack_.back();\r
 \r
                items_.push_back(item);\r

diff --git a/accelerator/cpu/util/write_frame.cpp b/accelerator/cpu/util/write_frame.cpp
index a37ee5dd579e53011463503c9cf2f03f84c666c4..36853a13a89ad5ace962194d9e9df0225ac6ced2 100644 (file)
--- a/accelerator/cpu/util/write_frame.cpp
+++ b/accelerator/cpu/util/write_frame.cpp
@@ -86,7 +86,7 @@ write_frame& write_frame::operator=(write_frame&& other)
 }\r
 void write_frame::swap(write_frame& other){impl_.swap(other.impl_);}\r
 void write_frame::accept(core::frame_visitor& visitor) const {impl_->accept(*this, visitor);}\r
-const core::pixel_format_desc& write_frame::get_pixel_format_desc() const{return impl_->desc_;}\r
+const core::pixel_format_desc& write_frame::pixel_format_desc() const{return impl_->desc_;}\r
 const boost::iterator_range<const uint8_t*> write_frame::image_data(int index) const{return impl_->image_data(index);}\r
 const core::audio_buffer& write_frame::audio_data() const{return impl_->audio_data_;}\r
 const boost::iterator_range<uint8_t*> write_frame::image_data(int index){return impl_->image_data(index);}\r
@@ -96,6 +96,6 @@ core::field_mode write_frame::field_mode()const{return impl_->field_mode_;}
 int write_frame::width() const{return impl_->desc_.planes.at(0).width;}\r
 int write_frame::height() const{return impl_->desc_.planes.at(0).height;}                                              \r
 const void* write_frame::tag() const{return impl_->tag_;}      \r
-std::vector<spl::shared_ptr<host_buffer>> write_frame::get_buffers() const{return impl_->buffers_;}\r
+std::vector<spl::shared_ptr<host_buffer>> write_frame::buffers() const{return impl_->buffers_;}\r
 \r
 }}}
\ No newline at end of file

diff --git a/accelerator/cpu/util/write_frame.h b/accelerator/cpu/util/write_frame.h
index e6f2bde24d304d696f1ca017e5bae6a8e2e702c6..87933fa0a222fe69afdcc29ff96ec0ca5978bfd3 100644 (file)
--- a/accelerator/cpu/util/write_frame.h
+++ b/accelerator/cpu/util/write_frame.h
@@ -59,7 +59,7 @@ public:
 \r
        // data_frame\r
                \r
-       virtual const core::pixel_format_desc& get_pixel_format_desc() const override;\r
+       virtual const core::pixel_format_desc& pixel_format_desc() const override;\r
 \r
        virtual const boost::iterator_range<const uint8_t*> image_data(int index) const override;\r
        virtual const core::audio_buffer& audio_data() const override;\r
@@ -77,7 +77,7 @@ public:
 \r
        // write_frames\r
 \r
-       std::vector<spl::shared_ptr<host_buffer>> get_buffers() const;          \r
+       std::vector<spl::shared_ptr<host_buffer>> buffers() const;              \r
 private:\r
        struct impl;\r
        spl::shared_ptr<impl> impl_;\r

diff --git a/accelerator/ogl/image/image_mixer.cpp b/accelerator/ogl/image/image_mixer.cpp
index ecc548f408929a37c6e0697fc3666ac6e03d2dec..ac6c9dbe6811c474aa2b253520360952348347ab 100644 (file)
--- a/accelerator/ogl/image/image_mixer.cpp
+++ b/accelerator/ogl/image/image_mixer.cpp
@@ -395,18 +395,18 @@ public:
                if(frame == nullptr)\r
                        return;\r
 \r
-               if(frame->get_pixel_format_desc().format == core::pixel_format::invalid)\r
+               if(frame->pixel_format_desc().format == core::pixel_format::invalid)\r
                        return;\r
 \r
-               if(frame->get_buffers().empty())\r
+               if(frame->buffers().empty())\r
                        return;\r
 \r
                if(transform_stack_.back().field_mode == core::field_mode::empty)\r
                        return;\r
 \r
                item item;\r
-               item.pix_desc                   = frame->get_pixel_format_desc();\r
-               item.buffers                    = frame->get_buffers();                         \r
+               item.pix_desc                   = frame->pixel_format_desc();\r
+               item.buffers                    = frame->buffers();                             \r
                item.transform                  = transform_stack_.back();\r
 \r
                layers_.back().items.push_back(item);\r

diff --git a/accelerator/ogl/util/write_frame.cpp b/accelerator/ogl/util/write_frame.cpp
index 456358969c85de44352e05dc77cee2ff10b850eb..740a175f60e527fb2b268575cd2dd6b8cbd8000e 100644 (file)
--- a/accelerator/ogl/util/write_frame.cpp
+++ b/accelerator/ogl/util/write_frame.cpp
@@ -92,7 +92,7 @@ write_frame& write_frame::operator=(write_frame&& other)
 }\r
 void write_frame::swap(write_frame& other){impl_.swap(other.impl_);}\r
 void write_frame::accept(core::frame_visitor& visitor) const {impl_->accept(*this, visitor);}\r
-const core::pixel_format_desc& write_frame::get_pixel_format_desc() const{return impl_->desc_;}\r
+const core::pixel_format_desc& write_frame::pixel_format_desc() const{return impl_->desc_;}\r
 const boost::iterator_range<const uint8_t*> write_frame::image_data(int index) const{return impl_->image_data(index);}\r
 const core::audio_buffer& write_frame::audio_data() const{return impl_->audio_data_;}\r
 const boost::iterator_range<uint8_t*> write_frame::image_data(int index){return impl_->image_data(index);}\r
@@ -102,6 +102,6 @@ core::field_mode write_frame::field_mode() const{return impl_->field_mode_;}
 int write_frame::width() const{return impl_->desc_.planes.at(0).width;}\r
 int write_frame::height() const{return impl_->desc_.planes.at(0).height;}                                              \r
 const void* write_frame::tag() const{return impl_->tag_;}      \r
-std::vector<spl::shared_ptr<ogl::host_buffer>> write_frame::get_buffers() const{return impl_->buffers_;}\r
+std::vector<spl::shared_ptr<ogl::host_buffer>> write_frame::buffers() const{return impl_->buffers_;}\r
 \r
 }}}
\ No newline at end of file

diff --git a/accelerator/ogl/util/write_frame.h b/accelerator/ogl/util/write_frame.h
index 46527c2b6d051486a7b45c626ba3119b28acda5c..1b64a7432ae56f024816733778866dadec06d396 100644 (file)
--- a/accelerator/ogl/util/write_frame.h
+++ b/accelerator/ogl/util/write_frame.h
@@ -56,7 +56,7 @@ public:
 \r
        // data_frame\r
                \r
-       virtual const core::pixel_format_desc& get_pixel_format_desc() const override;\r
+       virtual const core::pixel_format_desc& pixel_format_desc() const override;\r
 \r
        virtual const boost::iterator_range<const uint8_t*> image_data(int index) const override;\r
        virtual const core::audio_buffer& audio_data() const override;\r
@@ -74,7 +74,7 @@ public:
                        \r
        // write_frames\r
 \r
-       std::vector<spl::shared_ptr<class host_buffer>> get_buffers() const;\r
+       std::vector<spl::shared_ptr<class host_buffer>> buffers() const;\r
 private:\r
        struct impl;\r
        spl::shared_ptr<impl> impl_;\r

diff --git a/common/os/windows/current_version.h b/common/os/windows/current_version.h
index cbd5bfaee94d57a9b09a98fc96c7be312f89236d..94d65ef783890c77e4416b3ec5f730af98779169 100644 (file)
--- a/common/os/windows/current_version.h
+++ b/common/os/windows/current_version.h
@@ -30,7 +30,7 @@
 \r
 namespace caspar {\r
 \r
-static std::wstring get_win_product_name()\r
+static std::wstring win_product_name()\r
 {\r
        std::wstring result = L"Unknown Windows Product Name.";\r
        HKEY hkey; \r
@@ -50,7 +50,7 @@ static std::wstring get_win_product_name()
        return result;\r
 }\r
 \r
-static std::wstring get_win_sp_version()\r
+static std::wstring win_sp_version()\r
 {\r
        std::wstring result =  L"";\r
        HKEY hkey; \r

diff --git a/common/os/windows/system_info.h b/common/os/windows/system_info.h
index 06ff07a0bdd70878df495530a0f41f3fafc92fa7..bea92258990bfe8200b418d78fa48e5635d9a167 100644 (file)
--- a/common/os/windows/system_info.h
+++ b/common/os/windows/system_info.h
@@ -28,7 +28,7 @@
 \r
 namespace caspar {\r
        \r
-static std::wstring get_cpu_info()\r
+static std::wstring cpu_info()\r
 {\r
        std::wstring cpu_name = L"Unknown CPU";\r
        HKEY hkey; \r
@@ -57,7 +57,7 @@ static std::wstring get_cpu_info()
        return s.str();\r
 }\r
 \r
-static std::wstring get_system_product_name()\r
+static std::wstring system_product_name()\r
 {\r
        std::wstring system_product_name = L"Unknown System";\r
        HKEY hkey; \r

diff --git a/core/frame/data_frame.cpp b/core/frame/data_frame.cpp
index 87e2bf66ec7d5823db7d22551e1dfe241c94a9be..e0bc316720a1a007e76626ac5c822ae84eb67824 100644 (file)
--- a/core/frame/data_frame.cpp
+++ b/core/frame/data_frame.cpp
@@ -12,9 +12,9 @@ spl::shared_ptr<data_frame> data_frame::empty()
        {\r
        public:\r
                empty_frame(){}\r
-               virtual const struct pixel_format_desc& get_pixel_format_desc() const override\r
+               virtual const struct core::pixel_format_desc& pixel_format_desc() const override\r
                {\r
-                       static pixel_format_desc invalid(pixel_format::invalid);\r
+                       static core::pixel_format_desc invalid(pixel_format::invalid);\r
                        return invalid;\r
                }\r
                virtual const boost::iterator_range<const uint8_t*> image_data(int) const override\r

diff --git a/core/frame/data_frame.h b/core/frame/data_frame.h
index 2ff3e5a4d05b407efb404835f3f15766b98df3a4..860ee01436de051453cb7f333fcc4667af33db7f 100644 (file)
--- a/core/frame/data_frame.h
+++ b/core/frame/data_frame.h
@@ -21,7 +21,7 @@ public:
        data_frame(){}\r
        virtual ~data_frame(){}\r
 \r
-       virtual const struct pixel_format_desc& get_pixel_format_desc() const = 0;\r
+       virtual const struct pixel_format_desc& pixel_format_desc() const = 0;\r
 \r
        virtual const boost::iterator_range<const uint8_t*> image_data(int index = 0) const = 0;\r
        virtual const audio_buffer& audio_data() const = 0;\r

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index 71bfc2c205895e73f5dd18b743dc553438db6d13..39bbb3d89073dad5abb67cf5518f260393856e40 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -58,7 +58,7 @@ class mixed_frame : public data_frame
        mutable boost::shared_future<boost::iterator_range<const uint8_t*>>     image_data_;\r
        const audio_buffer                                                                                                      audio_data_;\r
        const video_format_desc                                                                                         video_desc_;\r
-       pixel_format_desc                                                                                                       pixel_desc_;\r
+       core::pixel_format_desc                                                                                         pixel_desc_;\r
        const void*                                                                                                                     tag_;\r
 \r
 public:\r
@@ -82,7 +82,7 @@ public:
                BOOST_THROW_EXCEPTION(invalid_operation());\r
        }\r
        \r
-       virtual const struct pixel_format_desc& get_pixel_format_desc() const override\r
+       virtual const struct pixel_format_desc& pixel_format_desc() const override\r
        {\r
                return pixel_desc_;\r
        }\r

diff --git a/modules/bluefish/bluefish.cpp b/modules/bluefish/bluefish.cpp
index 27290aebe34fb01c85bb2e72551c639f0852522a..2b41c05656cba0bd4eac7fcf7233e2c600f98ce1 100644 (file)
--- a/modules/bluefish/bluefish.cpp
+++ b/modules/bluefish/bluefish.cpp
@@ -49,7 +49,7 @@ void init()
        catch(...){}\r
 }\r
 \r
-std::wstring get_version()\r
+std::wstring version()\r
 {\r
        try\r
        {\r
@@ -66,7 +66,7 @@ std::wstring get_version()
        return u16(BlueVelvetVersion());\r
 }\r
 \r
-std::vector<std::wstring> get_device_list()\r
+std::vector<std::wstring> device_list()\r
 {\r
        std::vector<std::wstring> devices;\r
 \r

diff --git a/modules/bluefish/bluefish.h b/modules/bluefish/bluefish.h
index 17188767253e4b9c0a4094df579bec15b61f1654..18e651520674fc0d4b65c2f98f3ac03e2bf0982b 100644 (file)
--- a/modules/bluefish/bluefish.h
+++ b/modules/bluefish/bluefish.h
@@ -28,7 +28,7 @@ namespace caspar { namespace bluefish {
 \r
 void init();\r
 \r
-std::wstring get_version();\r
-std::vector<std::wstring> get_device_list();\r
+std::wstring version();\r
+std::vector<std::wstring> device_list();\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/decklink/decklink.cpp b/modules/decklink/decklink.cpp
index b8c834e29660dacb2588fc3e003e9fe70fcc81ad..f78aae134e74c839b435eedcb99a711a7ed5b705 100644 (file)
--- a/modules/decklink/decklink.cpp
+++ b/modules/decklink/decklink.cpp
@@ -60,7 +60,7 @@ void init()
        core::register_producer_factory(create_producer);\r
 }\r
 \r
-std::wstring get_version() \r
+std::wstring version() \r
 {\r
        std::wstring version = L"Not found";\r
        \r
@@ -74,14 +74,14 @@ std::wstring get_version()
        {\r
                CComPtr<IDeckLinkIterator> pDecklinkIterator;\r
                if(SUCCEEDED(pDecklinkIterator.CoCreateInstance(CLSID_CDeckLinkIterator)))              \r
-                       version = get_version(pDecklinkIterator);\r
+                       version = decklink::version(pDecklinkIterator);\r
        }\r
        catch(...){}\r
 \r
        return version;\r
 }\r
 \r
-std::vector<std::wstring> get_device_list()\r
+std::vector<std::wstring> device_list()\r
 {\r
        std::vector<std::wstring> devices;\r
        \r

diff --git a/modules/decklink/decklink.h b/modules/decklink/decklink.h
index 0dff05db8983ada3ddff46c997472a5392b701d2..317eea50ab3a6fe240c0865c0c44c782935303a0 100644 (file)
--- a/modules/decklink/decklink.h
+++ b/modules/decklink/decklink.h
@@ -28,7 +28,7 @@ namespace caspar { namespace decklink {
 \r
 void init();\r
 \r
-std::wstring get_version();\r
-std::vector<std::wstring> get_device_list();\r
+std::wstring version();\r
+std::vector<std::wstring> device_list();\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index 87c62c36a1a92f179b44cce6a30a966729c241df..5e79e8dcc576380e98f6b2d2fc0158ab1a610529 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -118,7 +118,7 @@ static BMDDisplayMode get_display_mode(const T& device, core::video_format fmt,
 }\r
 \r
 template<typename T>\r
-static std::wstring get_version(T& iterator)\r
+static std::wstring version(T& iterator)\r
 {\r
        CComQIPtr<IDeckLinkAPIInformation> info = iterator;\r
        if (!info)\r

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index d676c011862719aa94b7dd150552dbfacc8f6fcd..18c1a7df7f422b514d660387cb9c73291d3b19bd 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -225,29 +225,29 @@ std::wstring make_version(unsigned int ver)
        return str.str();\r
 }\r
 \r
-std::wstring get_avcodec_version()\r
+std::wstring avcodec_version()\r
 {\r
-       return make_version(avcodec_version());\r
+       return make_version(::avcodec_version());\r
 }\r
 \r
-std::wstring get_avformat_version()\r
+std::wstring avformat_version()\r
 {\r
-       return make_version(avformat_version());\r
+       return make_version(::avformat_version());\r
 }\r
 \r
-std::wstring get_avutil_version()\r
+std::wstring avutil_version()\r
 {\r
-       return make_version(avutil_version());\r
+       return make_version(::avutil_version());\r
 }\r
 \r
-std::wstring get_avfilter_version()\r
+std::wstring avfilter_version()\r
 {\r
-       return make_version(avfilter_version());\r
+       return make_version(::avfilter_version());\r
 }\r
 \r
-std::wstring get_swscale_version()\r
+std::wstring swscale_version()\r
 {\r
-       return make_version(swscale_version());\r
+       return make_version(::swscale_version());\r
 }\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/ffmpeg/ffmpeg.h b/modules/ffmpeg/ffmpeg.h
index 0c491878a1bfabaea372b7bd7df1573047f8d258..79117c666922da8e7b5fb46efa93e7f821fb6287 100644 (file)
--- a/modules/ffmpeg/ffmpeg.h
+++ b/modules/ffmpeg/ffmpeg.h
@@ -28,10 +28,10 @@ namespace caspar { namespace ffmpeg {
 void init();\r
 void uninit();\r
 \r
-std::wstring get_avcodec_version();\r
-std::wstring get_avformat_version();\r
-std::wstring get_avutil_version();\r
-std::wstring get_avfilter_version();\r
-std::wstring get_swscale_version();\r
+std::wstring avcodec_version();\r
+std::wstring avformat_version();\r
+std::wstring avutil_version();\r
+std::wstring avfilter_version();\r
+std::wstring swscale_version();\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index 034e324d3435c67ad899a55195b3a7216e6a6d57..e316afbdea8f813c7f83f40a736cf04ef91d6fb6 100644 (file)
--- a/modules/ffmpeg/producer/util/util.cpp
+++ b/modules/ffmpeg/producer/util/util.cpp
@@ -114,7 +114,7 @@ core::pixel_format get_pixel_format(PixelFormat pix_fmt)
        }\r
 }\r
 \r
-core::pixel_format_desc get_pixel_format_desc(PixelFormat pix_fmt, int width, int height)\r
+core::pixel_format_desc pixel_format_desc(PixelFormat pix_fmt, int width, int height)\r
 {\r
        // Get linesizes\r
        AVPicture dummy_pict;   \r
@@ -180,10 +180,10 @@ spl::shared_ptr<core::write_frame> make_write_frame(const void* tag, const spl::
 \r
        const auto width  = decoded_frame->width;\r
        const auto height = decoded_frame->height;\r
-       auto desc                 = get_pixel_format_desc(static_cast<PixelFormat>(decoded_frame->format), width, height);\r
+       auto desc                 = pixel_format_desc(static_cast<PixelFormat>(decoded_frame->format), width, height);\r
        \r
        if(flags & core::frame_producer::flags::alpha_only)\r
-               desc = get_pixel_format_desc(static_cast<PixelFormat>(make_alpha_format(decoded_frame->format)), width, height);\r
+               desc = pixel_format_desc(static_cast<PixelFormat>(make_alpha_format(decoded_frame->format)), width, height);\r
 \r
        std::shared_ptr<core::write_frame> write;\r
 \r
@@ -205,7 +205,7 @@ spl::shared_ptr<core::write_frame> make_write_frame(const void* tag, const spl::
                else if(pix_fmt == PIX_FMT_YUV444P10)\r
                        target_pix_fmt = PIX_FMT_YUV444P;\r
                \r
-               auto target_desc = get_pixel_format_desc(target_pix_fmt, width, height);\r
+               auto target_desc = pixel_format_desc(target_pix_fmt, width, height);\r
 \r
                write = frame_factory->create_frame(tag, target_desc, fps, get_mode(*decoded_frame));\r
 \r
@@ -292,10 +292,10 @@ spl::shared_ptr<core::write_frame> make_write_frame(const void* tag, const spl::
 spl::shared_ptr<AVFrame> make_av_frame(caspar::core::data_frame& frame)\r
 {\r
        std::array<void*, 4> data = {};\r
-       for(int n = 0; n < frame.get_pixel_format_desc().planes.size(); ++n)\r
+       for(int n = 0; n < frame.pixel_format_desc().planes.size(); ++n)\r
                data[n] = frame.image_data(n).begin();\r
 \r
-       return make_av_frame(data, frame.get_pixel_format_desc());\r
+       return make_av_frame(data, frame.pixel_format_desc());\r
 }\r
 \r
 spl::shared_ptr<AVFrame> make_av_frame(std::array<void*, 4> data, const core::pixel_format_desc& pix_desc)\r

diff --git a/modules/ffmpeg/producer/util/util.h b/modules/ffmpeg/producer/util/util.h
index 13573965dc731aa979e32939f3713af3e339cdaa..270cb7fa4406f6d9900025e5c88f1e5c64a03afc 100644 (file)
--- a/modules/ffmpeg/producer/util/util.h
+++ b/modules/ffmpeg/producer/util/util.h
@@ -69,7 +69,7 @@ std::shared_ptr<AVFrame> make_av_frame(const C& container, const core::pixel_for
        return make_av_frame(data, pix_desc);\r
 }\r
 \r
-core::pixel_format_desc                                get_pixel_format_desc(PixelFormat pix_fmt, int width, int height);\r
+core::pixel_format_desc                                pixel_format_desc(PixelFormat pix_fmt, int width, int height);\r
 \r
 spl::shared_ptr<AVPacket> create_packet();\r
 \r

diff --git a/modules/flash/flash.cpp b/modules/flash/flash.cpp
index 4e3d35dc31d227a371c443195d67eb54827e3064..ba0730812c4b19802bcfd8f46e4d95f8b97137e2 100644 (file)
--- a/modules/flash/flash.cpp
+++ b/modules/flash/flash.cpp
@@ -35,12 +35,12 @@ void init()
        core::register_producer_factory(create_ct_producer);\r
 }\r
 \r
-std::wstring get_cg_version()\r
+std::wstring cg_version()\r
 {\r
        return L"Unknown";\r
 }\r
 \r
-std::wstring get_version()\r
+std::wstring version()\r
 {              \r
        std::wstring version = L"Not found";\r
 #ifdef WIN32\r

diff --git a/modules/flash/flash.h b/modules/flash/flash.h
index bda6402f620fd17e3b90a243ae09bb5139b00ae9..dbb248297ce230af9f767867fc08828012fb4b63 100644 (file)
--- a/modules/flash/flash.h
+++ b/modules/flash/flash.h
@@ -27,7 +27,7 @@ namespace caspar { namespace flash {
 \r
 void init();\r
 \r
-std::wstring get_cg_version();\r
-std::wstring get_version();\r
+std::wstring cg_version();\r
+std::wstring version();\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/image/image.cpp b/modules/image/image.cpp
index 7115e270a5504674e8455ccbd5284067eb4d59f7..6faf216191759fc55fb5ac19f93c83a84b9876c0 100644 (file)
--- a/modules/image/image.cpp
+++ b/modules/image/image.cpp
@@ -51,7 +51,7 @@ void uninit()
 }\r
 \r
 \r
-std::wstring get_version()\r
+std::wstring version()\r
 {\r
        return u16(FreeImage_GetVersion());\r
 }\r

diff --git a/modules/image/image.h b/modules/image/image.h
index 4cd24d15b40da2cc12e5c78db30a39b6ff6b4a9c..29711b8f6f7c382cbab82fce5bdea2559035dddd 100644 (file)
--- a/modules/image/image.h
+++ b/modules/image/image.h
@@ -28,6 +28,6 @@ namespace caspar { namespace image {
 void init();\r
 void uninit();\r
 \r
-std::wstring get_version();\r
+std::wstring version();\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/reroute/producer/reroute_producer.cpp b/modules/reroute/producer/reroute_producer.cpp
index 9c2e4952a9b0f229f372c445b2155111f416952d..8af09340ff824b2babb1225570523d86e7031cb9 100644 (file)
--- a/modules/reroute/producer/reroute_producer.cpp
+++ b/modules/reroute/producer/reroute_producer.cpp
@@ -106,7 +106,7 @@ public:
                if(half_speed && frame_number_ % 2 == 0) // Skip frame\r
                        return receive(0);\r
 \r
-               auto frame = frame_factory_->create_frame(this, read_frame->get_pixel_format_desc());\r
+               auto frame = frame_factory_->create_frame(this, read_frame->pixel_format_desc());\r
 \r
                A_memcpy(frame->image_data(0).begin(), read_frame->image_data().begin(), read_frame->image_data().size());\r
                boost::push_back(frame->audio_data(), read_frame->audio_data());\r

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 40e11cdd7ec2de87437d3cbfdf9805cb799fecc8..6293841f4d58e0c5fa353b3266ace10ef7d6b347 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -1394,24 +1394,24 @@ bool InfoCommand::DoExecute()
                        \r
                        boost::property_tree::wptree info;\r
                        \r
-                       info.add(L"system.name",                                        caspar::get_system_product_name());\r
-                       info.add(L"system.windows.name",                        caspar::get_win_product_name());\r
-                       info.add(L"system.windows.service-pack",        caspar::get_win_sp_version());\r
-                       info.add(L"system.cpu",                                         caspar::get_cpu_info());\r
+                       info.add(L"system.name",                                        caspar::system_product_name());\r
+                       info.add(L"system.windows.name",                        caspar::win_product_name());\r
+                       info.add(L"system.windows.service-pack",        caspar::win_sp_version());\r
+                       info.add(L"system.cpu",                                         caspar::cpu_info());\r
        \r
-                       BOOST_FOREACH(auto device, caspar::decklink::get_device_list())\r
+                       BOOST_FOREACH(auto device, caspar::decklink::device_list())\r
                                info.add(L"system.decklink.device", device);\r
 \r
-                       BOOST_FOREACH(auto device, caspar::bluefish::get_device_list())\r
+                       BOOST_FOREACH(auto device, caspar::bluefish::device_list())\r
                                info.add(L"system.bluefish.device", device);\r
                                \r
-                       info.add(L"system.flash",                                       caspar::flash::get_version());\r
-                       //info.add(L"system.free-image",                                caspar::image::get_version());\r
-                       info.add(L"system.ffmpeg.avcodec",                      caspar::ffmpeg::get_avcodec_version());\r
-                       info.add(L"system.ffmpeg.avformat",                     caspar::ffmpeg::get_avformat_version());\r
-                       info.add(L"system.ffmpeg.avfilter",                     caspar::ffmpeg::get_avfilter_version());\r
-                       info.add(L"system.ffmpeg.avutil",                       caspar::ffmpeg::get_avutil_version());\r
-                       info.add(L"system.ffmpeg.swscale",                      caspar::ffmpeg::get_swscale_version());\r
+                       info.add(L"system.flash",                                       caspar::flash::version());\r
+                       //info.add(L"system.free-image",                                caspar::image::version());\r
+                       info.add(L"system.ffmpeg.avcodec",                      caspar::ffmpeg::avcodec_version());\r
+                       info.add(L"system.ffmpeg.avformat",                     caspar::ffmpeg::avformat_version());\r
+                       info.add(L"system.ffmpeg.avfilter",                     caspar::ffmpeg::avfilter_version());\r
+                       info.add(L"system.ffmpeg.avutil",                       caspar::ffmpeg::avutil_version());\r
+                       info.add(L"system.ffmpeg.swscale",                      caspar::ffmpeg::swscale_version());\r
                                                \r
                        boost::property_tree::write_xml(replyString, info, w);\r
                }\r
@@ -1524,9 +1524,9 @@ bool VersionCommand::DoExecute()
        if(_parameters.size() > 0)\r
        {\r
                if(_parameters[0] == L"FLASH")\r
-                       replyString = TEXT("201 VERSION OK\r\n") + flash::get_version() + TEXT("\r\n");\r
+                       replyString = TEXT("201 VERSION OK\r\n") + flash::version() + TEXT("\r\n");\r
                else if(_parameters[0] == L"TEMPLATEHOST")\r
-                       replyString = TEXT("201 VERSION OK\r\n") + flash::get_cg_version() + TEXT("\r\n");\r
+                       replyString = TEXT("201 VERSION OK\r\n") + flash::cg_version() + TEXT("\r\n");\r
                else if(_parameters[0] != L"SERVER")\r
                        replyString = TEXT("403 VERSION ERROR\r\n");\r
        }\r

diff --git a/shell/main.cpp b/shell/main.cpp
index aa915c8aad8acb3b3542f639577d70d84bff94c8..493340622a49bd170b320af6f6c7e2e64addc7bf 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -124,25 +124,25 @@ void print_info()
        CASPAR_LOG(info) << L"Copyright (c) 2010 Sveriges Television AB, www.casparcg.com, <info@casparcg.com>";\r
        CASPAR_LOG(info) << L"################################################################################";\r
        CASPAR_LOG(info) << L"Starting CasparCG Video and Graphics Playout Server " << env::version();\r
-       CASPAR_LOG(info) << L"on " << get_win_product_name() << L" " << get_win_sp_version();\r
-       CASPAR_LOG(info) << get_cpu_info();\r
-       CASPAR_LOG(info) << get_system_product_name();\r
+       CASPAR_LOG(info) << L"on " << win_product_name() << L" " << win_sp_version();\r
+       CASPAR_LOG(info) << cpu_info();\r
+       CASPAR_LOG(info) << system_product_name();\r
        \r
-       CASPAR_LOG(info) << L"Decklink " << decklink::get_version();\r
-       BOOST_FOREACH(auto device, decklink::get_device_list())\r
+       CASPAR_LOG(info) << L"Decklink " << decklink::version();\r
+       BOOST_FOREACH(auto device, decklink::device_list())\r
                CASPAR_LOG(info) << L" - " << device;   \r
                \r
-       CASPAR_LOG(info) << L"Bluefish " << bluefish::get_version();\r
-       BOOST_FOREACH(auto device, bluefish::get_device_list())\r
+       CASPAR_LOG(info) << L"Bluefish " << bluefish::version();\r
+       BOOST_FOREACH(auto device, bluefish::device_list())\r
                CASPAR_LOG(info) << L" - " << device;   \r
        \r
-       CASPAR_LOG(info) << L"Flash "                   << flash::get_version();\r
-       CASPAR_LOG(info) << L"FreeImage "               << image::get_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avcodec "  << ffmpeg::get_avcodec_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avformat " << ffmpeg::get_avformat_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avfilter " << ffmpeg::get_avfilter_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-avutil "   << ffmpeg::get_avutil_version();\r
-       CASPAR_LOG(info) << L"FFMPEG-swscale "  << ffmpeg::get_swscale_version();\r
+       CASPAR_LOG(info) << L"Flash "                   << flash::version();\r
+       CASPAR_LOG(info) << L"FreeImage "               << image::version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avcodec "  << ffmpeg::avcodec_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avformat " << ffmpeg::avformat_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avfilter " << ffmpeg::avfilter_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-avutil "   << ffmpeg::avutil_version();\r
+       CASPAR_LOG(info) << L"FFMPEG-swscale "  << ffmpeg::swscale_version();\r
 }\r
 \r
 LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)\r
@@ -252,7 +252,7 @@ int main(int argc, wchar_t* argv[])
                        //caspar_server.subscribe(console_obs);\r
                                                \r
                        // Create a amcp parser for console commands.\r
-                       protocol::amcp::AMCPProtocolStrategy amcp(caspar_server.get_channels());\r
+                       protocol::amcp::AMCPProtocolStrategy amcp(caspar_server.channels());\r
 \r
                        // Create a dummy client which prints amcp responses to console.\r
                        auto console_client = std::make_shared<IO::ConsoleClientInfo>();\r

diff --git a/shell/server.cpp b/shell/server.cpp
index cda2a0ddbe6513cb618a7661e070b648247d4745..98eac86427f1f7e4ad42d98348ba3696df5e0ede 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -197,7 +197,7 @@ struct server::impl : boost::noncopyable
 \r
 server::server() : impl_(new impl()){}\r
 \r
-const std::vector<spl::shared_ptr<video_channel>> server::get_channels() const\r
+const std::vector<spl::shared_ptr<video_channel>> server::channels() const\r
 {\r
        return impl_->channels_;\r
 }\r

diff --git a/shell/server.h b/shell/server.h
index a9a3cd0cc595a6f905cfae3c18c5bba6bceef8bd..9e93dbc6c7f9585cf056d663092fe5d1bf7970f2 100644 (file)
--- a/shell/server.h
+++ b/shell/server.h
@@ -40,7 +40,7 @@ class server sealed : public monitor::observable
 {\r
 public:\r
        server();\r
-       const std::vector<spl::shared_ptr<core::video_channel>> get_channels() const;\r
+       const std::vector<spl::shared_ptr<core::video_channel>> channels() const;\r
 \r
        // monitor::observable\r
 \r