\r
#include "../StdAfx.h"\r
\r
+#if defined(_MSC_VER)\r
+#pragma warning (push, 1) // TODO: Legacy code, just disable warnings\r
+#endif\r
+\r
#include "AMCPCommandsImpl.h"\r
#include "AMCPProtocolStrategy.h"\r
\r
\r
#include <core/producer/frame_producer.h>\r
#include <core/video_format.h>\r
+#include <core/video_channel_context.h>\r
#include <core/producer/transition/transition_producer.h>\r
-#include <core/producer/frame/image_transform.h>\r
-#include <core/producer/frame/audio_transform.h>\r
+#include <core/producer/frame/frame_transform.h>\r
#include <core/producer/stage.h>\r
#include <core/producer/layer.h>\r
#include <core/mixer/mixer.h>\r
#include <boost/filesystem.hpp>\r
#include <boost/regex.hpp>\r
\r
-#if defined(_MSC_VER)\r
-#pragma warning (push, 1) // TODO: Legacy code, just disable warnings\r
-#endif\r
-\r
/* Return codes\r
\r
100 [action] Information om att något har hänt \r
if(_parameters[0] == L"KEYER")\r
{\r
bool value = lexical_cast_or_default(_parameters.at(1), false);\r
- auto transform = [=](image_transform transform) -> image_transform\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- transform.set_is_key(value);\r
+ transform.is_key = value;\r
return transform; \r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform);\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform);\r
}\r
else if(_parameters[0] == L"OPACITY")\r
{\r
\r
double value = boost::lexical_cast<double>(_parameters.at(1));\r
\r
- auto transform = [=](image_transform transform) -> image_transform\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- transform.set_opacity(value);\r
+ transform.opacity = value;\r
return transform; \r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[0] == L"FILL")\r
{\r
double x_s = boost::lexical_cast<double>(_parameters.at(3));\r
double y_s = boost::lexical_cast<double>(_parameters.at(4));\r
\r
- auto transform = [=](image_transform transform) -> image_transform\r
+ auto transform = [=](frame_transform transform) mutable -> frame_transform\r
{\r
- transform.set_fill_translation(x, y);\r
- transform.set_fill_scale(x_s, y_s);\r
- transform.set_clip_translation(x, y);\r
- transform.set_clip_scale(x_s, y_s);\r
+ transform.fill_translation[0] = x;\r
+ transform.fill_translation[1] = y;\r
+ transform.fill_scale[0] = x_s;\r
+ transform.fill_scale[1] = y_s;\r
+ transform.clip_translation[0] = x;\r
+ transform.clip_translation[1] = y;\r
+ transform.clip_scale[0] = x_s;\r
+ transform.clip_scale[1] = y_s;\r
return transform;\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
- else if(_parameters[0] == L"MASK")\r
+ else if(_parameters[0] == L"CLIP")\r
{\r
int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[5], 0) : 0;\r
std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear";\r
double x_s = boost::lexical_cast<double>(_parameters.at(3));\r
double y_s = boost::lexical_cast<double>(_parameters.at(4));\r
\r
- auto transform = [=](image_transform transform) -> image_transform\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- transform.set_clip_translation(x, y);\r
- transform.set_clip_scale(x_s, y_s);\r
+ transform.clip_translation[0] = x;\r
+ transform.clip_translation[1] = y;\r
+ transform.clip_scale[0] = x_s;\r
+ transform.clip_scale[1] = y_s;\r
return transform;\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
else if(_parameters[0] == L"GRID")\r
{\r
for(int y = 0; y < n; ++y)\r
{\r
int index = x+y*n+1;\r
- auto transform = [=](image_transform transform) -> image_transform\r
- { \r
- transform.set_fill_translation(x*delta, y*delta);\r
- transform.set_fill_scale(delta, delta); \r
- transform.set_clip_translation(x*delta, y*delta);\r
- transform.set_clip_scale(delta, delta);\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
+ { \r
+ transform.fill_translation[0] = x*delta;\r
+ transform.fill_translation[1] = y*delta;\r
+ transform.fill_scale[0] = delta;\r
+ transform.fill_scale[1] = delta;\r
+ transform.clip_translation[0] = x*delta;\r
+ transform.clip_translation[1] = y*delta;\r
+ transform.clip_scale[0] = delta;\r
+ transform.clip_scale[1] = delta; \r
return transform;\r
};\r
- GetChannel()->mixer()->apply_image_transform(index, transform, duration, tween);\r
+ GetChannel()->mixer()->apply_frame_transform(index, transform, duration, tween);\r
}\r
}\r
}\r
auto value = boost::lexical_cast<double>(_parameters.at(1));\r
int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
- auto transform = [=](image_transform transform) -> image_transform\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- transform.set_brightness(value);\r
+ transform.brightness = value;\r
return transform;\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); \r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
}\r
else if(_parameters[0] == L"SATURATION")\r
{\r
auto value = boost::lexical_cast<double>(_parameters.at(1));\r
int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
- auto transform = [=](image_transform transform) -> image_transform\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- transform.set_saturation(value);\r
+ transform.saturation = value;\r
return transform;\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); \r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
}\r
else if(_parameters[0] == L"CONTRAST")\r
{\r
auto value = boost::lexical_cast<double>(_parameters.at(1));\r
int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0;\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
- auto transform = [=](image_transform transform) -> image_transform\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- transform.set_contrast(value);\r
+ transform.contrast = value;\r
return transform;\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); \r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
}\r
else if(_parameters[0] == L"LEVELS")\r
{\r
- image_transform::levels value;\r
+ levels value;\r
value.min_input = boost::lexical_cast<double>(_parameters.at(1));\r
value.max_input = boost::lexical_cast<double>(_parameters.at(2));\r
value.gamma = boost::lexical_cast<double>(_parameters.at(3));\r
int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r
std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear";\r
\r
- auto transform = [=](image_transform transform) -> image_transform\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- transform.set_levels(value);\r
+ transform.levels = value;\r
return transform;\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); \r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); \r
}\r
else if(_parameters[0] == L"VOLUME")\r
{\r
std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear";\r
double value = boost::lexical_cast<double>(_parameters[1]);\r
\r
- auto transform = [=](audio_transform transform) -> audio_transform\r
+ auto transform = [=](frame_transform transform) -> frame_transform\r
{\r
- transform.set_volume(value);\r
+ transform.volume = value;\r
return transform;\r
};\r
\r
int layer = GetLayerIndex();\r
- GetChannel()->mixer()->apply_audio_transform(GetLayerIndex(), transform, duration, tween);\r
+ GetChannel()->mixer()->apply_frame_transform(GetLayerIndex(), transform, duration, tween);\r
}\r
- else if(_parameters[0] == L"RESET")\r
+ else if(_parameters[0] == L"CLEAR")\r
{\r
- GetChannel()->mixer()->reset_transforms();\r
+ GetChannel()->mixer()->clear_transforms();\r
}\r
else\r
{\r
\r
bool auto_play = std::find(_parameters.begin(), _parameters.end(), L"AUTO") != _parameters.end();\r
\r
- auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().mode, pFP, transitionInfo);\r
+ auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().field_mode, create_destroy_producer_proxy(GetChannel()->context().destruction(), pFP), transitionInfo);\r
GetChannel()->stage()->load(GetLayerIndex(), pFP2, false, auto_play ? transitionInfo.duration : -1); // TODO: LOOP\r
\r
CASPAR_LOG(info) << "Loaded " << _parameters[0] << TEXT(" successfully to background");\r
return false;\r
}\r
\r
- datafile << _parameters[2];\r
+ datafile << _parameters2[2];\r
datafile.close();\r
\r
std::wstring replyString = TEXT("202 DATA STORE OK\r\n");\r
projects / casparcg / blobdiff