[CG] Created producer that wraps a CG producer in a way that it can be treated as...

[casparcg] / shell / server.cpp

diff --git a/shell/server.cpp b/shell/server.cpp
index 3d78ed36b55bd61fe7576f6cf06413cf8302eeb5..87b7e105c3303aa203e0fd4f10c1c117a2012554 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -109,12 +109,15 @@ std::shared_ptr<boost::asio::io_service> create_running_io_service()
                                CASPAR_LOG_CURRENT_EXCEPTION();
                        }
                }
+
+               CASPAR_LOG(info) << "[asio] Global io_service uninitialized.";
        });
 
        return std::shared_ptr<boost::asio::io_service>(
                        service.get(),
                        [service, work, thread](void*) mutable
                        {
+                               CASPAR_LOG(info) << "[asio] Shutting down global io_service.";
                                work.reset();
                                service->stop();
                                if (thread->get_id() != boost::this_thread::get_id())
@@ -168,6 +171,7 @@ struct server::impl : boost::noncopyable
 
                initialize_modules(dependencies);
                core::text::init(dependencies);
+               core::init_cg_proxy_as_producer(dependencies);
                core::scene::init(dependencies);
                core::syncto::init(dependencies);
                help_repo_->register_item({ L"producer" }, L"Color Producer", &core::describe_color_producer);
@@ -376,7 +380,7 @@ struct server::impl : boost::noncopyable
                thumbnail_generator_.reset(new thumbnail_generator(
                        monitor_factory,
                        env::media_folder(),
-                       env::thumbnails_folder(),
+                       env::thumbnail_folder(),
                        pt.get(L"configuration.thumbnails.width", 256),
                        pt.get(L"configuration.thumbnails.height", 144),
                        core::video_format_desc(pt.get(L"configuration.thumbnails.video-mode", L"720p2500")),
@@ -385,6 +389,7 @@ struct server::impl : boost::noncopyable
                        &image::write_cropped_png,
                        media_info_repo_,
                        producer_registry_,
+                       cg_registry_,
                        pt.get(L"configuration.thumbnails.mipmap", true)));
        }