* Moved print consumer proxy logging of Initialized to initialize function. Removed...

diff --git a/core/consumer/frame_consumer.cpp b/core/consumer/frame_consumer.cpp
index 5a0880b5c349785e652c37bc62f645d9dc73e9ca..d25cf336767a3d177ae524bf8b7a45eb7a33b5c5 100644 (file)
--- a/core/consumer/frame_consumer.cpp
+++ b/core/consumer/frame_consumer.cpp
@@ -144,7 +144,6 @@ public:
        print_consumer_proxy(spl::shared_ptr<frame_consumer>&& consumer) 
                : consumer_(std::move(consumer))
        {
-               CASPAR_LOG(info) << consumer_->print() << L" Initialized.";
        }
 
        ~print_consumer_proxy()
@@ -156,7 +155,11 @@ public:
        }
        
        std::future<bool> send(const_frame frame) override                                                                                                                                                              {return consumer_->send(std::move(frame));}
-       void initialize(const video_format_desc& format_desc, const audio_channel_layout& channel_layout, int channel_index) override   { return consumer_->initialize(format_desc, channel_layout, channel_index); }
+       void initialize(const video_format_desc& format_desc, const audio_channel_layout& channel_layout, int channel_index) override
+       {
+               consumer_->initialize(format_desc, channel_layout, channel_index);
+               CASPAR_LOG(info) << consumer_->print() << L" Initialized.";
+       }
        std::wstring print() const override                                                                                                                                                                                             {return consumer_->print();}
        std::wstring name() const override                                                                                                                                                                                              {return consumer_->name();}
        boost::property_tree::wptree info() const override                                                                                                                                                              {return consumer_->info();}

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index 7d1c5f7932599f84305e727074f49a19cf91d1af..44394b9a835512fc107e0a287d060aeebb880fe9 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -339,8 +339,6 @@ public:
                        for (auto& option : options)
                                CASPAR_LOG(warning) << L"Invalid option: -" << u16(option.name) << L" " << u16(option.value);
                }
-
-               CASPAR_LOG(info) << print() << L" Successfully Initialized.";   
        }
 
        ~ffmpeg_consumer()
@@ -363,8 +361,6 @@ public:
                          
                if (!(oc_->oformat->flags & AVFMT_NOFILE)) 
                        LOG_ON_ERROR2(avio_close(oc_->pb), "[ffmpeg_consumer]");
-
-               CASPAR_LOG(info) << print() << L" Successfully Uninitialized."; 
        }
        
        // frame_consumer

diff --git a/modules/newtek/consumer/newtek_ivga_consumer.cpp b/modules/newtek/consumer/newtek_ivga_consumer.cpp
index b0ef90355dc4f10946ff4d589970451bc8ad00c6..44d7e1010d381ea0a336a9624819c498beb6b65a 100644 (file)
--- a/modules/newtek/consumer/newtek_ivga_consumer.cpp
+++ b/modules/newtek/consumer/newtek_ivga_consumer.cpp
@@ -105,8 +105,6 @@ public:
 
                format_desc_    = format_desc;
                channel_layout_ = channel_layout;
-
-               CASPAR_LOG(info) << print() << L" Successfully Initialized.";
        }
 
        std::future<bool> schedule_send(core::const_frame frame)

diff --git a/modules/screen/consumer/screen_consumer.cpp b/modules/screen/consumer/screen_consumer.cpp
index 6228a8974c07dd528441a62ec0a054bd064e8acd..a8938a027bf9e9c9758b44f8f50a15f699a2772e 100644 (file)
--- a/modules/screen/consumer/screen_consumer.cpp
+++ b/modules/screen/consumer/screen_consumer.cpp
@@ -288,8 +288,6 @@ public:
                        else
                                wglSwapIntervalEXT(0);
                }*/
-
-               CASPAR_LOG(info) << print() << " Successfully Initialized.";
        }
 
        void uninit()