projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change how video timing is done.
[dcpomatic.git]
/
test
/
client_server_test.cc
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index 7a99f72274758a1bace8f1e9f637fe7e1c61d502..32af60cbe6c0b4efd755bcdff20f14521f7a1a76 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-51,6
+51,7
@@
using std::weak_ptr;
using boost::thread;
using boost::optional;
using dcp::ArrayData;
using boost::thread;
using boost::optional;
using dcp::ArrayData;
+using namespace dcpomatic;
void
void
@@
-105,7
+106,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
ColourConversion(),
VideoRange::FULL,
weak_ptr<Content>(),
ColourConversion(),
VideoRange::FULL,
weak_ptr<Content>(),
- optional<
Fra
me>(),
+ optional<
ContentTi
me>(),
false
);
false
);
@@
-188,7
+189,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
ColourConversion(),
VideoRange::FULL,
weak_ptr<Content>(),
ColourConversion(),
VideoRange::FULL,
weak_ptr<Content>(),
- optional<
Fra
me>(),
+ optional<
ContentTi
me>(),
false
);
false
);
@@
-258,7
+259,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
ColourConversion(),
VideoRange::FULL,
weak_ptr<Content>(),
ColourConversion(),
VideoRange::FULL,
weak_ptr<Content>(),
- optional<
Fra
me>(),
+ optional<
ContentTi
me>(),
false
);
false
);
@@
-283,7
+284,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
PresetColourConversion::all().front().conversion,
VideoRange::FULL,
weak_ptr<Content>(),
PresetColourConversion::all().front().conversion,
VideoRange::FULL,
weak_ptr<Content>(),
- optional<
Fra
me>(),
+ optional<
ContentTi
me>(),
false
);
false
);