projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporter.
[dcpomatic.git]
/
test
/
job_test.cc
diff --git
a/test/job_test.cc
b/test/job_test.cc
index c1b66d4e01f38f36127c49087c79473cbdb20739..8728b7312137bbbdde15dcb56c2879303c0f93db 100644
(file)
--- a/
test/job_test.cc
+++ b/
test/job_test.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-32,8
+33,8
@@
using boost::shared_ptr;
class TestJob : public Job
{
public:
class TestJob : public Job
{
public:
- TestJob (shared_ptr<Film> f)
- : Job (f)
+ TestJob (shared_ptr<Film> f
ilm
)
+ : Job (f
ilm
)
{
}
{
}
@@
-66,10
+67,10
@@
public:
BOOST_AUTO_TEST_CASE (job_manager_test)
{
BOOST_AUTO_TEST_CASE (job_manager_test)
{
- shared_ptr<Film> f;
+ shared_ptr<Film> f
ilm
;
/* Single job */
/* Single job */
- shared_ptr<TestJob> a (new TestJob (f));
+ shared_ptr<TestJob> a (new TestJob (f
ilm
));
JobManager::instance()->add (a);
dcpomatic_sleep (1);
JobManager::instance()->add (a);
dcpomatic_sleep (1);