]> 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, 1 Jan 2012 21:48:31 +0000 (21:48 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 1 Jan 2012 21:48:31 +0000 (21:48 +0000)
core/producer/layer.cpp

index 7c0929659c4eb412b5ab7697f5c7d493b8481652..530b8cf862f0a42589780b9b4b46f2afac57fb6d 100644 (file)
@@ -84,7 +84,7 @@ public:
                        foreground_                     = background_;\r
                        background_                     = frame_producer::empty();\r
                        frame_number_           = 0;\r
-                       auto_play_delta_        = nullptr;      \r
+                       auto_play_delta_.reset();\r
                }\r
 \r
                is_paused_                      = false;\r
@@ -95,7 +95,7 @@ public:
                foreground_                     = frame_producer::empty();\r
                background_                     = background_;\r
                frame_number_           = 0;\r
-               auto_play_delta_        = nullptr;      \r
+               auto_play_delta_.reset();\r
 \r
                is_paused_                      = true;\r
        }\r
@@ -145,7 +145,7 @@ public:
        {\r
                boost::property_tree::wptree info;\r
                info.add(L"status",             is_paused_ ? L"paused" : (foreground_ == frame_producer::empty() ? L"stopped" : L"playing"));\r
-               info.add(L"auto_delta", auto_play_delta_);\r
+               info.add(L"auto_delta", (auto_play_delta_ ? boost::lexical_cast<std::wstring>(*auto_play_delta_) : L"null"));\r
                info.add(L"frame-number", frame_number_);\r
 \r
                auto nb_frames = foreground_->nb_frames();\r