\r
void load(int index, const safe_ptr<frame_producer>& producer, bool preview, int auto_play_delta)\r
{\r
- executor_.invoke([&]\r
+ executor_.begin_invoke([=]\r
{\r
layers_[index].load(producer, preview, auto_play_delta);\r
}, high_priority);\r
\r
void pause(int index)\r
{ \r
- executor_.invoke([&]\r
+ executor_.begin_invoke([=]\r
{\r
layers_[index].pause();\r
}, high_priority);\r
\r
void play(int index)\r
{ \r
- executor_.invoke([&]\r
+ executor_.begin_invoke([=]\r
{\r
layers_[index].play();\r
}, high_priority);\r
\r
void stop(int index)\r
{ \r
- executor_.invoke([&]\r
+ executor_.begin_invoke([=]\r
{\r
layers_[index].stop();\r
}, high_priority);\r
\r
void clear(int index)\r
{\r
- executor_.invoke([&]\r
+ executor_.begin_invoke([=]\r
{\r
layers_.erase(index);\r
}, high_priority);\r
\r
void clear()\r
{\r
- executor_.invoke([&]\r
+ executor_.begin_invoke([=]\r
{\r
layers_.clear();\r
}, high_priority);\r
\r
boost::unique_future<std::wstring> call(int index, bool foreground, const std::wstring& param)\r
{\r
- return std::move(*executor_.invoke([&]\r
+ return std::move(*executor_.invoke([=]\r
{\r
return std::make_shared<boost::unique_future<std::wstring>>(std::move(layers_[index].call(foreground, param)));\r
}, high_priority));\r
}\r
+ \r
+ void swap_layers(const safe_ptr<stage>& other)\r
+ {\r
+ if(other->impl_.get() == this)\r
+ return;\r
+ \r
+ auto func = [=]\r
+ {\r
+ std::swap(layers_, other->impl_->layers_);\r
+ }; \r
+ executor_.begin_invoke([=]\r
+ {\r
+ other->impl_->executor_.invoke(func, high_priority);\r
+ }, high_priority);\r
+ }\r
\r
void swap_layer(int index, size_t other_index)\r
{\r
- executor_.invoke([&]\r
+ executor_.begin_invoke([=]\r
{\r
std::swap(layers_[index], layers_[other_index]);\r
}, high_priority);\r
}\r
\r
- void swap_layer(int index, size_t other_index, stage& other)\r
+ void swap_layer(int index, size_t other_index, const safe_ptr<stage>& other)\r
{\r
- if(other.impl_.get() == this)\r
+ if(other->impl_.get() == this)\r
swap_layer(index, other_index);\r
else\r
{\r
- auto func = [&]\r
+ auto func = [=]\r
{\r
- std::swap(layers_[index], other.impl_->layers_[other_index]);\r
+ std::swap(layers_[index], other->impl_->layers_[other_index]);\r
}; \r
- executor_.invoke([&]{other.impl_->executor_.invoke(func, high_priority);}, high_priority);\r
+ executor_.begin_invoke([=]\r
+ {\r
+ other->impl_->executor_.invoke(func, high_priority);\r
+ }, high_priority);\r
}\r
}\r
\r
- void swap(stage& other)\r
- {\r
- if(other.impl_.get() == this)\r
- return;\r
- \r
- auto func = [&]\r
- {\r
- std::swap(layers_, other.impl_->layers_);\r
- }; \r
- executor_.invoke([&]{other.impl_->executor_.invoke(func, high_priority);}, high_priority);\r
- }\r
-\r
- layer_status get_status(int index)\r
+ boost::unique_future<layer_status> get_status(int index)\r
{ \r
- return executor_.invoke([&]\r
+ return executor_.begin_invoke([=]\r
{\r
return layers_[index].status();\r
}, high_priority );\r
}\r
\r
- safe_ptr<frame_producer> foreground(int index)\r
+ boost::unique_future<safe_ptr<frame_producer>> foreground(int index)\r
{\r
- return executor_.invoke([=]{return layers_[index].foreground();}, high_priority);\r
+ return executor_.begin_invoke([=]\r
+ {\r
+ return layers_[index].foreground();\r
+ }, high_priority);\r
}\r
\r
- safe_ptr<frame_producer> background(int index)\r
+ boost::unique_future<safe_ptr<frame_producer>> background(int index)\r
{\r
- return executor_.invoke([=]{return layers_[index].background();}, high_priority);\r
+ return executor_.begin_invoke([=]\r
+ {\r
+ return layers_[index].background();\r
+ }, high_priority);\r
}\r
\r
void set_video_format_desc(const video_format_desc& format_desc)\r
\r
stage::stage(const safe_ptr<diagnostics::graph>& graph, const safe_ptr<target_t>& target, const video_format_desc& format_desc) : impl_(new implementation(graph, target, format_desc)){}\r
void stage::spawn_token(){impl_->spawn_token();}\r
-void stage::swap(stage& other){impl_->swap(other);}\r
void stage::load(int index, const safe_ptr<frame_producer>& producer, bool preview, int auto_play_delta){impl_->load(index, producer, preview, auto_play_delta);}\r
void stage::pause(int index){impl_->pause(index);}\r
void stage::play(int index){impl_->play(index);}\r
void stage::stop(int index){impl_->stop(index);}\r
void stage::clear(int index){impl_->clear(index);}\r
void stage::clear(){impl_->clear();}\r
+void stage::swap_layers(const safe_ptr<stage>& other){impl_->swap_layers(other);}\r
void stage::swap_layer(int index, size_t other_index){impl_->swap_layer(index, other_index);}\r
-void stage::swap_layer(int index, size_t other_index, stage& other){impl_->swap_layer(index, other_index, other);}\r
-layer_status stage::get_status(int index){return impl_->get_status(index);}\r
-safe_ptr<frame_producer> stage::foreground(size_t index) {return impl_->foreground(index);}\r
-safe_ptr<frame_producer> stage::background(size_t index) {return impl_->background(index);}\r
-void stage::set_video_format_desc(const video_format_desc& format_desc){impl_->set_video_format_desc(format_desc);}\r
+void stage::swap_layer(int index, size_t other_index, const safe_ptr<stage>& other){impl_->swap_layer(index, other_index, other);}\r
+boost::unique_future<layer_status> stage::get_status(int index){return impl_->get_status(index);}\r
+boost::unique_future<safe_ptr<frame_producer>> stage::foreground(size_t index) {return impl_->foreground(index);}\r
+boost::unique_future<safe_ptr<frame_producer>> stage::background(size_t index) {return impl_->background(index);}\r
boost::unique_future<std::wstring> stage::call(int index, bool foreground, const std::wstring& param){return impl_->call(index, foreground, param);}\r
+void stage::set_video_format_desc(const video_format_desc& format_desc){impl_->set_video_format_desc(format_desc);}\r
}}
\ No newline at end of file
projects / casparcg / blobdiff