using boost::shared_ptr;
using boost::thread;
using boost::optional;
+using boost::weak_ptr;
using dcp::Data;
void
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
- pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
+ pvf->set_text (PositionImage (sub_image, Position<int> (50, 60)));
shared_ptr<DCPVideo> frame (
new DCPVideo (
dcpomatic_sleep (1);
/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
- EncodeServerDescription description ("127.0.0.1", 1);
+ EncodeServerDescription description ("127.0.0.1", 1, SERVER_LINK_VERSION);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
- pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
+ pvf->set_text (PositionImage (sub_image, Position<int> (50, 60)));
shared_ptr<DCPVideo> frame (
new DCPVideo (
dcpomatic_sleep (1);
/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
- EncodeServerDescription description ("127.0.0.1", 2);
+ EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- ColourConversion ()
+ ColourConversion(),
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
dcp::Size (1998, 1080),
EYES_BOTH,
PART_WHOLE,
- PresetColourConversion::all().front().conversion
+ PresetColourConversion::all().front().conversion,
+ weak_ptr<Content>(),
+ optional<Frame>()
)
);
dcpomatic_sleep (1);
/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
- EncodeServerDescription description ("127.0.0.1", 2);
+ EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
list<thread*> threads;
for (int i = 0; i < 8; ++i) {