Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x

6 files changed, 10 insertions, 10 deletions

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 29f901d34..df854f9f3 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 	thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
 
 	/* Let the server get itself ready */
-	dcpomatic_sleep (1);
+	dcpomatic_sleep_seconds (1);
 
 	/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
 	EncodeServerDescription description ("127.0.0.1", 1, SERVER_LINK_VERSION);
@@ -207,7 +207,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 	thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
 
 	/* Let the server get itself ready */
-	dcpomatic_sleep (1);
+	dcpomatic_sleep_seconds (1);
 
 	/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
 	EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
@@ -305,7 +305,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 	thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
 
 	/* Let the server get itself ready */
-	dcpomatic_sleep (1);
+	dcpomatic_sleep_seconds (1);
 
 	/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
 	EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
diff --git a/test/interrupt_encoder_test.cc b/test/interrupt_encoder_test.cc
index c6145d861..ed988a65b 100644
--- a/test/interrupt_encoder_test.cc
+++ b/test/interrupt_encoder_test.cc
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (interrupt_encoder_test)
 
 	film->make_dcp ();
 
-	dcpomatic_sleep (10);
+	dcpomatic_sleep_seconds (10);
 
 	JobManager::drop ();
 }
diff --git a/test/job_test.cc b/test/job_test.cc
index fa4890470..d93b4a082 100644
--- a/test/job_test.cc
+++ b/test/job_test.cc
@@ -74,9 +74,9 @@ BOOST_AUTO_TEST_CASE (job_manager_test)
 	shared_ptr<TestJob> a (new TestJob (film));
 
 	JobManager::instance()->add (a);
-	dcpomatic_sleep (1);
+	dcpomatic_sleep_seconds (1);
 	BOOST_CHECK_EQUAL (a->running (), true);
 	a->set_finished_ok ();
-	dcpomatic_sleep (2);
+	dcpomatic_sleep_seconds (2);
 	BOOST_CHECK_EQUAL (a->finished_ok(), true);
 }
diff --git a/test/player_test.cc b/test/player_test.cc
index af40002de..a7e944cd4 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -333,14 +333,14 @@ BOOST_AUTO_TEST_CASE (player_trim_crash)
 	shared_ptr<Butler> butler (new Butler(player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
 
 	/* Wait for the butler to fill */
-	dcpomatic_sleep (5);
+	dcpomatic_sleep_seconds (5);
 
 	boon->set_trim_start (ContentTime::from_seconds(5));
 
 	butler->seek (DCPTime(), true);
 
 	/* Wait for the butler to refill */
-	dcpomatic_sleep (5);
+	dcpomatic_sleep_seconds (5);
 
 	butler->rethrow ();
 }
diff --git a/test/test.cc b/test/test.cc
index 50770a687..c5bc417f3 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -385,7 +385,7 @@ wait_for_jobs ()
 	JobManager* jm = JobManager::instance ();
 	while (jm->work_to_do ()) {
 		while (signal_manager->ui_idle ()) {}
-		dcpomatic_sleep (1);
+		dcpomatic_sleep_seconds (1);
 	}
 
 	if (jm->errors ()) {
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 2ff09c127..c87356171 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -188,7 +188,7 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 	JobManager* jm = JobManager::instance ();
 	while (jm->work_to_do ()) {
 		while (signal_manager->ui_idle()) {}
-		dcpomatic_sleep (1);
+		dcpomatic_sleep_seconds (1);
 	}
 
 	while (signal_manager->ui_idle ()) {}