diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/checker.cc | 2 | ||||
| -rw-r--r-- | src/lib/cross.cc | 2 | ||||
| -rw-r--r-- | src/lib/cross.h | 2 | ||||
| -rw-r--r-- | src/lib/util.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_cli.cc | 4 | ||||
| -rw-r--r-- | src/tools/dcpomatic_create.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_ecinema.cc | 2 | ||||
| -rw-r--r-- | src/wx/content_view.cc | 2 | ||||
| -rw-r--r-- | src/wx/wx_util.cc | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/checker.cc b/src/lib/checker.cc index 13d9aacee..2d15dd3f1 100644 --- 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 a7fb298cb..1b83bad7c 100644 --- 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 2e8b8e429..4067631bc 100644 --- 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 234c22246..bbb444367 100644 --- 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 d207953ce..e4d2f5c82 100644 --- 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 ca6c79cb8..6a243e126 100644 --- 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 f1df658c3..87626283c 100644 --- 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 96b633fdf..152194c48 100644 --- 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 d4ef39cb9..1cdfbc00f 100644 --- 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 045712bcb..28f79431a 100644 --- 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()) { |
