]> 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>
Thu, 2 Feb 2012 23:47:07 +0000 (23:47 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 2 Feb 2012 23:47:07 +0000 (23:47 +0000)
core/producer/layer.cpp
core/producer/layer.h

index 0a53d39ee2de1e5e8264f27251e4042c441646ae..64a242122a2cd524ee13670018455282f068b1fa 100644 (file)
@@ -163,8 +163,6 @@ void layer::load(const safe_ptr<frame_producer>& frame_producer, const boost::op
 void layer::play(){impl_->play();}\r
 void layer::pause(){impl_->pause();}\r
 void layer::stop(){impl_->stop();}\r
-bool layer::is_paused() const{return impl_->is_paused_;}\r
-int64_t layer::frame_number() const{return impl_->frame_number_;}\r
 safe_ptr<draw_frame> layer::receive(frame_producer::flags flags) {return impl_->receive(flags);}\r
 safe_ptr<frame_producer> layer::foreground() const { return impl_->foreground_;}\r
 safe_ptr<frame_producer> layer::background() const { return impl_->background_;}\r
index cef2bc272096dd98d35634ea8442c015bba79bf3..a0c996a74685fc18890f7209883d7cd61f8eebd6 100644 (file)
@@ -49,11 +49,7 @@ public:
        void play(); // nothrow\r
        void pause(); // nothrow\r
        void stop(); // nothrow\r
-       boost::unique_future<std::wstring> call(bool foreground, const std::wstring& param);\r
-\r
-       bool is_paused() const;\r
-       int64_t frame_number() const;\r
-       \r
+               \r
        bool empty() const;\r
 \r
        safe_ptr<struct frame_producer> foreground() const; // nothrow\r