projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add control files for Ubuntu 13.10.
[dcpomatic.git]
/
test
/
play_test.cc
diff --git
a/test/play_test.cc
b/test/play_test.cc
index 52b54408b826adb8908e5860bc505b76336056d6..cb5b6cbb8cd2f1ff0349a9b93b211755e3b78583 100644
(file)
--- a/
test/play_test.cc
+++ b/
test/play_test.cc
@@
-43,7
+43,7
@@
public:
PlayerWrapper (shared_ptr<Player> p)
: _player (p)
{
PlayerWrapper (shared_ptr<Player> p)
: _player (p)
{
- _player->Video.connect (bind (&PlayerWrapper::process_video, this, _1, _2, _
4
));
+ _player->Video.connect (bind (&PlayerWrapper::process_video, this, _1, _2, _
5
));
}
void process_video (shared_ptr<const Image> i, bool, Time t)
}
void process_video (shared_ptr<const Image> i, bool, Time t)
@@
-100,9
+100,9
@@
BOOST_AUTO_TEST_CASE (play_test)
/* Film should have been set to 25fps */
BOOST_CHECK_EQUAL (film->video_frame_rate(), 25);
/* Film should have been set to 25fps */
BOOST_CHECK_EQUAL (film->video_frame_rate(), 25);
- BOOST_CHECK_EQUAL (A->
start
(), 0);
+ BOOST_CHECK_EQUAL (A->
position
(), 0);
/* A is 16 frames long at 25 fps */
/* A is 16 frames long at 25 fps */
- BOOST_CHECK_EQUAL (B->
start
(), 16 * TIME_HZ / 25);
+ BOOST_CHECK_EQUAL (B->
position
(), 16 * TIME_HZ / 25);
shared_ptr<Player> player = film->make_player ();
PlayerWrapper wrap (player);
shared_ptr<Player> player = film->make_player ();
PlayerWrapper wrap (player);