tidy

src/common/executor.h

@@ -54,9 +54,7 @@ class executor final
     }
 
     ~executor() {
-        CASPAR_LOG(info) << L"destroying exec: " << name_;
         stop_and_wait();
-        CASPAR_LOG(info) << L"stopped exec: " << name_;
     }
 
     template <typename Func>

src/protocol/amcp/AMCPCommandQueue.cpp

@@ -36,7 +36,7 @@ AMCPCommandQueue::AMCPCommandQueue(const std::wstring& name, const std::shared_p
 {
 }
 
-AMCPCommandQueue::~AMCPCommandQueue() { CASPAR_LOG(info) << "destry AMCPCommandQueue"; }
+AMCPCommandQueue::~AMCPCommandQueue() { }
 
 std::future<bool>
 exec_cmd(std::shared_ptr<AMCPCommand> cmd, const std::shared_ptr<std::map<int, protocol::amcp::channel_context>>& channels, bool reply_without_req_id)

src/protocol/amcp/AMCPProtocolStrategy.cpp

@@ -107,7 +107,7 @@ class AMCPProtocolStrategy
         }
     }
 
-    ~AMCPProtocolStrategy() { CASPAR_LOG(info) << "destry AMCPProtocolStrategy"; }
+    ~AMCPProtocolStrategy() { }
 
     enum class error_state
     {

src/protocol/util/AsyncEventServer.cpp

@@ -360,7 +360,6 @@ AsyncEventServer::AsyncEventServer(std::shared_ptr<boost::asio::io_service>    s
 
 AsyncEventServer::~AsyncEventServer()
 {
-    CASPAR_LOG(info) << "destry AsyncEventServer";
     impl_->stop(); }
 
 void AsyncEventServer::add_client_lifecycle_object_factory(const lifecycle_factory_t& factory)

src/shell/server.cpp

@@ -168,24 +168,11 @@ struct server::impl
         destroy_producers_synchronously();
         destroy_consumers_synchronously();
 
-        /*
-        std::vector<std::weak_ptr<caspar::core::stage>> weak_stages;
-        for (auto& channel: channels_) {
-            weak_stages.push_back(channel->stage());
-        }
-        channels_.clear();
-        */
+        channels_->clear();
 
         while (weak_io_service.lock())
             std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
-        /*
-        for (auto& stage : weak_stages) {
-            while (stage.lock())
-                std::this_thread::sleep_for(std::chrono::milliseconds(100));
-        }
-        */
-
         uninitialize_modules();
         core::diagnostics::osd::shutdown();
     }