Rename dcpomatic_sleep -> dcpomatic_sleep_seconds.

diff --git a/src/lib/checker.cc b/src/lib/checker.cc
index 13d9aacee314c6278bdb7405a8323d44ce873259..2d15dd3f1e1adae3fed945674cfff9676498d3ba 100644 (file)
--- a/src/lib/checker.cc
+++ b/src/lib/checker.cc
@@ -81,7 +81,7 @@ Checker::thread ()
                }
 
                lm.unlock ();
-               dcpomatic_sleep (_period);
+               dcpomatic_sleep_seconds (_period);
        }
 }
 

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index a7fb298cb0b6084b88435f85eaae67d06adc5966..1b83bad7c6dca9a02cf9696eccf8c8834f0fa8b7 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -65,7 +65,7 @@ using boost::shared_ptr;
 
 /** @param s Number of seconds to sleep for */
 void
-dcpomatic_sleep (int s)
+dcpomatic_sleep_seconds (int s)
 {
 #ifdef DCPOMATIC_POSIX
        sleep (s);

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 2e8b8e429bcc64670cd02741ea63fec882b44eec..4067631bcf134a2200ae04b961ae4d609b7e1cba 100644 (file)
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -37,7 +37,7 @@
 class Log;
 struct AVIOContext;
 
-void dcpomatic_sleep (int);
+void dcpomatic_sleep_seconds (int);
 extern std::string cpu_info ();
 extern void run_ffprobe (boost::filesystem::path, boost::filesystem::path);
 extern std::list<std::pair<std::string, std::string> > mount_info ();

diff --git a/src/lib/util.cc b/src/lib/util.cc
index cd2d5a3685d506d9d84a09a557f4e9e512f39499..fd7a95684ed1006fe46ae5108f9f5aa45be0dd75 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -967,7 +967,7 @@ show_jobs_on_console (bool progress)
        bool error = false;
        while (true) {
 
-               dcpomatic_sleep (5);
+               dcpomatic_sleep_seconds (5);
 
                list<shared_ptr<Job> > jobs = JobManager::instance()->get();
 

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index d207953ce5824101982e329e004ba37f8bd9eefb..e4d2f5c824f033c7fa31d88236bfd37a09870e74 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -811,7 +811,7 @@ private:
                                start (wx_to_std (wxStandardPaths::Get().GetExecutablePath()));
                        }
 
-                       dcpomatic_sleep (1);
+                       dcpomatic_sleep_seconds (1);
                }
 
                return true;

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index ca6c79cb8b9b4f96b63d6e93122714df653e5ad8..6a243e126e6a9140cf693a70c5067683758cca0a 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -176,7 +176,7 @@ list_servers ()
                        }
                }
 
-               dcpomatic_sleep (1);
+               dcpomatic_sleep_seconds (1);
 
                for (int i = 0; i < N; ++i) {
                        cout << "\033[1A\033[2K";
@@ -360,7 +360,7 @@ main (int argc, char* argv[])
 
        if (keep_going) {
                while (true) {
-                       dcpomatic_sleep (3600);
+                       dcpomatic_sleep_seconds (3600);
                }
        }
 

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index f1df658c3626b6cf4406b755a5786dafc4a5572b..87626283cc0b2ed135c12c1e2ba3ca3de66b209e 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -124,7 +124,7 @@ main (int argc, char* argv[])
                        }
 
                        while (jm->work_to_do ()) {
-                               dcpomatic_sleep (1);
+                               dcpomatic_sleep_seconds (1);
                        }
 
                        while (signal_manager->ui_idle() > 0) {}

diff --git a/src/tools/dcpomatic_ecinema.cc b/src/tools/dcpomatic_ecinema.cc
index 96b633fdfffeed6470643082338c9ac1fcbf356f..152194c482f415560320a4feaae9fb0816770431 100644 (file)
--- a/src/tools/dcpomatic_ecinema.cc
+++ b/src/tools/dcpomatic_ecinema.cc
@@ -290,7 +290,7 @@ convert_dcp (
        JobManager* jm = JobManager::instance ();
        while (jm->work_to_do ()) {
                while (signal_manager->ui_idle ()) {}
-               dcpomatic_sleep (1);
+               dcpomatic_sleep_seconds (1);
        }
        DCPOMATIC_ASSERT (!jm->errors());
 

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index d4ef39cb96210ebb9000823e9c4f42adb1a2767a..1cdfbc00f8f4fb49d95a9594330404195d34695d 100644 (file)
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -109,7 +109,7 @@ ContentView::update ()
                        }
                        return;
                }
-               dcpomatic_sleep (1);
+               dcpomatic_sleep_seconds (1);
        }
 
        /* Add content from successful jobs and report errors */

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 045712bcb2f2fdc2246189ca414663e134b31fbe..28f79431a5147171626e1b45b90d51630b4420c9 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -517,7 +517,7 @@ display_progress (wxString title, wxString task)
        bool ok = true;
 
        while (jm->work_to_do()) {
-               dcpomatic_sleep (1);
+               dcpomatic_sleep_seconds (1);
                if (!progress.Pulse()) {
                        /* user pressed cancel */
                        BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 29f901d34b96951bbe94441516909303b2662f43..df854f9f3efec8bbb364e0ecbec2aedcb2fe7037 100644 (file)
--- 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 c6145d861908fcb60c63a9e4930e8a011b00f998..ed988a65b44b15fdfedd2164267dcdb7da916cde 100644 (file)
--- 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 fa48904703b8ced194cc34a11c42f70039b66694..d93b4a082743ec10a22a8b71b8680df77ec67325 100644 (file)
--- 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 af40002deb06191af6cae40311395f68498de9a3..a7e944cd4b0fbe57e62a414d7270d6eafc5c5068 100644 (file)
--- 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 c87f4e70b736d9c4e8d561fd8b9c1d0ca22a4fbc..318ac479952c8cc3c0c391f2c1516fbb8307b605 100644 (file)
--- 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 2ff09c1275296f0d830e0e096d6797c52024029a..c8735617184d52fb116845190f80ce31b83743b9 100644 (file)
--- 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 ()) {}