]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 30 Jan 2011 11:21:50 +0000 (11:21 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 30 Jan 2011 11:21:50 +0000 (11:21 +0000)
common/diagnostics/graph.cpp

index 660381d405398ac537b177a8aa355054d933ee10..8721a7896559b2518f764feef091e3e78a56b37e 100644 (file)
@@ -28,11 +28,27 @@ struct drawable
 class context\r
 {      \r
        timer timer_;\r
-       executor executor_;\r
        sf::RenderWindow window_;\r
        \r
        std::list<std::weak_ptr<drawable>> drawables_;\r
                \r
+       executor executor_;\r
+public:                                        \r
+       template<typename Func>\r
+       static auto begin_invoke(Func&& func) -> boost::unique_future<decltype(func())> // noexcept\r
+       {       \r
+               return get_instance().executor_.begin_invoke(std::forward<Func>(func)); \r
+       }\r
+\r
+       static void register_drawable(const std::shared_ptr<drawable>& drawable)\r
+       {\r
+               begin_invoke([=]\r
+               {\r
+                       get_instance().drawables_.push_back(drawable);\r
+               });\r
+       }\r
+private:\r
+\r
        void tick()\r
        {\r
                sf::Event e;\r
@@ -91,22 +107,6 @@ class context
                        tick();\r
                });\r
        }\r
-\r
-public:        \r
-                               \r
-       template<typename Func>\r
-       static auto begin_invoke(Func&& func) -> boost::unique_future<decltype(func())> // noexcept\r
-       {       \r
-               return get_instance().executor_.begin_invoke(std::forward<Func>(func)); \r
-       }\r
-\r
-       static void register_drawable(const std::shared_ptr<drawable>& drawable)\r
-       {\r
-               begin_invoke([=]\r
-               {\r
-                       get_instance().drawables_.push_back(drawable);\r
-               });\r
-       }\r
 };\r
 \r
 class line\r