[CHANGELOG] Updated changelog.

[casparcg] / core / producer / stage.h

diff --git a/core/producer/stage.h b/core/producer/stage.h
index eb0f37c9d8007d1c46ff34185b17de010405066a..69925892ec05babee4b27d6112e6b623b832ed00 100644 (file)
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -57,18 +57,18 @@ public:
 
        // Constructors
 
-       explicit stage(int channel_index, spl::shared_ptr<diagnostics::graph> graph);
+       explicit stage(int channel_index, spl::shared_ptr<caspar::diagnostics::graph> graph);
        
        // Methods
 
        std::map<int, draw_frame>               operator()(const video_format_desc& format_desc);
 
        std::future<void>                               apply_transforms(const std::vector<transform_tuple_t>& transforms);
-       std::future<void>                               apply_transform(int index, const transform_func_t& transform, unsigned int mix_duration = 0, const tweener& tween = L"linear");
+       std::future<void>                               apply_transform(int index, const transform_func_t& transform, unsigned int mix_duration, const tweener& tween);
        std::future<void>                               clear_transforms(int index);
        std::future<void>                               clear_transforms();
        std::future<frame_transform>    get_current_transform(int index);
-       std::future<void>                               load(int index, const spl::shared_ptr<frame_producer>& producer, bool preview = false, const boost::optional<int32_t>& auto_play_delta = nullptr);
+       std::future<void>                               load(int index, const spl::shared_ptr<frame_producer>& producer, bool preview = false, const boost::optional<int32_t>& auto_play_delta = boost::optional<int32_t>());
        std::future<void>                               pause(int index);
        std::future<void>                               resume(int index);
        std::future<void>                               play(int index);
@@ -101,6 +101,8 @@ public:
        std::future<boost::property_tree::wptree>               info() const;
        std::future<boost::property_tree::wptree>               info(int index) const;
 
+       std::future<boost::property_tree::wptree>               delay_info() const;
+       std::future<boost::property_tree::wptree>               delay_info(int layer) const;
 private:
        struct impl;
        spl::shared_ptr<impl> impl_;