projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
test
/
recover_test.cc
diff --git
a/test/recover_test.cc
b/test/recover_test.cc
index 31b882a2eaeeeb81ca4e99450c594f96fad73798..92eae27eb9e8cf4ce734cea3878f0f0de8464327 100644
(file)
--- a/
test/recover_test.cc
+++ b/
test/recover_test.cc
@@
-36,7
+36,7
@@
using boost::shared_ptr;
static void
note (dcp::NoteType t, string n)
{
static void
note (dcp::NoteType t, string n)
{
- if (t == dcp::ERROR) {
+ if (t == dcp::
DCP_
ERROR) {
cout << n << "\n";
}
}
cout << n << "\n";
}
}
@@
-44,7
+44,7
@@
note (dcp::NoteType t, string n)
BOOST_AUTO_TEST_CASE (recover_test)
{
shared_ptr<Film> film = new_test_film ("recover_test");
BOOST_AUTO_TEST_CASE (recover_test)
{
shared_ptr<Film> film = new_test_film ("recover_test");
- film->set_dcp_content_type (DCPContentType::from_
dci
_name ("FTR"));
+ film->set_dcp_content_type (DCPContentType::from_
isdcf
_name ("FTR"));
film->set_container (Ratio::from_id ("185"));
film->set_name ("recover_test");
film->set_three_d (true);
film->set_container (Ratio::from_id ("185"));
film->set_name ("recover_test");
film->set_three_d (true);
@@
-57,7
+57,7
@@
BOOST_AUTO_TEST_CASE (recover_test)
film->make_dcp ();
wait_for_jobs ();
film->make_dcp ();
wait_for_jobs ();
- boost::filesystem::path const video = "build/test/recover_test/video/185_2K_
3651eded785682b85f4baca4b1d3b7a9_24_bicubic_2
00000000_P_S_3D.mxf";
+ boost::filesystem::path const video = "build/test/recover_test/video/185_2K_
1133fd57e751ce3e82146492466365f9_24_bicubic_1
00000000_P_S_3D.mxf";
boost::filesystem::copy_file (
video,
boost::filesystem::copy_file (
video,