projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
test
/
test.cc
diff --git
a/test/test.cc
b/test/test.cc
index 366bc9302937330d12d0a3d0fd27ef250cfc3a7b..c7a9e95bfd6f8d6a78eda143c4020f4d4bf458ce 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2015 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/>.
*/
*/
@@
-28,7
+29,7
@@
#include "lib/job_manager.h"
#include "lib/job.h"
#include "lib/cross.h"
#include "lib/job_manager.h"
#include "lib/job.h"
#include "lib/cross.h"
-#include "lib/server_finder.h"
+#include "lib/
encode_
server_finder.h"
#include "lib/image.h"
#include "lib/ratio.h"
#include "lib/log_entry.h"
#include "lib/image.h"
#include "lib/ratio.h"
#include "lib/log_entry.h"
@@
-80,7
+81,7
@@
struct TestConfig
Config::instance()->set_default_j2k_bandwidth (100000000);
Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
Config::instance()->set_default_j2k_bandwidth (100000000);
Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
- ServerFinder::instance()->disable ();
+
Encode
ServerFinder::instance()->disable ();
signal_manager = new TestSignalManager ();
}
signal_manager = new TestSignalManager ();
}
@@
-151,6
+152,7
@@
check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
BOOST_REQUIRE_MESSAGE (
abs (ref_buffer[i] - check_buffer[i]) <= 65536,
ref << " differs from " << check << " at " << (ref_info.frames - N + i) << " of " << ref_info.frames
BOOST_REQUIRE_MESSAGE (
abs (ref_buffer[i] - check_buffer[i]) <= 65536,
ref << " differs from " << check << " at " << (ref_info.frames - N + i) << " of " << ref_info.frames
+ << "(" << ref_buffer[i] << " vs " << check_buffer[i] << ")"
);
}
);
}