More logging and make it go to the right place.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index b6e017acdb3a4a4a5fefbb16db61500f2a945393..3ec78e68b3c16377bcb821a90399473909c7671f 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -87,7 +87,7 @@ setup_test_config ()
        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);
 }
 
@@ -531,3 +531,17 @@ make_random_file (boost::filesystem::path path, size_t size)
        fclose (r);
        free (buffer);
 }
+
+
+LogSwitcher::LogSwitcher (shared_ptr<Log> log)
+       : _old (dcpomatic_log)
+{
+       dcpomatic_log = log;
+}
+
+
+LogSwitcher::~LogSwitcher ()
+{
+       dcpomatic_log = _old;
+}
+