git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/common/diagnostics/graph.cpp b/common/diagnostics/graph.cpp
index 8721a7896559b2518f764feef091e3e78a56b37e..5449e7b59cef09e43d39ab5982abfe256d6c6380 100644 (file)
--- a/common/diagnostics/graph.cpp
+++ b/common/diagnostics/graph.cpp
@@ -7,7 +7,7 @@
 #include "../concurrency/executor.h"\r
 #include "../utility/timer.h"\r
 \r
-#include <SFML/Graphics.hpp>\r
+#include <SFML/Window.hpp>\r
 \r
 #include <boost/foreach.hpp>\r
 #include <boost/circular_buffer.hpp>\r
@@ -28,12 +28,13 @@ struct drawable
 class context\r
 {      \r
        timer timer_;\r
-       sf::RenderWindow window_;\r
+       sf::Window window_;\r
        \r
        std::list<std::weak_ptr<drawable>> drawables_;\r
                \r
        executor executor_;\r
 public:                                        \r
+\r
        template<typename Func>\r
        static auto begin_invoke(Func&& func) -> boost::unique_future<decltype(func())> // noexcept\r
        {       \r
@@ -47,13 +48,14 @@ public:
                        get_instance().drawables_.push_back(drawable);\r
                });\r
        }\r
+       \r
 private:\r
 \r
        void tick()\r
        {\r
                sf::Event e;\r
-               while(window_.GetEvent(e)){}\r
-               window_.Clear();\r
+               while(window_.GetEvent(e)){}            \r
+               glClear(GL_COLOR_BUFFER_BIT);\r
                render();\r
                window_.Display();\r
                timer_.tick(1.0/50.0);\r

diff --git a/core/consumer/bluefish/bluefish_consumer.cpp b/core/consumer/bluefish/bluefish_consumer.cpp
index 2c1f4be8b8809e43434ea59fed372b851a05bb30..09dc47671ff7705943e334e1fe642ccfa784d16c 100644 (file)
--- a/core/consumer/bluefish/bluefish_consumer.cpp
+++ b/core/consumer/bluefish/bluefish_consumer.cpp
@@ -114,7 +114,7 @@ public:
                , engine_mode_(VIDEO_ENGINE_FRAMESTORE)         \r
                , embed_audio_(embed_audio)\r
        {\r
-               graph_->add_guide("frame_time_target", 0.5, diagnostics::color(0.5f, 0.0f, 0.0f));\r
+               graph_->add_guide("frame_time_target", 0.5, diagnostics::color(1.0f, 0.0f, 0.0f));\r
                graph_->set_color("frame_time", diagnostics::color(1.0f, 0.0f, 0.0f));  \r
        }\r
 \r

diff --git a/core/consumer/ogl/ogl_consumer.cpp b/core/consumer/ogl/ogl_consumer.cpp
index ff286ac36f9a4de5d0a7b7f03a0b6012aab4b6eb..f53fc3a62dbda31ae8f6aad4feb2fdd68afefddf 100644 (file)
--- a/core/consumer/ogl/ogl_consumer.cpp
+++ b/core/consumer/ogl/ogl_consumer.cpp
@@ -81,7 +81,7 @@ public:
                , screen_index_(screen_index)\r
                , graph_(diagnostics::create_graph("ogl_consumer"))\r
        {               \r
-               graph_->add_guide("frame_time_target", 0.5, diagnostics::color(0.5f, 0.0f, 0.0f));\r
+               graph_->add_guide("frame_time_target", 0.5, diagnostics::color(1.0f, 0.0f, 0.0f));\r
                graph_->set_color("frame_time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
 \r
                CASPAR_LOG(info) << "Sucessfully started ogl_consumer";\r

diff --git a/core/producer/ffmpeg/ffmpeg_producer.cpp b/core/producer/ffmpeg/ffmpeg_producer.cpp
index 20892484b3232ed2bdf27f2b781176ab4c92c9a8..799517fe212fb84d791dad2de5411b7c07b803d0 100644 (file)
--- a/core/producer/ffmpeg/ffmpeg_producer.cpp
+++ b/core/producer/ffmpeg/ffmpeg_producer.cpp
@@ -46,7 +46,7 @@ public:
                , last_frame_(draw_frame(draw_frame::empty()))\r
                , input_(graph_, filename, loop)\r
        {\r
-               graph_->add_guide("frame_time_target", 0.5, diagnostics::color(0.5f, 0.0f, 0.0f));\r
+               graph_->add_guide("frame_time_target", 0.5, diagnostics::color(1.0f, 0.0f, 0.0f));\r
                graph_->set_color("frame_time",  diagnostics::color(1.0f, 0.0f, 0.0f));\r
        }\r
 \r

diff --git a/core/producer/flash/flash_producer.cpp b/core/producer/flash/flash_producer.cpp
index 09f81065ac34698ac30ed1f1c18c837955ffff4e..076ecbeb9e7427e823a42857d89ed22aa02e39c1 100644 (file)
--- a/core/producer/flash/flash_producer.cpp
+++ b/core/producer/flash/flash_producer.cpp
@@ -76,7 +76,7 @@ public:
                , ax_(nullptr)\r
                , head_(draw_frame::empty())\r
        {\r
-               graph_->add_guide("frame_time_target", 0.5f, diagnostics::color(0.5f, 0.0f, 0.0f));\r
+               graph_->add_guide("frame_time_target", 0.5f, diagnostics::color(1.0f, 0.0f, 0.0f));\r
                graph_->set_color("frame_time", diagnostics::color(1.0f, 0.0f, 0.0f));          \r
                CASPAR_LOG(info) << print() << L" Started";\r
                \r
@@ -191,7 +191,6 @@ public:
                if(!boost::filesystem::exists(filename))\r
                        BOOST_THROW_EXCEPTION(file_not_found() << boost::errinfo_file_name(narrow(filename)));  \r
 \r
-               graph_->add_guide("buffer_size_target", 0.5, diagnostics::color(0.0f, 0.5f, 0.0f));     \r
                graph_->set_color("buffer_size", diagnostics::color(0.0f, 1.0f, 0.0f)); \r
        }\r
 \r

diff --git a/mixer/frame_mixer_device.cpp b/mixer/frame_mixer_device.cpp
index e8310d9eb18f7926a14a977458b00d850b02e21a..92cf45668d15308b70f3b5f38b5306c5b18c3236 100644 (file)
--- a/mixer/frame_mixer_device.cpp
+++ b/mixer/frame_mixer_device.cpp
@@ -49,8 +49,7 @@ public:
                , image_mixer_(format_desc)\r
                , output_(output)\r
        {\r
-               graph_->add_guide("frame_time_target", 0.5f, diagnostics::color(0.5f, 0.0f, 0.0f));\r
-               graph_->add_guide("buffer_size_target", 1.0f, diagnostics::color(0.5f, 0.0f, 0.0f));    \r
+               graph_->add_guide("frame_time_target", 0.5f, diagnostics::color(1.0f, 0.0f, 0.0f));     \r
                graph_->set_color("frame_time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
                graph_->set_color("buffer_size", diagnostics::color( 0.0f, 1.0f, 0.0f));                \r
                executor_.start();\r

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index 198d3024064b77e92634c4fe2937c57d59bdbf28..ba30f9e5bd596fa890e6c4cc26d4f89c13a7bdc8 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -138,7 +138,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>sfml-audio-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;OpenGL32.lib;FreeImage.lib;GLee.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>sfml-audio-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;sfml-system-d.lib;OpenGL32.lib;FreeImage.lib;GLee.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <Version>\r
       </Version>\r
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -187,7 +187,7 @@
       </Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <AdditionalDependencies>sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;sfml-system.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <Version>\r
       </Version>\r
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -240,7 +240,7 @@
       </Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <AdditionalDependencies>sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;sfml-system.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <Version>\r
       </Version>\r
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r