Some tidying up of test Doxygen.

[dcpomatic.git] / test / time_calculation_test.cc

diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index e995a4ed00693a8f7d0e32dec33cfb170553d165..8c57a9fdbbb3dfdb4b417ea12eb1bcc813f65231 100644 (file)
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/time_calculation_test.cc
  *  @brief Test calculation of timings when frame rates change.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "lib/film.h"
@@ -34,6 +34,7 @@
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 static string const xml = "<Content>"
        "<Type>FFmpeg</Type>"
@@ -189,7 +190,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        film->set_sequence (false);
        film->add_content (content);
 
-       shared_ptr<Player> player (new Player (film, film->playlist ()));
+       shared_ptr<Player> player (new Player(film));
 
        /* Position 0, no trim, content rate = DCP rate */
        content->set_position (film, DCPTime());
@@ -197,7 +198,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        shared_ptr<Piece> piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12);
@@ -209,7 +210,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)),   0);
@@ -223,7 +224,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)),   0);
@@ -240,7 +241,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.6)), 15);
@@ -252,7 +253,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)),   0);
@@ -269,7 +270,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.60)),   0);
@@ -288,7 +289,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 12);
@@ -300,7 +301,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)),   0);
@@ -314,7 +315,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)),   0);
@@ -332,7 +333,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (48);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.5)), 24);
@@ -344,7 +345,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (48);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)),   0);
@@ -358,7 +359,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (48);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime::from_seconds (0.50)),   0);
@@ -372,7 +373,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
        content->set_video_frame_rate (29.9978733);
        film->set_video_frame_rate (30);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_content_video (piece, DCPTime (3200)), 1);
@@ -395,7 +396,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        film->set_sequence (false);
        film->add_content (content);
 
-       shared_ptr<Player> player (new Player (film, film->playlist ()));
+       shared_ptr<Player> player (new Player(film));
 
        /* Position 0, no trim, content rate = DCP rate */
        content->set_position (film, DCPTime());
@@ -403,7 +404,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        shared_ptr<Piece> piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 0).get(), 0);
        BOOST_CHECK_EQUAL (player->content_video_to_dcp (piece, 12).get(), DCPTime::from_seconds(0.5).get());
@@ -415,7 +416,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
@@ -427,7 +428,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
@@ -443,7 +444,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 15).get(), DCPTime::from_seconds(0.6).get());
@@ -455,7 +456,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), DCPTime::from_seconds(4.60).get());
@@ -467,7 +468,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (25);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 142080);
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 40).get(), 295680);
@@ -485,7 +486,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 12).get(), DCPTime::from_seconds(0.5).get());
@@ -497,7 +498,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
@@ -509,7 +510,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        content->set_video_frame_rate (24);
        film->set_video_frame_rate (48);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
@@ -526,7 +527,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        content->set_video_frame_rate (48);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), 0);
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 24).get(), DCPTime::from_seconds(0.5).get());
@@ -538,7 +539,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        content->set_video_frame_rate (48);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(4.50).get());
@@ -550,7 +551,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
        content->set_video_frame_rate (48);
        film->set_video_frame_rate (24);
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
        BOOST_CHECK_EQUAL (player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(3.00).get());
@@ -572,7 +573,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_sequence (false);
        film->add_content (content);
 
-       shared_ptr<Player> player (new Player (film, film->playlist ()));
+       shared_ptr<Player> player (new Player(film));
 
        /* Position 0, no trim, video/audio content rate = video/audio DCP rate */
        content->set_position (film, DCPTime());
@@ -581,7 +582,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        shared_ptr<Piece> piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)),  24000);
@@ -594,7 +595,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
@@ -609,7 +610,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
@@ -624,7 +625,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (25);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.6)),  28800);
@@ -637,7 +638,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (25);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)),      0);
@@ -654,7 +655,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (25);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.60)),      0);
@@ -673,7 +674,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (48);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)),  24000);
@@ -686,7 +687,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
@@ -701,7 +702,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),   0);
@@ -719,7 +720,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (48);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)),  24000);
@@ -732,7 +733,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
@@ -747,7 +748,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),   0);
@@ -762,7 +763,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (24);
        stream->_frame_rate = 44100;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.5)),  24000);
@@ -775,7 +776,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (24);
        stream->_frame_rate = 44100;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
@@ -790,7 +791,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (24);
        stream->_frame_rate = 44100;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 0);
        BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime::from_seconds (0.50)),      0);
@@ -805,7 +806,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
        film->set_video_frame_rate (24);
        stream->_frame_rate = 48000;
        player->setup_pieces ();
-       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1);
+       BOOST_REQUIRE_EQUAL (player->_pieces.size(), 1U);
        piece = player->_pieces.front ();
-       BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 54143L * 48000);
+       BOOST_CHECK_EQUAL (player->dcp_to_resampled_audio (piece, DCPTime ()), 54143LL * 48000);
 }