/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
*\r
-* This file is part of CasparCG.\r
+* This file is part of CasparCG (www.casparcg.com).\r
*\r
-* CasparCG is free software: you can redistribute it and/or modify\r
-* it under the terms of the GNU General Public License as published by\r
-* the Free Software Foundation, either version 3 of the License, or\r
-* (at your option) any later version.\r
+* CasparCG is free software: you can redistribute it and/or modify\r
+* it under the terms of the GNU General Public License as published by\r
+* the Free Software Foundation, either version 3 of the License, or\r
+* (at your option) any later version.\r
*\r
-* CasparCG is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
-* GNU General Public License for more details.\r
-\r
-* You should have received a copy of the GNU General Public License\r
-* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
+* CasparCG is distributed in the hope that it will be useful,\r
+* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+* GNU General Public License for more details.\r
+*\r
+* You should have received a copy of the GNU General Public License\r
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
*\r
+* Author: Robert Nagy, ronag89@gmail.com\r
*/\r
\r
#include "../stdafx.h"\r
#include "frame_producer.h"\r
#include "frame/basic_frame.h"\r
\r
+#include <boost/property_tree/ptree.hpp>\r
+\r
namespace caspar { namespace core {\r
\r
struct layer::implementation\r
safe_ptr<frame_producer> foreground_;\r
safe_ptr<frame_producer> background_;\r
int64_t frame_number_;\r
- int auto_play_delta_;\r
+ int32_t auto_play_delta_;\r
bool is_paused_;\r
\r
public:\r
background_ = producer;\r
auto_play_delta_ = auto_play_delta;\r
\r
+ if(auto_play_delta_ > -1 && foreground_ == frame_producer::empty())\r
+ play();\r
+\r
if(preview) // Play the first frame and pause.\r
{ \r
play();\r
- receive();\r
+ receive(frame_producer::NO_FLAG);\r
pause();\r
}\r
}\r
is_paused_ = true;\r
}\r
\r
- safe_ptr<basic_frame> receive()\r
+ safe_ptr<basic_frame> receive(int flags)\r
{ \r
try\r
{\r
if(is_paused_)\r
return disable_audio(foreground_->last_frame());\r
\r
- auto frame = receive_and_follow(foreground_, frame_producer::NO_HINT);\r
+ auto frame = receive_and_follow(foreground_, flags);\r
if(frame == core::basic_frame::late())\r
return foreground_->last_frame();\r
\r
- auto frames_left = foreground_->nb_frames() - (++frame_number_) - auto_play_delta_;\r
+ auto frames_left = static_cast<int64_t>(foreground_->nb_frames()) - static_cast<int64_t>(++frame_number_) - static_cast<int64_t>(auto_play_delta_);\r
if(auto_play_delta_ > -1 && frames_left < 1)\r
{\r
play();\r
- return receive();\r
+ return receive(flags);\r
}\r
\r
return frame;\r
}\r
}\r
\r
- layer_status status() const\r
- {\r
- layer_status status;\r
- status.foreground = foreground_->print();\r
- status.background = background_->print();\r
- status.is_paused = is_paused_;\r
- status.total_frames = foreground_->nb_frames();\r
- status.current_frame = frame_number_;\r
-\r
- return status;\r
- }\r
-\r
boost::unique_future<std::wstring> call(bool foreground, const std::wstring& param)\r
{\r
return (foreground ? foreground_ : background_)->call(param);\r
{\r
return background_ == core::frame_producer::empty() && foreground_ == core::frame_producer::empty();\r
}\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_);\r
+ info.add(L"frame-number", 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_));\r
+ info.add_child(L"foreground", foreground_->info());\r
+ info.add_child(L"background", background_->info());\r
+ return info;\r
+ }\r
};\r
\r
layer::layer() : impl_(new implementation()){}\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
-layer_status layer::status() const {return impl_->status();}\r
-safe_ptr<basic_frame> layer::receive() {return impl_->receive();}\r
+safe_ptr<basic_frame> layer::receive(int 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
bool layer::empty() const {return impl_->empty();}\r
boost::unique_future<std::wstring> layer::call(bool foreground, const std::wstring& param){return impl_->call(foreground, param);}\r
+boost::property_tree::wptree layer::info() const{return impl_->info();}\r
}}
\ No newline at end of file
projects / casparcg / blobdiff