2.0. Fixed auto play bug while using transitions.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1040 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 1762c0d5f2ed6d187e785e0798f8c6973ccb8ba3..056e85d63c70c9dc97190321c90f723c65425024 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -69,6 +69,7 @@ public:
        virtual void                                            param(const std::wstring& str)                                                                  {producer_->param(str);}\r
        virtual safe_ptr<frame_producer>        get_following_producer() const                                                                  {return producer_->get_following_producer();}\r
        virtual void                                            set_leading_producer(const safe_ptr<frame_producer>& producer)  {producer_->set_leading_producer(producer);}\r
+       virtual int64_t                                         nb_frames() const                                                                                               {return producer_->nb_frames();}\r
 };\r
 \r
 struct stage::implementation : boost::noncopyable\r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index 20559c377f5ec747e097afa0c3d9a25bddb983fc..ca95bb9e023b52f619b2ec11a9a76380ad322eb6 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -75,6 +75,11 @@ struct transition_producer : public frame_producer
                return compose(dest, source);\r
        }\r
 \r
+       virtual int64_t nb_frames() const \r
+       {\r
+               return get_following_producer()->nb_frames();\r
+       }\r
+\r
        virtual std::wstring print() const\r
        {\r
                return L"transition";\r