\r
struct layer::impl\r
{ \r
- spl::shared_ptr<monitor::subject> event_subject_;\r
- spl::shared_ptr<monitor::subject> foreground_event_subject_;\r
- spl::shared_ptr<monitor::subject> background_event_subject_;\r
+ monitor::basic_subject event_subject_;\r
+ monitor::basic_subject foreground_event_subject_;\r
+ monitor::basic_subject background_event_subject_;\r
spl::shared_ptr<frame_producer> foreground_;\r
spl::shared_ptr<frame_producer> background_;\r
- int64_t frame_number_;\r
boost::optional<int32_t> auto_play_delta_;\r
- bool is_paused_;\r
\r
public:\r
impl(int index) \r
- : event_subject_(new monitor::subject(monitor::path("layer") % index))\r
- , foreground_event_subject_(new monitor::subject("foreground"))\r
- , background_event_subject_(new monitor::subject("background"))\r
+ : event_subject_(monitor::path("layer") % index)\r
+ , foreground_event_subject_("")\r
+ , background_event_subject_("background")\r
, foreground_(frame_producer::empty())\r
, background_(frame_producer::empty())\r
- , frame_number_(0)\r
- , is_paused_(false)\r
{\r
- foreground_event_subject_->subscribe(event_subject_);\r
- background_event_subject_->subscribe(event_subject_);\r
+ foreground_event_subject_.subscribe(event_subject_);\r
+ background_event_subject_.subscribe(event_subject_);\r
}\r
\r
void pause()\r
{\r
- is_paused_ = true;\r
+ foreground_->paused(true);\r
}\r
-\r
- void resume()\r
- {\r
- is_paused_ = false;\r
- }\r
-\r
- void load(spl::shared_ptr<frame_producer> producer, const boost::optional<int32_t>& auto_play_delta)\r
+ \r
+ void load(spl::shared_ptr<frame_producer> producer, bool preview, const boost::optional<int32_t>& auto_play_delta)\r
{ \r
background_->unsubscribe(background_event_subject_);\r
background_ = std::move(producer);\r
\r
auto_play_delta_ = auto_play_delta;\r
\r
+ if(preview)\r
+ {\r
+ play();\r
+ foreground_->receive();\r
+ foreground_->paused(true);\r
+ }\r
+\r
if(auto_play_delta_ && foreground_ == frame_producer::empty())\r
play();\r
}\r
{ \r
if(background_ != frame_producer::empty())\r
{\r
- background_->set_leading_producer(foreground_);\r
+ background_->leading_producer(foreground_);\r
\r
background_->unsubscribe(background_event_subject_);\r
foreground_->unsubscribe(foreground_event_subject_);\r
\r
foreground_->subscribe(foreground_event_subject_);\r
\r
- frame_number_ = 0;\r
auto_play_delta_.reset();\r
}\r
\r
- resume();\r
+ foreground_->paused(false);\r
}\r
\r
void stop()\r
\r
foreground_ = std::move(frame_producer::empty());\r
\r
- frame_number_ = 0;\r
auto_play_delta_.reset();\r
-\r
- pause();\r
}\r
\r
- spl::shared_ptr<draw_frame> receive(frame_producer::flags flags, const video_format_desc& format_desc)\r
+ draw_frame receive(const video_format_desc& format_desc)\r
{ \r
try\r
- {\r
- if(is_paused_)\r
- return draw_frame::mute(foreground_->last_frame());\r
- \r
- auto frame = foreground_->receive(flags.value());\r
+ { \r
+ auto frame = foreground_->receive();\r
+\r
if(frame == core::draw_frame::late())\r
return foreground_->last_frame();\r
- \r
- ++frame_number_;\r
-\r
+ \r
if(auto_play_delta_)\r
{\r
- auto frames_left = static_cast<int64_t>(foreground_->nb_frames()) - frame_number_ - static_cast<int64_t>(*auto_play_delta_);\r
+ auto frames_left = static_cast<int64_t>(foreground_->nb_frames()) - foreground_->frame_number() - static_cast<int64_t>(*auto_play_delta_);\r
if(frames_left < 1)\r
{\r
play();\r
- return receive(flags, format_desc);\r
+ return receive(format_desc);\r
}\r
}\r
\r
- *event_subject_ << monitor::event("state") % u8(is_paused_ ? L"paused" : (foreground_ == frame_producer::empty() ? L"stopped" : L"playing")) \r
- << monitor::event("time") % monitor::duration(frame_number_/format_desc.fps)\r
+ event_subject_ << monitor::event("time") % monitor::duration(foreground_->frame_number()/format_desc.fps)\r
% monitor::duration(static_cast<int64_t>(foreground_->nb_frames()) - static_cast<int64_t>(auto_play_delta_ ? *auto_play_delta_ : 0)/format_desc.fps)\r
- << monitor::event("frame") % static_cast<int64_t>(frame_number_)\r
+ << monitor::event("frame") % static_cast<int64_t>(foreground_->frame_number())\r
% static_cast<int64_t>((static_cast<int64_t>(foreground_->nb_frames()) - static_cast<int64_t>(auto_play_delta_ ? *auto_play_delta_ : 0)));\r
\r
- *foreground_event_subject_ << monitor::event("type") % u8(foreground_->name());\r
- *background_event_subject_ << monitor::event("type") % u8(foreground_->name());\r
+ foreground_event_subject_ << monitor::event("type") % foreground_->name();\r
+ background_event_subject_ << monitor::event("type") % background_->name();\r
\r
return frame;\r
}\r
boost::property_tree::wptree info() const\r
{\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_ ? boost::lexical_cast<std::wstring>(*auto_play_delta_) : L"null"));\r
- info.add(L"frame-number", frame_number_);\r
+ info.add(L"frame-number", foreground_->frame_number());\r
\r
auto nb_frames = foreground_->nb_frames();\r
\r
info.add(L"nb_frames", nb_frames == std::numeric_limits<int64_t>::max() ? -1 : nb_frames);\r
- info.add(L"frames-left", nb_frames == std::numeric_limits<int64_t>::max() ? -1 : (foreground_->nb_frames() - frame_number_ - (auto_play_delta_ ? *auto_play_delta_ : 0)));\r
- info.add_child(L"foreground.producer", foreground_->info());\r
+ info.add(L"frames-left", nb_frames == std::numeric_limits<int64_t>::max() ? -1 : (foreground_->nb_frames() - foreground_->frame_number() - (auto_play_delta_ ? *auto_play_delta_ : 0)));\r
+ info.add_child(L"producer", foreground_->info());\r
info.add_child(L"background.producer", background_->info());\r
return info;\r
}\r
{ \r
impl_.swap(other.impl_);\r
}\r
-void layer::load(spl::shared_ptr<frame_producer> frame_producer, const boost::optional<int32_t>& auto_play_delta){return impl_->load(std::move(frame_producer), auto_play_delta);} \r
+void layer::load(spl::shared_ptr<frame_producer> frame_producer, bool preview, const boost::optional<int32_t>& auto_play_delta){return impl_->load(std::move(frame_producer), preview, auto_play_delta);} \r
void layer::play(){impl_->play();}\r
void layer::pause(){impl_->pause();}\r
void layer::stop(){impl_->stop();}\r
-spl::shared_ptr<draw_frame> layer::receive(frame_producer::flags flags, const video_format_desc& format_desc) {return impl_->receive(flags, format_desc);}\r
+draw_frame layer::receive(const video_format_desc& format_desc) {return impl_->receive(format_desc);}\r
spl::shared_ptr<frame_producer> layer::foreground() const { return impl_->foreground_;}\r
spl::shared_ptr<frame_producer> layer::background() const { return impl_->background_;}\r
boost::property_tree::wptree layer::info() const{return impl_->info();}\r
-void layer::subscribe(const monitor::observable::observer_ptr& o) {impl_->event_subject_->subscribe(o);}\r
-void layer::unsubscribe(const monitor::observable::observer_ptr& o) {impl_->event_subject_->unsubscribe(o);}\r
+void layer::subscribe(const monitor::observable::observer_ptr& o) {impl_->event_subject_.subscribe(o);}\r
+void layer::unsubscribe(const monitor::observable::observer_ptr& o) {impl_->event_subject_.unsubscribe(o);}\r
}}
\ No newline at end of file
projects / casparcg / blobdiff