projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused parameter.
[dcpomatic.git]
/
test
/
play_test.cc
diff --git
a/test/play_test.cc
b/test/play_test.cc
index dcf8e7f6dd323e264ecc5d8d1197f4956355ea77..b950044a81bd3ba8a599c4c76d14d7766d47fabd 100644
(file)
--- a/
test/play_test.cc
+++ b/
test/play_test.cc
@@
-23,6
+23,7
@@
#include "lib/dcp_content_type.h"
#include "lib/player_video_frame.h"
#include "test.h"
#include "lib/dcp_content_type.h"
#include "lib/player_video_frame.h"
#include "test.h"
+#include <iostream>
/* This test needs stuff in Player that is only included in debug mode */
#ifdef DCPOMATIC_DEBUG
/* This test needs stuff in Player that is only included in debug mode */
#ifdef DCPOMATIC_DEBUG
@@
-62,7
+63,7
@@
public:
if (_queue.empty ()) {
return optional<Video> ();
}
if (_queue.empty ()) {
return optional<Video> ();
}
-
+
Video v = _queue.back ();
_queue.pop_back ();
return v;
Video v = _queue.back ();
_queue.pop_back ();
return v;
@@
-97,7
+98,7
@@
BOOST_AUTO_TEST_CASE (play_test)
wait_for_jobs ();
BOOST_CHECK_EQUAL (B->video_length_after_3d_combine(), 16);
wait_for_jobs ();
BOOST_CHECK_EQUAL (B->video_length_after_3d_combine(), 16);
-
+
/* 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);