BOOST_AUTO_TEST_CASE (fourk_test)
{
shared_ptr<Film> film = new_test_film ("4k_test");
- dcpomatic_log = film->log ();
+ LogSwitcher ls (film->log());
film->set_name ("4k_test");
shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
film->set_resolution (RESOLUTION_4K);
#include "lib/encode_server_description.h"
#include "lib/file_log.h"
#include "lib/dcpomatic_log.h"
+#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/thread.hpp>
p += sub_image->stride()[0];
}
- dcpomatic_log.reset (new FileLog("build/test/client_server_test_rgb.log"));
+ LogSwitcher ls (shared_ptr<Log>(new FileLog("build/test/client_server_test_rgb.log")));
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
p += sub_image->stride()[0];
}
- dcpomatic_log.reset (new FileLog("build/test/client_server_test_yuv.log"));
+ LogSwitcher ls (shared_ptr<Log>(new FileLog("build/test/client_server_test_yuv.log")));
shared_ptr<PlayerVideo> pvf (
new PlayerVideo (
}
}
- dcpomatic_log.reset (new FileLog("build/test/client_server_test_j2k.log"));
+ LogSwitcher ls (shared_ptr<Log>(new FileLog("build/test/client_server_test_j2k.log")));
shared_ptr<PlayerVideo> raw_pvf (
new PlayerVideo (
BOOST_AUTO_TEST_CASE (optimise_stills_test1)
{
shared_ptr<Film> film = new_test_film ("optimise_stills_test1");
- dcpomatic_log = film->log ();
+ LogSwitcher ls (film->log());
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
BOOST_AUTO_TEST_CASE (optimise_stills_test2)
{
shared_ptr<Film> film = new_test_film ("optimise_stills_test2");
- dcpomatic_log = film->log ();
+ LogSwitcher ls (film->log());
film->set_container (Ratio::from_id ("185"));
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
film->set_name ("frobozz");
Config::instance()->set_default_j2k_bandwidth (100000000);
Config::instance()->set_default_interop (false);
Config::instance()->set_default_still_length (10);
- Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
+ Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DEBUG_THREED | LogEntry::TYPE_DEBUG_ENCODE);
Config::instance()->set_automatic_audio_analysis (false);
}
fclose (r);
free (buffer);
}
+
+
+LogSwitcher::LogSwitcher (shared_ptr<Log> log)
+ : _old (dcpomatic_log)
+{
+ dcpomatic_log = log;
+}
+
+
+LogSwitcher::~LogSwitcher ()
+{
+ dcpomatic_log = _old;
+}
+
#include <Magick++.h>
#include <boost/filesystem.hpp>
+#include <boost/shared_ptr.hpp>
class Film;
class Image;
+class Log;
class TestPaths
void check_one_frame (boost::filesystem::path dcp, int64_t index, boost::filesystem::path ref);
extern boost::filesystem::path subtitle_file (boost::shared_ptr<Film> film);
extern void make_random_file (boost::filesystem::path path, size_t size);
+
+class LogSwitcher
+{
+public:
+ LogSwitcher (boost::shared_ptr<Log> log);
+ ~LogSwitcher ();
+
+private:
+ boost::shared_ptr<Log> _old;
+};
+