projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename UISignaller -> SignalManager.
[dcpomatic.git]
/
test
/
test.cc
diff --git
a/test/test.cc
b/test/test.cc
index 9201e5b4cfceb7beaa205ba8015ba660298e882d..32ad6ca70ae9265ca3463c00e21edcdb96fb7dc3 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-29,7
+29,7
@@
#include <dcp/dcp.h>
#include "lib/config.h"
#include "lib/util.h"
#include <dcp/dcp.h>
#include "lib/config.h"
#include "lib/util.h"
-#include "lib/
ui_signall
er.h"
+#include "lib/
signal_manag
er.h"
#include "lib/film.h"
#include "lib/job_manager.h"
#include "lib/job.h"
#include "lib/film.h"
#include "lib/job_manager.h"
#include "lib/job.h"
@@
-51,7
+51,7
@@
using boost::scoped_array;
boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
-class Test
UISignaller : public UISignall
er
+class Test
SignalManager : public SignalManag
er
{
public:
/* No wakes in tests: we call ui_idle ourselves */
{
public:
/* No wakes in tests: we call ui_idle ourselves */
@@
-77,7
+77,7
@@
struct TestConfig
ServerFinder::instance()->disable ();
ServerFinder::instance()->disable ();
-
ui_signaller = new TestUISignall
er ();
+
signal_manager = new TestSignalManag
er ();
}
~TestConfig ()
}
~TestConfig ()
@@
-285,7
+285,7
@@
wait_for_jobs ()
{
JobManager* jm = JobManager::instance ();
while (jm->work_to_do ()) {
{
JobManager* jm = JobManager::instance ();
while (jm->work_to_do ()) {
-
ui_signall
er->ui_idle ();
+
signal_manag
er->ui_idle ();
}
if (jm->errors ()) {
int N = 0;
}
if (jm->errors ()) {
int N = 0;
@@
-305,7
+305,7
@@
wait_for_jobs ()
}
}
}
}
-
ui_signall
er->ui_idle ();
+
signal_manag
er->ui_idle ();
/* Discard all jobs so we lose any we just reported an error in */
JobManager::drop ();
/* Discard all jobs so we lose any we just reported an error in */
JobManager::drop ();