Put Time types in dcpomatic namespace.

25 files changed, 25 insertions, 1 deletions

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index a2da8d690..5d65ab693 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -42,6 +42,7 @@
 
 using std::vector;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 static float
 random_float ()
diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc
index 1484213e7..4a1f689dd 100644
--- a/test/audio_merger_test.cc
+++ b/test/audio_merger_test.cc
@@ -36,6 +36,7 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::bind;
+using namespace dcpomatic;
 
 static shared_ptr<const AudioBuffers> last_audio;
 
diff --git a/test/audio_ring_buffers_test.cc b/test/audio_ring_buffers_test.cc
index 9ebd64ded..782451a7d 100644
--- a/test/audio_ring_buffers_test.cc
+++ b/test/audio_ring_buffers_test.cc
@@ -24,6 +24,7 @@
 
 using std::cout;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 #define CANARY 9999
 
diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index 91edcad9f..8bd2c46b8 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -51,6 +51,7 @@ using std::cout;
 using std::map;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 /** Build a small DCP with no picture and a single subtitle overlaid onto it from a SubRip file */
 BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
diff --git a/test/butler_test.cc b/test/butler_test.cc
index 93e141c42..cc2841268 100644
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -29,6 +29,7 @@
 #include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (butler_test1)
 {
diff --git a/test/content_test.cc b/test/content_test.cc
index 55e34ac5f..2f8963f5b 100644
--- a/test/content_test.cc
+++ b/test/content_test.cc
@@ -32,6 +32,7 @@
 #include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 /** There has been garbled audio with this piece of content */
 BOOST_AUTO_TEST_CASE (content_test1)
diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 04a0eabe3..9fef1801b 100644
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -28,6 +28,7 @@
 using std::pair;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 /** Simulate the work that the player does, for profiling */
 BOOST_AUTO_TEST_CASE (dcp_playback_test)
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 89eb11a60..150cd8539 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -42,6 +42,7 @@ using std::cout;
 using std::list;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 optional<ContentStringText> stored;
 
diff --git a/test/dcpomatic_time_test.cc b/test/dcpomatic_time_test.cc
index 1637738ad..5b58c369b 100644
--- a/test/dcpomatic_time_test.cc
+++ b/test/dcpomatic_time_test.cc
@@ -31,6 +31,7 @@
 
 using std::list;
 using std::cout;
+using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (dcpomatic_time_test)
 {
diff --git a/test/empty_test.cc b/test/empty_test.cc
index 86ce2075c..428d0f9bb 100644
--- a/test/empty_test.cc
+++ b/test/empty_test.cc
@@ -30,6 +30,7 @@
 #include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 bool
 has_video (shared_ptr<Piece> piece)
diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index c69c74c68..3e825e443 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -44,6 +44,7 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 static optional<ContentVideo> stored;
 static bool
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 892bc9e4c..f99229c65 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -43,6 +43,7 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 using boost::bind;
+using namespace dcpomatic;
 
 static DCPTime next;
 static DCPTime frame;
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 1e001f0c8..dd10bd4a1 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -36,6 +36,7 @@
 
 using std::string;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 static void
 ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat format)
diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index d4614e226..b6b2bbf06 100644
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -31,6 +31,7 @@
 #include "test.h"
 
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test)
 {
diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index 18f89713e..f4bf6df35 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -32,6 +32,7 @@
 #include "test.h"
 
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 {
diff --git a/test/player_test.cc b/test/player_test.cc
index 1736bfc7e..7b65783c6 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -48,6 +48,7 @@ using std::pair;
 using boost::shared_ptr;
 using boost::bind;
 using boost::optional;
+using namespace dcpomatic;
 
 static shared_ptr<AudioBuffers> accumulated;
 
diff --git a/test/reels_test.cc b/test/reels_test.cc
index eea9ebfbe..15e386d59 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -39,6 +39,7 @@
 using std::list;
 using std::cout;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 /** Test Film::reels() */
 BOOST_AUTO_TEST_CASE (reels_test1)
diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 070cb235d..b15f4691b 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE (silence_padding_test2)
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->set_video_frame_rate (24);
-	content->set_trim_start (ContentTime(4003));
+	content->set_trim_start (dcpomatic::ContentTime(4003));
 
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs());
diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 0c1f07161..eefdb4122 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -37,6 +37,7 @@
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 /** Make a very short DCP with a single subtitle from .srt with no specified fonts */
 BOOST_AUTO_TEST_CASE (srt_subtitle_test)
diff --git a/test/subtitle_trim_test.cc b/test/subtitle_trim_test.cc
index 2380449d8..966fc66b6 100644
--- a/test/subtitle_trim_test.cc
+++ b/test/subtitle_trim_test.cc
@@ -24,6 +24,7 @@
 #include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 /** Check for no crash when trimming DCP subtitles (#1275) */
 BOOST_AUTO_TEST_CASE (subtitle_trim_test1)
diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index e995a4ed0..968138f96 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -34,6 +34,7 @@
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 static string const xml = "<Content>"
 	"<Type>FFmpeg</Type>"
diff --git a/test/torture_test.cc b/test/torture_test.cc
index 5525eb081..10d343268 100644
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -45,6 +45,7 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 /** Test start/end trim and positioning of some audio content */
 BOOST_AUTO_TEST_CASE (torture_test1)
diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc
index 5643310c6..545f081ba 100644
--- a/test/upmixer_a_test.cc
+++ b/test/upmixer_a_test.cc
@@ -35,6 +35,7 @@
 #include "test.h"
 
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 static SNDFILE* L;
 static SNDFILE* R;
diff --git a/test/util_test.cc b/test/util_test.cc
index 1e13efa82..709bb0827 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -32,6 +32,7 @@
 using std::string;
 using std::vector;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (digest_head_tail_test)
 {
diff --git a/test/vf_test.cc b/test/vf_test.cc
index 6862a1204..307d26ea6 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -45,6 +45,7 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 /** Test the logic which decides whether a DCP can be referenced or not */
 BOOST_AUTO_TEST_CASE (vf_test1)