Renamed invoke_on_enter_frame to invoke_requested_animation_frames

[casparcg] / shell / server.cpp

diff --git a/shell/server.cpp b/shell/server.cpp
index ca89607c41df5e7e3e439251f7d123c36a64f7c2..54ee39936759b46c076179e31bce97ed653cd5d9 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -44,7 +44,6 @@
 #include <modules/decklink/decklink.h>\r
 #include <modules/ffmpeg/ffmpeg.h>\r
 #include <modules/flash/flash.h>\r
-#include <modules/html/html.h>\r
 #include <modules/oal/oal.h>\r
 #include <modules/ogl/ogl.h>\r
 #include <modules/newtek/newtek.h>\r
@@ -131,9 +130,6 @@ struct server::implementation : boost::noncopyable
                running_ = true;\r
                setup_audio(env::properties());\r
                \r
-               html::init();\r
-               CASPAR_LOG(info) << L"Initialized html module.";\r
-\r
                ffmpeg::init(media_info_repo_);\r
                CASPAR_LOG(info) << L"Initialized ffmpeg module.";\r
                                                          \r
@@ -175,6 +171,7 @@ struct server::implementation : boost::noncopyable
 \r
        ~implementation()\r
        {\r
+               diagnostics::show_graphs(false);\r
                running_ = false;\r
                initial_media_info_thread_.join();\r
                thumbnail_generator_.reset();\r
@@ -183,7 +180,6 @@ struct server::implementation : boost::noncopyable
                destroy_producers_synchronously();\r
                channels_.clear();\r
 \r
-               html::uninit();\r
                ffmpeg::uninit();\r
        }\r
 \r