projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
[dcpomatic.git]
/
test
/
player_test.cc
diff --git
a/test/player_test.cc
b/test/player_test.cc
index d480602422b0ee1a810cfc74a1e38c0ad575eb1b..b6f864f8250e9762f0975eb16e6e79b38af8e360 100644
(file)
--- a/
test/player_test.cc
+++ b/
test/player_test.cc
@@
-49,7
+49,7
@@
BOOST_AUTO_TEST_CASE (player_overlaps_test)
film->examine_and_add_content (C);
wait_for_jobs ();
film->examine_and_add_content (C);
wait_for_jobs ();
- BOOST_CHECK_EQUAL (A->full_length(), DCPTime (28
0
000));
+ BOOST_CHECK_EQUAL (A->full_length(), DCPTime (28
8
000));
A->set_position (DCPTime::from_seconds (0));
B->set_position (DCPTime::from_seconds (10));
A->set_position (DCPTime::from_seconds (0));
B->set_position (DCPTime::from_seconds (10));