/*
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.
- 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
- 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/>.
*/
#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"
Config::instance()->set_default_j2k_bandwidth (100000000);
Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
- ServerFinder::instance()->disable ();
+ EncodeServerFinder::instance()->stop ();
signal_manager = new TestSignalManager ();
}
boost::filesystem::remove_all (p);
}
- shared_ptr<Film> film = shared_ptr<Film> (new Film (p.string()));
+ shared_ptr<Film> film = shared_ptr<Film> (new Film (p));
film->write_metadata ();
return film;
}
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] << ")"
);
}
uint8_t* ref_buffer = new uint8_t[buffer_size];
uint8_t* check_buffer = new uint8_t[buffer_size];
- SafeStringStream error;
- error << "File " << check.string() << " differs from reference " << ref.string();
+ string error = "File " + check.string() + " differs from reference " + ref.string();
while (N) {
uintmax_t this_time = min (uintmax_t (buffer_size), N);
r = fread (check_buffer, 1, this_time, check_file);
BOOST_CHECK_EQUAL (r, this_time);
- BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error.str ());
+ BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error);
if (memcmp (ref_buffer, check_buffer, this_time)) {
break;
}
check_xml (ref_root, test_root, ignore);
}
-void
+bool
wait_for_jobs ()
{
JobManager* jm = JobManager::instance ();
if (jm->errors ()) {
JobManager::drop ();
+ return true;
}
+
+ return false;
}
void