Put Time types in dcpomatic namespace.

diff --git a/src/lib/active_text.cc b/src/lib/active_text.cc
index 2988c04a397e66aebb73d8198445e1986f9513f1..3a7e1a27ebeff7a43e63877e65416fc82b102bb0 100644 (file)
--- a/src/lib/active_text.cc
+++ b/src/lib/active_text.cc
@@ -29,6 +29,7 @@ using std::make_pair;
 using boost::weak_ptr;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 /** Get the open captions that should be burnt into a given period.
  *  @param period Period of interest.

diff --git a/src/lib/active_text.h b/src/lib/active_text.h
index ff4a1bd2f75cf07cc39bb621193171f7ceb992c7..90b6b533bfe761d6bc205d6bfc93effe202ee259 100644 (file)
--- a/src/lib/active_text.h
+++ b/src/lib/active_text.h
@@ -37,11 +37,11 @@ class TextContent;
 class ActiveText : public boost::noncopyable
 {
 public:
-       std::list<PlayerText> get_burnt (DCPTimePeriod period, bool always_burn_captions) const;
-       void clear_before (DCPTime time);
+       std::list<PlayerText> get_burnt (dcpomatic::DCPTimePeriod period, bool always_burn_captions) const;
+       void clear_before (dcpomatic::DCPTime time);
        void clear ();
-       void add_from (boost::weak_ptr<const TextContent> content, PlayerText ps, DCPTime from);
-       std::pair<PlayerText, DCPTime> add_to (boost::weak_ptr<const TextContent> content, DCPTime to);
+       void add_from (boost::weak_ptr<const TextContent> content, PlayerText ps, dcpomatic::DCPTime from);
+       std::pair<PlayerText, dcpomatic::DCPTime> add_to (boost::weak_ptr<const TextContent> content, dcpomatic::DCPTime to);
        bool have (boost::weak_ptr<const TextContent> content) const;
 
 private:
@@ -50,14 +50,14 @@ private:
        public:
                Period () {}
 
-               Period (PlayerText s, DCPTime f)
+               Period (PlayerText s, dcpomatic::DCPTime f)
                        : subs (s)
                        , from (f)
                {}
 
                PlayerText subs;
-               DCPTime from;
-               boost::optional<DCPTime> to;
+               dcpomatic::DCPTime from;
+               boost::optional<dcpomatic::DCPTime> to;
        };
 
        typedef std::map<boost::weak_ptr<const TextContent>, std::list<Period> > Map;

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index e4a100c4a3fd92265635448538ec4b2f3f894551..9d0882b3ad22b3061f243d53ae78f91146042d3d 100644 (file)
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -47,6 +47,7 @@ using std::min;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 int const AnalyseAudioJob::_num_points = 1024;
 

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index b88d6c2bf4e97ba7bd3acbdaf51583f46e284014..5d6c091bcfbf3b835c68bdd771f3247c2bca6140 100644 (file)
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -56,12 +56,12 @@ public:
        }
 
 private:
-       void analyse (boost::shared_ptr<const AudioBuffers>, DCPTime time);
+       void analyse (boost::shared_ptr<const AudioBuffers>, dcpomatic::DCPTime time);
 
        boost::shared_ptr<const Playlist> _playlist;
        /** playlist's audio analysis path when the job was created */
        boost::filesystem::path _path;
-       DCPTime _start;
+       dcpomatic::DCPTime _start;
        bool _from_zero;
 
        int64_t _done;

diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc
index 5b97edcfd185fa996ba0a9340326781c37743da7..fa27f600b4df195e2f624e62d9984fe221f804f7 100644 (file)
--- a/src/lib/atmos_mxf_content.cc
+++ b/src/lib/atmos_mxf_content.cc
@@ -32,6 +32,7 @@
 using std::list;
 using std::string;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 AtmosMXFContent::AtmosMXFContent (boost::filesystem::path path)
        : Content (path)

diff --git a/src/lib/atmos_mxf_content.h b/src/lib/atmos_mxf_content.h
index 05f36c21c40683c191012a67d5c6d2c99189ba63..06e9e747d9cb61759eba3268d6dd32d1803f8555 100644 (file)
--- a/src/lib/atmos_mxf_content.h
+++ b/src/lib/atmos_mxf_content.h
@@ -37,8 +37,8 @@ public:
        void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job> job);
        std::string summary () const;
        void as_xml (xmlpp::Node* node, bool with_path) const;
-       DCPTime full_length (boost::shared_ptr<const Film> film) const;
-       DCPTime approximate_length () const;
+       dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime approximate_length () const;
 
        static bool valid_mxf (boost::filesystem::path path);
 

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 78e5741e59f5b2cc365b6b9054186016b34fa429..13917cb5f6d693f3987b0c8adb85526a6426747c 100644 (file)
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -46,6 +46,7 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 int const AudioAnalysis::_current_state_version = 3;
 

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index e5ee24d49918a52e19bbcaaa6ee9c59acc6bdaa8..3684db96abdd97bfd48fa3693c3e2b46abcc5ecf 100644 (file)
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -43,13 +43,13 @@ public:
        void add_point (int c, AudioPoint const & p);
 
        struct PeakTime {
-               PeakTime (float p, DCPTime t)
+               PeakTime (float p, dcpomatic::DCPTime t)
                        : peak (p)
                        , time (t)
                {}
 
                float peak;
-               DCPTime time;
+               dcpomatic::DCPTime time;
        };
 
        void set_sample_peak (std::vector<PeakTime> peak) {

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 170b9299f5578d312e514d7c34fd613bd916fd02..014221f2e892afc95ef5f31d57aa3f4e44bea997 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -43,6 +43,7 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 /** Something stream-related has changed */
 int const AudioContentProperty::STREAMS = 200;

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 98e16a45773f3c0ca0debad384f0c2d6b9e0ef20..504c2aecfffde3b2719eff1789babcd3639a010a 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -82,8 +82,8 @@ public:
 
        void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
-       void modify_position (boost::shared_ptr<const Film> film, DCPTime& pos) const;
-       void modify_trim_start (ContentTime& pos) const;
+       void modify_position (boost::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
+       void modify_trim_start (dcpomatic::ContentTime& pos) const;
 
        static boost::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);
 

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 440510ce562c9dbb13304a75f5f3a24e6f471eb2..e0fb20b7eec172dbff61ff1e68bae2f8196d4310 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -35,6 +35,7 @@ using std::map;
 using std::pair;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, bool fast)
        : DecoderPart (parent)

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 50e361e8f19f80cb181bc8a55d3e80f1aa73da8c..32d71c0671b849d57c5a4bfa921110fca57526d0 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -47,12 +47,12 @@ class AudioDecoder : public boost::enable_shared_from_this<AudioDecoder>, public
 public:
        AudioDecoder (Decoder* parent, boost::shared_ptr<const AudioContent> content, bool fast);
 
-       ContentTime position (boost::shared_ptr<const Film> film) const;
-       void emit (boost::shared_ptr<const Film> film, AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, ContentTime);
+       dcpomatic::ContentTime position (boost::shared_ptr<const Film> film) const;
+       void emit (boost::shared_ptr<const Film> film, AudioStreamPtr stream, boost::shared_ptr<const AudioBuffers>, dcpomatic::ContentTime);
        void seek ();
        void flush ();
 
-       ContentTime stream_position (boost::shared_ptr<const Film> film, AudioStreamPtr stream) const;
+       dcpomatic::ContentTime stream_position (boost::shared_ptr<const Film> film, AudioStreamPtr stream) const;
 
        /** @return Number of frames of data that were accepted */
        boost::signals2::signal<void (AudioStreamPtr, ContentAudio)> Data;

diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc
index a16c378c67309dac758c90abd27fc275ef7db769..1cc5ff0a19de156bdee0e7e6a6dd3da56e47dc49 100644 (file)
--- a/src/lib/audio_merger.cc
+++ b/src/lib/audio_merger.cc
@@ -33,6 +33,7 @@ using std::cout;
 using std::make_pair;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 AudioMerger::AudioMerger (int frame_rate)
        : _frame_rate (frame_rate)

diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index dbc0c869103b44d69b5bbe301e9134bcdb752f02..d5a6ec43ad80ecd233049a971b813f8295785e33 100644 (file)
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -33,12 +33,12 @@ class AudioMerger
 public:
        explicit AudioMerger (int frame_rate);
 
-       std::list<std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> > pull (DCPTime time);
-       void push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time);
+       std::list<std::pair<boost::shared_ptr<AudioBuffers>, dcpomatic::DCPTime> > pull (dcpomatic::DCPTime time);
+       void push (boost::shared_ptr<const AudioBuffers> audio, dcpomatic::DCPTime time);
        void clear ();
 
 private:
-       Frame frames (DCPTime t) const;
+       Frame frames (dcpomatic::DCPTime t) const;
 
        class Buffer
        {
@@ -48,24 +48,24 @@ private:
                 *  @param t Time
                 *  @param r Frame rate.
                 */
-               Buffer (int c, int32_t f, DCPTime t, int r)
+               Buffer (int c, int32_t f, dcpomatic::DCPTime t, int r)
                        : audio (new AudioBuffers (c, f))
                        , time (t)
                        , frame_rate (r)
                {}
 
-               Buffer (boost::shared_ptr<AudioBuffers> a, DCPTime t, int r)
+               Buffer (boost::shared_ptr<AudioBuffers> a, dcpomatic::DCPTime t, int r)
                        : audio (a)
                        , time (t)
                        , frame_rate (r)
                {}
 
                boost::shared_ptr<AudioBuffers> audio;
-               DCPTime time;
+               dcpomatic::DCPTime time;
                int frame_rate;
 
-               DCPTimePeriod period () const {
-                       return DCPTimePeriod (time, time + DCPTime::from_frames (audio->frames(), frame_rate));
+               dcpomatic::DCPTimePeriod period () const {
+                       return dcpomatic::DCPTimePeriod (time, time + dcpomatic::DCPTime::from_frames (audio->frames(), frame_rate));
                }
        };
 

diff --git a/src/lib/audio_ring_buffers.cc b/src/lib/audio_ring_buffers.cc
index d1375cb27e2eeeb80d3a2935a06a10cb3aee9b87..cd7f4f597fbfaf8f35ebcd5e998f3e20edccb72d 100644 (file)
--- a/src/lib/audio_ring_buffers.cc
+++ b/src/lib/audio_ring_buffers.cc
@@ -31,6 +31,7 @@ using std::pair;
 using std::list;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 AudioRingBuffers::AudioRingBuffers ()
        : _used_in_head (0)

diff --git a/src/lib/audio_ring_buffers.h b/src/lib/audio_ring_buffers.h
index 8d830ecf78046f77e39012f1877f0bf0391968e6..bfaad5ec97074d0077ca9376bb636d4c4bdf55d0 100644 (file)
--- a/src/lib/audio_ring_buffers.h
+++ b/src/lib/audio_ring_buffers.h
@@ -33,16 +33,16 @@ class AudioRingBuffers : public boost::noncopyable
 public:
        AudioRingBuffers ();
 
-       void put (boost::shared_ptr<const AudioBuffers> data, DCPTime time, int frame_rate);
-       boost::optional<DCPTime> get (float* out, int channels, int frames);
-       boost::optional<DCPTime> peek () const;
+       void put (boost::shared_ptr<const AudioBuffers> data, dcpomatic::DCPTime time, int frame_rate);
+       boost::optional<dcpomatic::DCPTime> get (float* out, int channels, int frames);
+       boost::optional<dcpomatic::DCPTime> peek () const;
 
        void clear ();
        Frame size () const;
 
 private:
        mutable boost::mutex _mutex;
-       std::list<std::pair<boost::shared_ptr<const AudioBuffers>, DCPTime> > _buffers;
+       std::list<std::pair<boost::shared_ptr<const AudioBuffers>, dcpomatic::DCPTime> > _buffers;
        int _used_in_head;
 };
 

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index fe331fc79dca1609f9ba5ddacd23a20595bf0f94..0218c1fb30d198b494d05b466f778de8509324bf 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -38,6 +38,7 @@ using boost::shared_ptr;
 using boost::bind;
 using boost::optional;
 using boost::function;
+using namespace dcpomatic;
 
 /** Minimum video readahead in frames */
 #define MINIMUM_VIDEO_READAHEAD 10

diff --git a/src/lib/butler.h b/src/lib/butler.h
index 8c4d30efefbad224ce47731c353791511296160d..f1922d3481efedbd418c74e731ae2328d54cee84 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -47,15 +47,15 @@ public:
 
        ~Butler ();
 
-       void seek (DCPTime position, bool accurate);
+       void seek (dcpomatic::DCPTime position, bool accurate);
 
        enum Error {
                NONE,
                AGAIN
        };
 
-       std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get_video (Error* e = 0);
-       boost::optional<DCPTime> get_audio (float* out, Frame frames);
+       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get_video (Error* e = 0);
+       boost::optional<dcpomatic::DCPTime> get_audio (float* out, Frame frames);
        boost::optional<TextRingBuffers::Data> get_closed_caption ();
 
        void disable_audio ();
@@ -64,13 +64,13 @@ public:
 
 private:
        void thread ();
-       void video (boost::shared_ptr<PlayerVideo> video, DCPTime time);
-       void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time, int frame_rate);
-       void text (PlayerText pt, TextType type, boost::optional<DCPTextTrack> track, DCPTimePeriod period);
+       void video (boost::shared_ptr<PlayerVideo> video, dcpomatic::DCPTime time);
+       void audio (boost::shared_ptr<AudioBuffers> audio, dcpomatic::DCPTime time, int frame_rate);
+       void text (PlayerText pt, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
        bool should_run () const;
        void prepare (boost::weak_ptr<PlayerVideo> video);
        void player_change (ChangeType type, bool frequent);
-       void seek_unlocked (DCPTime position, bool accurate);
+       void seek_unlocked (dcpomatic::DCPTime position, bool accurate);
 
        boost::shared_ptr<Player> _player;
        boost::thread* _thread;
@@ -93,7 +93,7 @@ private:
        boost::mutex _mutex;
        boost::condition _summon;
        boost::condition _arrived;
-       boost::optional<DCPTime> _pending_seek_position;
+       boost::optional<dcpomatic::DCPTime> _pending_seek_position;
        bool _pending_seek_accurate;
        int _suspended;
        bool _finished;
@@ -112,7 +112,7 @@ private:
        /** If we are waiting to be refilled following a seek, this is the time we were
            seeking to.
        */
-       boost::optional<DCPTime> _awaiting;
+       boost::optional<dcpomatic::DCPTime> _awaiting;
 
        boost::signals2::scoped_connection _player_video_connection;
        boost::signals2::scoped_connection _player_audio_connection;

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 9280d2e612be094566c183ea6a0340b3179e1f5f..a722cd15dae37fde8c2a17554753243d5651aa65 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -52,6 +52,7 @@ using boost::shared_ptr;
 using boost::optional;
 using dcp::raw_convert;
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 int const ContentProperty::PATH = 400;
 int const ContentProperty::POSITION = 401;

diff --git a/src/lib/content.h b/src/lib/content.h
index 4c1d55765b6d07484e57455926ab6885b661580c..a2d78aa68539423cca457abb2005f558e6ca68fa 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -65,7 +65,7 @@ class Content : public boost::enable_shared_from_this<Content>, public Signaller
 {
 public:
        explicit Content ();
-       Content (DCPTime);
+       Content (dcpomatic::DCPTime);
        Content (boost::filesystem::path);
        Content (cxml::ConstNodePtr);
        Content (std::vector<boost::shared_ptr<Content> >);
@@ -90,13 +90,13 @@ public:
        virtual std::string technical_summary () const;
 
        virtual void as_xml (xmlpp::Node *, bool with_paths) const;
-       virtual DCPTime full_length (boost::shared_ptr<const Film>) const = 0;
-       virtual DCPTime approximate_length () const = 0;
+       virtual dcpomatic::DCPTime full_length (boost::shared_ptr<const Film>) const = 0;
+       virtual dcpomatic::DCPTime approximate_length () const = 0;
        virtual std::string identifier () const;
        /** @return points at which to split this content when
         *  REELTYPE_BY_VIDEO_CONTENT is in use.
         */
-       virtual std::list<DCPTime> reel_split_points (boost::shared_ptr<const Film>) const;
+       virtual std::list<dcpomatic::DCPTime> reel_split_points (boost::shared_ptr<const Film>) const;
 
        boost::shared_ptr<Content> clone () const;
 
@@ -135,36 +135,36 @@ public:
                return _digest;
        }
 
-       void set_position (boost::shared_ptr<const Film> film, DCPTime, bool force_emit = false);
+       void set_position (boost::shared_ptr<const Film> film, dcpomatic::DCPTime, bool force_emit = false);
 
-       /** DCPTime that this content starts; i.e. the time that the first
+       /** dcpomatic::DCPTime that this content starts; i.e. the time that the first
         *  bit of the content (trimmed or not) will happen.
         */
-       DCPTime position () const {
+       dcpomatic::DCPTime position () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _position;
        }
 
-       void set_trim_start (ContentTime);
+       void set_trim_start (dcpomatic::ContentTime);
 
-       ContentTime trim_start () const {
+       dcpomatic::ContentTime trim_start () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _trim_start;
        }
 
-       void set_trim_end (ContentTime);
+       void set_trim_end (dcpomatic::ContentTime);
 
-       ContentTime trim_end () const {
+       dcpomatic::ContentTime trim_end () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _trim_end;
        }
 
        /** @return Time immediately after the last thing in this content */
-       DCPTime end (boost::shared_ptr<const Film> film) const {
+       dcpomatic::DCPTime end (boost::shared_ptr<const Film> film) const {
                return position() + length_after_trim(film);
        }
 
-       DCPTime length_after_trim (boost::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime length_after_trim (boost::shared_ptr<const Film> film) const;
 
        boost::optional<double> video_frame_rate () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -219,9 +219,9 @@ private:
        std::vector<std::time_t> _last_write_times;
 
        std::string _digest;
-       DCPTime _position;
-       ContentTime _trim_start;
-       ContentTime _trim_end;
+       dcpomatic::DCPTime _position;
+       dcpomatic::ContentTime _trim_start;
+       dcpomatic::ContentTime _trim_end;
        /** The video frame rate that this content is or was prepared to be used with,
         *  or empty if the effective rate of this content should be dictated by something
         *  else (either some video happening at the same time, or the rate of the DCP).

diff --git a/src/lib/content_text.h b/src/lib/content_text.h
index 2d8910577926c38bd259b1e10a7a7c82c90f356d..0c0df1ee63bdce15f3c5d9905af302c31a10c43d 100644 (file)
--- a/src/lib/content_text.h
+++ b/src/lib/content_text.h
@@ -33,22 +33,22 @@ class Image;
 class ContentText
 {
 public:
-       explicit ContentText (ContentTime f)
+       explicit ContentText (dcpomatic::ContentTime f)
                : _from (f)
        {}
 
-       ContentTime from () const {
+       dcpomatic::ContentTime from () const {
                return _from;
        }
 
 private:
-       ContentTime _from;
+       dcpomatic::ContentTime _from;
 };
 
 class ContentBitmapText : public ContentText
 {
 public:
-       ContentBitmapText (ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
+       ContentBitmapText (dcpomatic::ContentTime f, boost::shared_ptr<Image> im, dcpomatic::Rect<double> r)
                : ContentText (f)
                , sub (im, r)
        {}
@@ -64,7 +64,7 @@ public:
 class ContentStringText : public ContentText
 {
 public:
-       ContentStringText (ContentTime f, std::list<dcp::SubtitleString> s)
+       ContentStringText (dcpomatic::ContentTime f, std::list<dcp::SubtitleString> s)
                : ContentText (f)
                , subs (s)
        {}

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index ef877a17fbd438d2159400190ebc91a185774597..dc1a463c5bcf907938c45b648417958e3e39ad4b 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -55,6 +55,7 @@ using boost::optional;
 using boost::function;
 using boost::dynamic_pointer_cast;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 int const DCPContentProperty::NEEDS_ASSETS       = 600;
 int const DCPContentProperty::NEEDS_KDM          = 601;

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 763b3e903358ff1809e289486bc1a6b504e8f7d5..65bed29bc91bd55b7ab16ce4ad3937ee151527bc 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -61,8 +61,8 @@ public:
                return boost::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ());
        }
 
-       DCPTime full_length (boost::shared_ptr<const Film> film) const;
-       DCPTime approximate_length () const;
+       dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime approximate_length () const;
 
        void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
        std::string summary () const;
@@ -72,7 +72,7 @@ public:
        void take_settings_from (boost::shared_ptr<const Content> c);
 
        void set_default_colour_conversion ();
-       std::list<DCPTime> reel_split_points (boost::shared_ptr<const Film> film) const;
+       std::list<dcpomatic::DCPTime> reel_split_points (boost::shared_ptr<const Film> film) const;
 
        std::vector<boost::filesystem::path> directories () const;
 
@@ -153,7 +153,7 @@ private:
 
        void read_directory (boost::filesystem::path);
        void read_sub_directory (boost::filesystem::path);
-       std::list<DCPTimePeriod> reels (boost::shared_ptr<const Film> film) const;
+       std::list<dcpomatic::DCPTimePeriod> reels (boost::shared_ptr<const Film> film) const;
        bool can_reference (
                boost::shared_ptr<const Film> film,
                boost::function <bool (boost::shared_ptr<const Content>)>,

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 98238f6531e7e0c4201f37a1e1aa0ebb6251b4ae..5a72fb2281b30fda0d06d1cefc6b33b779b9792c 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -54,6 +54,7 @@ using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using namespace dcpomatic;
 
 DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent> c, bool fast)
        : DCP (c)

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 4068696eafe397620b824d3665a0f0e9e541752d..0fc598bd79d0fa39a5924452a91ce086f019c176 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -50,16 +50,16 @@ public:
        void set_forced_reduction (boost::optional<int> reduction);
 
        bool pass ();
-       void seek (ContentTime t, bool accurate);
+       void seek (dcpomatic::ContentTime t, bool accurate);
 
 private:
        friend struct dcp_subtitle_within_dcp_test;
 
        void next_reel ();
        void get_readers ();
-       void pass_texts (ContentTime next, dcp::Size size);
+       void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
        void pass_texts (
-               ContentTime next,
+               dcpomatic::ContentTime next,
                boost::shared_ptr<dcp::SubtitleAsset> asset,
                bool reference,
                int64_t entry_point,
@@ -68,7 +68,7 @@ private:
                );
 
        /** Time of next thing to return from pass relative to the start of _reel */
-       ContentTime _next;
+       dcpomatic::ContentTime _next;
        std::list<boost::shared_ptr<dcp::Reel> > _reels;
 
        std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 50a8fd927264eecf385a0c208ab2171dc14ecaa3..99edb005066524cc683fd2a24a00f1df5cb87204 100644 (file)
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -50,6 +50,7 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using namespace dcpomatic;
 
 /** Construct a DCP encoder.
  *  @param film Film that we are encoding.

diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index 3ccd5695eea0c30ffe90cd9ff8e1641dc36b3362..61cdcee68a6dfc51a9c3810fc5efadcbda85c071 100644 (file)
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -51,9 +51,9 @@ public:
 
 private:
 
-       void video (boost::shared_ptr<PlayerVideo>, DCPTime);
-       void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
-       void text (PlayerText, TextType, boost::optional<DCPTextTrack>, DCPTimePeriod);
+       void video (boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
+       void audio (boost::shared_ptr<AudioBuffers>, dcpomatic::DCPTime);
+       void text (PlayerText, TextType, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod);
 
        boost::shared_ptr<Writer> _writer;
        boost::shared_ptr<J2KEncoder> _j2k_encoder;

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 54bd631cb6586a03dc7ee15c9831193e78c78e56..81e26cf7cb6909c482d5f1c4fba6c24c76ae6be5 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -36,6 +36,7 @@ using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 DCPSubtitleContent::DCPSubtitleContent (boost::filesystem::path path)
        : Content (path)

diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h
index f5f375eee3570673d62ba97128829e6a1e802512..5ff4095469cbba0c70d7df749dff868363f78776 100644 (file)
--- a/src/lib/dcp_subtitle_content.h
+++ b/src/lib/dcp_subtitle_content.h
@@ -31,9 +31,9 @@ public:
        std::string summary () const;
        std::string technical_summary () const;
        void as_xml (xmlpp::Node *, bool with_paths) const;
-       DCPTime full_length (boost::shared_ptr<const Film> film) const;
-       DCPTime approximate_length () const;
+       dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime approximate_length () const;
 
 private:
-       ContentTime _length;
+       dcpomatic::ContentTime _length;
 };

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 3a182c0c7a20c4ea953c6ea02ad601c051029d60..096580a6c0d31bcbe6355d47d196a0b7ac489979 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -28,6 +28,7 @@ using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
+using namespace dcpomatic;
 
 DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
        : Decoder (film)

diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h
index e5533927b4b77f9e485ff56efcd498f8f0dc8976..5bf6363ad282630005a81067e0ac1940179e5cd9 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.h
@@ -29,10 +29,10 @@ public:
        DCPSubtitleDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const DCPSubtitleContent>);
 
        bool pass ();
-       void seek (ContentTime time, bool accurate);
+       void seek (dcpomatic::ContentTime time, bool accurate);
 
 private:
-       ContentTimePeriod content_time_period (boost::shared_ptr<dcp::Subtitle> s) const;
+       dcpomatic::ContentTimePeriod content_time_period (boost::shared_ptr<dcp::Subtitle> s) const;
 
        std::list<boost::shared_ptr<dcp::Subtitle> > _subtitles;
        std::list<boost::shared_ptr<dcp::Subtitle> >::const_iterator _next;

diff --git a/src/lib/dcpomatic_time.cc b/src/lib/dcpomatic_time.cc
index 4f6c9b664e3c0ad28a7068f7cb5b03654ed77676..8abd7755530165f2f13ba50aeefc4194bf9e0fe4 100644 (file)
--- a/src/lib/dcpomatic_time.cc
+++ b/src/lib/dcpomatic_time.cc
@@ -22,6 +22,7 @@
 #include <inttypes.h>
 
 using std::string;
+using namespace dcpomatic;
 
 template <>
 Time<ContentTimeDifferentiator, DCPTimeDifferentiator>::Time (DCPTime d, FrameRateChange f)
@@ -38,7 +39,7 @@ Time<DCPTimeDifferentiator, ContentTimeDifferentiator>::Time (ContentTime d, Fra
 }
 
 DCPTime
-min (DCPTime a, DCPTime b)
+dcpomatic::min (DCPTime a, DCPTime b)
 {
        if (a < b) {
                return a;
@@ -48,7 +49,7 @@ min (DCPTime a, DCPTime b)
 }
 
 DCPTime
-max (DCPTime a, DCPTime b)
+dcpomatic::max (DCPTime a, DCPTime b)
 {
        if (a > b) {
                return a;
@@ -58,7 +59,7 @@ max (DCPTime a, DCPTime b)
 }
 
 ContentTime
-min (ContentTime a, ContentTime b)
+dcpomatic::min (ContentTime a, ContentTime b)
 {
        if (a < b) {
                return a;
@@ -68,7 +69,7 @@ min (ContentTime a, ContentTime b)
 }
 
 ContentTime
-max (ContentTime a, ContentTime b)
+dcpomatic::max (ContentTime a, ContentTime b)
 {
        if (a > b) {
                return a;
@@ -78,7 +79,7 @@ max (ContentTime a, ContentTime b)
 }
 
 string
-to_string (ContentTime t)
+dcpomatic::to_string (ContentTime t)
 {
        char buffer[64];
 #ifdef DCPOMATIC_WINDOWS
@@ -90,7 +91,7 @@ to_string (ContentTime t)
 }
 
 string
-to_string (DCPTime t)
+dcpomatic::to_string (DCPTime t)
 {
        char buffer[64];
 #ifdef DCPOMATIC_WINDOWS
@@ -102,7 +103,7 @@ to_string (DCPTime t)
 }
 
 string
-to_string (DCPTimePeriod p)
+dcpomatic::to_string (DCPTimePeriod p)
 {
        char buffer[64];
 #ifdef DCPOMATIC_WINDOWS

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index a09dd93e9c179f515b08bfd093f8aaada36f2937..897b725bd3e63587ba9390f194234847e01aedd1 100644 (file)
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -35,8 +35,13 @@
 #include <iomanip>
 #include <cstdio>
 
+struct dcpomatic_time_ceil_test;
+struct dcpomatic_time_floor_test;
+
+namespace dcpomatic {
+
 /** A time in seconds, expressed as a number scaled up by Time::HZ.  We want two different
- *  versions of this class, ContentTime and DCPTime, and we want it to be impossible to
+ *  versions of this class, dcpomatic::ContentTime and dcpomatic::DCPTime, and we want it to be impossible to
  *  convert implicitly between the two.  Hence there's this template hack.  I'm not
  *  sure if it's the best way to do it.
  *
@@ -228,8 +233,8 @@ public:
        static const int HZ = 96000;
 
 private:
-       friend struct dcpomatic_time_ceil_test;
-       friend struct dcpomatic_time_floor_test;
+       friend struct ::dcpomatic_time_ceil_test;
+       friend struct ::dcpomatic_time_floor_test;
 
        Type _t;
 };
@@ -357,4 +362,6 @@ std::string to_string (ContentTime t);
 std::string to_string (DCPTime t);
 std::string to_string (DCPTimePeriod p);
 
+}
+
 #endif

diff --git a/src/lib/dcpomatic_time_coalesce.h b/src/lib/dcpomatic_time_coalesce.h
index e103e80e67750947a35dfdc403af5183959f875f..e6e16641ef7e65091993dbe1d4e1b892fac0eeae 100644 (file)
--- a/src/lib/dcpomatic_time_coalesce.h
+++ b/src/lib/dcpomatic_time_coalesce.h
@@ -21,6 +21,8 @@
 #include "dcpomatic_time.h"
 #include <iostream>
 
+namespace dcpomatic {
+
 /** @param periods Set of periods in ascending order of from time */
 template <class T>
 std::list<TimePeriod<T> > coalesce (std::list<TimePeriod<T> > periods)
@@ -46,3 +48,5 @@ std::list<TimePeriod<T> > coalesce (std::list<TimePeriod<T> > periods)
 
        return periods;
 }
+
+}

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 52e8c04e6984f26d389d74ec61189fa80f749a69..f912c473cd5d7e37513cb7fa4a93df133d2c93d6 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -29,6 +29,7 @@ using std::cout;
 using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
+using namespace dcpomatic;
 
 Decoder::Decoder (weak_ptr<const Film> film)
        : _film (film)

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index d610f8727c902cd6bf889ab8cbc024ba3981f606..92082ca18b105a62f9dd9aec909625c12ac875c9 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -55,9 +55,9 @@ public:
         *  @return true if this decoder will emit no more data unless a seek() happens.
         */
        virtual bool pass () = 0;
-       virtual void seek (ContentTime time, bool accurate);
+       virtual void seek (dcpomatic::ContentTime time, bool accurate);
 
-       ContentTime position () const;
+       dcpomatic::ContentTime position () const;
 
 protected:
        boost::shared_ptr<const Film> film () const;

diff --git a/src/lib/decoder_part.h b/src/lib/decoder_part.h
index 7ba2cb2eb67c81f4ee8159e890ebbefce0d09f10..53d1a1b0827349fecc2b37dece5498be3786b837 100644 (file)
--- a/src/lib/decoder_part.h
+++ b/src/lib/decoder_part.h
@@ -34,7 +34,7 @@ public:
        DecoderPart (Decoder* parent);
        virtual ~DecoderPart () {}
 
-       virtual ContentTime position (boost::shared_ptr<const Film> film) const = 0;
+       virtual dcpomatic::ContentTime position (boost::shared_ptr<const Film> film) const = 0;
        virtual void seek () = 0;
 
        void set_ignore (bool i) {

diff --git a/src/lib/empty.cc b/src/lib/empty.cc
index 1df318b25275a2a634fe45ef21017e28889859cf..206acfdb0a67d62131bb11c688906e68f01b49e2 100644 (file)
--- a/src/lib/empty.cc
+++ b/src/lib/empty.cc
@@ -34,6 +34,7 @@ using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::function;
+using namespace dcpomatic;
 
 Empty::Empty (shared_ptr<const Film> film, list<shared_ptr<Piece> > pieces, function<bool (shared_ptr<Piece>)> part)
 {

diff --git a/src/lib/empty.h b/src/lib/empty.h
index 50f21fc4d5380edebda09c05fcfd58a15f8289f0..bd295206e3b4cdea8a691e56230a872b3b87d1c3 100644 (file)
--- a/src/lib/empty.h
+++ b/src/lib/empty.h
@@ -37,23 +37,23 @@ public:
        Empty () {}
        Empty (boost::shared_ptr<const Film> film, std::list<boost::shared_ptr<Piece> > pieces, boost::function<bool (boost::shared_ptr<Piece>)> part);
 
-       DCPTime position () const {
+       dcpomatic::DCPTime position () const {
                return _position;
        }
 
-       DCPTimePeriod period_at_position () const;
+       dcpomatic::DCPTimePeriod period_at_position () const;
 
        bool done () const;
 
-       void set_position (DCPTime amount);
+       void set_position (dcpomatic::DCPTime amount);
 
 private:
        friend struct ::empty_test1;
        friend struct ::empty_test2;
        friend struct ::player_subframe_test;
 
-       std::list<DCPTimePeriod> _periods;
-       DCPTime _position;
+       std::list<dcpomatic::DCPTimePeriod> _periods;
+       dcpomatic::DCPTime _position;
 };
 
 #endif

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 8a0dcb5930afaad11cff0706d9ab3df7c199b814..ab5148cfa0295e79f8e838282dc943974989b4db 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -48,6 +48,7 @@ using std::vector;
 using boost::shared_ptr;
 using boost::optional;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 boost::mutex FFmpeg::_mutex;
 

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index d2f79765884edf775dbd87d48fe43d8311ac5b04..10517055c26cf842619699a901bc561ff00a8fde 100644 (file)
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -53,8 +53,8 @@ public:
 protected:
        AVCodecContext* video_codec_context () const;
        AVCodecContext* subtitle_codec_context () const;
-       ContentTime pts_offset (
-               std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<ContentTime> first_video, double video_frame_rate
+       dcpomatic::ContentTime pts_offset (
+               std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<dcpomatic::ContentTime> first_video, double video_frame_rate
                ) const;
 
        static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub);

diff --git a/src/lib/ffmpeg_audio_stream.cc b/src/lib/ffmpeg_audio_stream.cc
index 1b0d39db27902cf6ac87459c90b5c35ecd1f9249..1fc008d51a22cc5a621ea499fdf6d48d7f3528bb 100644 (file)
--- a/src/lib/ffmpeg_audio_stream.cc
+++ b/src/lib/ffmpeg_audio_stream.cc
@@ -26,6 +26,7 @@
 using std::string;
 using boost::optional;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 FFmpegAudioStream::FFmpegAudioStream (cxml::ConstNodePtr node, int version)
        : FFmpegStream (node)

diff --git a/src/lib/ffmpeg_audio_stream.h b/src/lib/ffmpeg_audio_stream.h
index a754ec5748440d00d7fc38b57bbe49683d946077..65c4aba5ead97b8459925bc63fc4b25c5e6366bd 100644 (file)
--- a/src/lib/ffmpeg_audio_stream.h
+++ b/src/lib/ffmpeg_audio_stream.h
@@ -49,7 +49,7 @@ public:
 
        /* XXX: should probably be locked */
 
-       boost::optional<ContentTime> first_audio;
+       boost::optional<dcpomatic::ContentTime> first_audio;
        boost::optional<std::string> codec_name;
 
 private:

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index a3a1cfb0fd491da77b0b2ac23b6964fb75983309..69d74321514729208eaeea371185a924b52f80fe 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -56,6 +56,7 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
 int const FFmpegContentProperty::SUBTITLE_STREAM = 101;

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 4c612cd3ee00eb62720fc35fe1759f5fd2cf1451..8871301b16ae900d10c91b7854393bb1e8eef251 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -63,8 +63,8 @@ public:
        std::string summary () const;
        std::string technical_summary () const;
        void as_xml (xmlpp::Node *, bool with_paths) const;
-       DCPTime full_length (boost::shared_ptr<const Film> film) const;
-       DCPTime approximate_length () const;
+       dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime approximate_length () const;
 
        std::string identifier () const;
 
@@ -91,7 +91,7 @@ public:
 
        void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
 
-       boost::optional<ContentTime> first_video () const {
+       boost::optional<dcpomatic::ContentTime> first_video () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _first_video;
        }
@@ -116,7 +116,7 @@ private:
 
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
        boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
-       boost::optional<ContentTime> _first_video;
+       boost::optional<dcpomatic::ContentTime> _first_video;
        /** Video filters that should be used when generating DCPs */
        std::vector<Filter const *> _filters;
 

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index edc0b08d1537a4dfa83bbb60c2013228f834d548..0e65a6d6b272a67e2f9bdc37bb281f8114684d87 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -74,6 +74,7 @@ using boost::split;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using dcp::Size;
+using namespace dcpomatic;
 
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> film, shared_ptr<const FFmpegContent> c, bool fast)
        : FFmpeg (c)

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 640229f23f74a757e39df7368bcec0ccec9ac0a8..65f36a00461b9115ca67fea8e7ee60c60a944ef8 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -48,7 +48,7 @@ public:
        FFmpegDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const FFmpegContent>, bool fast);
 
        bool pass ();
-       void seek (ContentTime time, bool);
+       void seek (dcpomatic::ContentTime time, bool);
 
 private:
        friend struct ::ffmpeg_pts_offset_test;
@@ -62,8 +62,8 @@ private:
        void decode_audio_packet ();
        void decode_subtitle_packet ();
 
-       void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime from);
-       void decode_ass_subtitle (std::string ass, ContentTime from);
+       void decode_bitmap_subtitle (AVSubtitleRect const * rect, dcpomatic::ContentTime from);
+       void decode_ass_subtitle (std::string ass, dcpomatic::ContentTime from);
 
        void maybe_add_subtitle ();
        boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream) const;
@@ -71,12 +71,12 @@ private:
        std::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;
        boost::mutex _filter_graphs_mutex;
 
-       ContentTime _pts_offset;
-       boost::optional<ContentTime> _current_subtitle_to;
+       dcpomatic::ContentTime _pts_offset;
+       boost::optional<dcpomatic::ContentTime> _current_subtitle_to;
        /** true if we have a subtitle which has not had emit_stop called for it yet */
        bool _have_current_subtitle;
 
        boost::shared_ptr<Image> _black_image;
 
-       std::vector<boost::optional<ContentTime> > _next_time;
+       std::vector<boost::optional<dcpomatic::ContentTime> > _next_time;
 };

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 07b69195605dfd35998448f1c1a9e885d1715276..1d112bdb4e20a3320d38fc03cbd34bd4b27da834 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -41,6 +41,7 @@ using std::map;
 using boost::shared_ptr;
 using boost::bind;
 using boost::weak_ptr;
+using namespace dcpomatic;
 
 FFmpegEncoder::FFmpegEncoder (
        shared_ptr<const Film> film,

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 79539acce44a24f8f7be9da8f8d1f9030645bc27..687d2981ee11108dd72ecb86a3d663c2d720fff9 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -78,7 +78,7 @@ private:
        int _output_audio_channels;
 
        mutable boost::mutex _mutex;
-       DCPTime _last_time;
+       dcpomatic::DCPTime _last_time;
 
        EventHistory _history;
 

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index b31280cd5b3cac7b093456e2c9cb2c946a71635a..382b71b83442a36e2fe4910310131190fbfcb84f 100644 (file)
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -42,6 +42,7 @@ using std::cout;
 using std::max;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 /** @param job job that the examiner is operating in, or 0 */
 FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Job> job)

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 67fdcfae0baa65986a407f2adfd2b237828875da..d2e6e1a0a1da1dbd17e9778d2058a8edb389d0d4 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -49,7 +49,7 @@ public:
                return _audio_streams;
        }
 
-       boost::optional<ContentTime> first_video () const {
+       boost::optional<dcpomatic::ContentTime> first_video () const {
                return _first_video;
        }
 
@@ -81,11 +81,11 @@ private:
 
        std::string stream_name (AVStream* s) const;
        std::string subtitle_stream_name (AVStream* s) const;
-       boost::optional<ContentTime> frame_time (AVStream* s) const;
+       boost::optional<dcpomatic::ContentTime> frame_time (AVStream* s) const;
 
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
        std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
-       boost::optional<ContentTime> _first_video;
+       boost::optional<dcpomatic::ContentTime> _first_video;
        /** Video length, either obtained from the header or derived by running
         *  through the whole file.
         */
@@ -96,7 +96,7 @@ private:
 
        struct SubtitleStart
        {
-               SubtitleStart (std::string id_, bool image_, ContentTime time_)
+               SubtitleStart (std::string id_, bool image_, dcpomatic::ContentTime time_)
                        : id (id_)
                        , image (image_)
                        , time (time_)
@@ -105,7 +105,7 @@ private:
                std::string id;
                /** true if it's an image subtitle, false for text */
                bool image;
-               ContentTime time;
+               dcpomatic::ContentTime time;
        };
 
        typedef std::map<boost::shared_ptr<FFmpegSubtitleStream>, boost::optional<SubtitleStart> > LastSubtitleMap;

diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 5eccb8f1728966fd638c57f1bad1fb48d8ee8096..eb7036429fb44bbeb05893bffbfa6f2ab89ee331 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -38,6 +38,7 @@ using std::pair;
 using boost::shared_ptr;
 using boost::bind;
 using boost::weak_ptr;
+using namespace dcpomatic;
 
 int FFmpegFileEncoder::_video_stream_index = 0;
 int FFmpegFileEncoder::_audio_stream_index = 1;

diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h
index 8b9d0b67c2a7269af994690ca52ede24a6880bc2..5308947e6e2900b5f6d97a5f936518a67a5f3436 100644 (file)
--- a/src/lib/ffmpeg_file_encoder.h
+++ b/src/lib/ffmpeg_file_encoder.h
@@ -43,9 +43,9 @@ public:
                boost::filesystem::path output
                );
 
-       void video (boost::shared_ptr<PlayerVideo>, DCPTime);
+       void video (boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
        void audio (boost::shared_ptr<AudioBuffers>);
-       void subtitle (PlayerText, DCPTimePeriod);
+       void subtitle (PlayerText, dcpomatic::DCPTimePeriod);
 
        void flush ();
 

diff --git a/src/lib/ffmpeg_subtitle_period.h b/src/lib/ffmpeg_subtitle_period.h
index 42c7bf76325fdf766e33ccf88a8770e347dd396c..0841207ad5f677372e14678adf8c8ea7ed43fed4 100644 (file)
--- a/src/lib/ffmpeg_subtitle_period.h
+++ b/src/lib/ffmpeg_subtitle_period.h
@@ -24,15 +24,15 @@
 class FFmpegSubtitlePeriod
 {
 public:
-       explicit FFmpegSubtitlePeriod (ContentTime f)
+       explicit FFmpegSubtitlePeriod (dcpomatic::ContentTime f)
                : from (f)
        {}
 
-       FFmpegSubtitlePeriod (ContentTime f, ContentTime t)
+       FFmpegSubtitlePeriod (dcpomatic::ContentTime f, dcpomatic::ContentTime t)
                : from (f)
                , to (t)
        {}
 
-       ContentTime from;
-       boost::optional<ContentTime> to;
+       dcpomatic::ContentTime from;
+       boost::optional<dcpomatic::ContentTime> to;
 };

diff --git a/src/lib/film.cc b/src/lib/film.cc
index dee3196c5776512a5f881ade08d09076e943b07a..efc89e0eb6be3b27c6a7c04a31b82ee32c68f54b 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -99,6 +99,7 @@ using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::is_any_of;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 string const Film::metadata_file = "metadata.xml";
 

diff --git a/src/lib/film.h b/src/lib/film.h
index e5d29145c8761a25705fd7f92989c20cbf952f41..7d762f5995bbd80c0112b6d6b711084cecd9eb33 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -71,10 +71,10 @@ public:
        explicit Film (boost::optional<boost::filesystem::path> dir);
        ~Film ();
 
-       boost::filesystem::path info_file (DCPTimePeriod p) const;
+       boost::filesystem::path info_file (dcpomatic::DCPTimePeriod p) const;
        boost::filesystem::path j2c_path (int, Frame, Eyes, bool) const;
        boost::filesystem::path internal_video_asset_dir () const;
-       boost::filesystem::path internal_video_asset_filename (DCPTimePeriod p) const;
+       boost::filesystem::path internal_video_asset_filename (dcpomatic::DCPTimePeriod p) const;
 
        boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
 
@@ -123,9 +123,9 @@ public:
        /* Proxies for some Playlist methods */
 
        ContentList content () const;
-       DCPTime length () const;
+       dcpomatic::DCPTime length () const;
        int best_video_frame_rate () const;
-       FrameRateChange active_frame_rate_change (DCPTime) const;
+       FrameRateChange active_frame_rate_change (dcpomatic::DCPTime) const;
        std::pair<double, double> speed_up_range (int dcp_frame_rate) const;
 
        dcp::EncryptedKDM make_kdm (
@@ -163,10 +163,10 @@ public:
                return _playlist;
        }
 
-       std::list<DCPTimePeriod> reels () const;
+       std::list<dcpomatic::DCPTimePeriod> reels () const;
        std::list<int> mapped_audio_channels () const;
 
-       std::string content_summary (DCPTimePeriod period) const;
+       std::string content_summary (dcpomatic::DCPTimePeriod period) const;
 
        bool references_dcp_video () const;
        bool references_dcp_audio () const;
@@ -298,8 +298,8 @@ public:
                return _reencode_j2k;
        }
 
-       boost::optional<DCPTime> marker (dcp::Marker type) const;
-       std::map<dcp::Marker, DCPTime> markers () const {
+       boost::optional<dcpomatic::DCPTime> marker (dcp::Marker type) const;
+       std::map<dcp::Marker, dcpomatic::DCPTime> markers () const {
                return _markers;
        }
 
@@ -337,7 +337,7 @@ public:
        void set_reel_length (int64_t);
        void set_upload_after_make_dcp (bool);
        void set_reencode_j2k (bool);
-       void set_marker (dcp::Marker type, DCPTime time);
+       void set_marker (dcp::Marker type, dcpomatic::DCPTime time);
        void unset_marker (dcp::Marker type);
        void set_ratings (std::vector<dcp::Rating> r);
 
@@ -419,7 +419,7 @@ private:
        bool _reencode_j2k;
        /** true if the user has ever explicitly set the video frame rate of this film */
        bool _user_explicit_video_frame_rate;
-       std::map<dcp::Marker, DCPTime> _markers;
+       std::map<dcp::Marker, dcpomatic::DCPTime> _markers;
        std::vector<dcp::Rating> _ratings;
 
        int _state_version;

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index df29a333699de0cabee2f9588e1ac38aaae3148a..cf14f0699a299a117108c9ec585d725f6faf1e51 100644 (file)
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -49,6 +49,7 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
 using boost::bind;
+using namespace dcpomatic;
 
 Hints::Hints (weak_ptr<const Film> film)
        : _film (film)

diff --git a/src/lib/hints.h b/src/lib/hints.h
index 6f0e533d407ae4d3dd549898688c74be2d4a11e5..00c2486e7e430e094ab1fcbdfc5def77cb70c29f 100644 (file)
--- a/src/lib/hints.h
+++ b/src/lib/hints.h
@@ -46,7 +46,7 @@ public:
 private:
        void thread ();
        void hint (std::string h);
-       void text (PlayerText text, TextType type, DCPTimePeriod period);
+       void text (PlayerText text, TextType type, dcpomatic::DCPTimePeriod period);
 
        boost::weak_ptr<const Film> _film;
        boost::thread* _thread;
@@ -54,7 +54,7 @@ private:
        bool _long_ccap;
        bool _overlap_ccap;
        bool _too_many_ccap_lines;
-       boost::optional<DCPTimePeriod> _last;
+       boost::optional<dcpomatic::DCPTimePeriod> _last;
 
        boost::mutex _mutex;
        bool _stop;

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 1515c8b7618522a50c0a7be5e521e6484dda3f98..8cf44bda1fd870682575f9bc3a6410b59f92bc5b 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -39,6 +39,7 @@ using std::cout;
 using std::list;
 using std::vector;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 ImageContent::ImageContent (boost::filesystem::path p)
 {

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index 959923a51db83e0e1c4851d9fa95a39c161a7c2d..970a68d661271be3b567d714ec880cc55111527a 100644 (file)
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -41,8 +41,8 @@ public:
        std::string summary () const;
        std::string technical_summary () const;
        void as_xml (xmlpp::Node *, bool with_paths) const;
-       DCPTime full_length (boost::shared_ptr<const Film> film) const;
-       DCPTime approximate_length () const;
+       dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime approximate_length () const;
 
        std::string identifier () const;
 

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index ce45abdd906d2473d4c11224e54097376d2979ec..8aa3f6a99c2eba0369d3ee6b254e703dab0189e4 100644 (file)
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -35,6 +35,7 @@
 using std::cout;
 using boost::shared_ptr;
 using dcp::Size;
+using namespace dcpomatic;
 
 ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageContent> c)
        : Decoder (film)

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 9f1484e47a33c8fe83a9a1b004592f5dd7057ab8..eeec779ba8849129d7b73d2c68d9622e4bcafc42 100644 (file)
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -34,7 +34,7 @@ public:
        }
 
        bool pass ();
-       void seek (ContentTime, bool);
+       void seek (dcpomatic::ContentTime, bool);
 
 private:
 

diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index 94728d6a9e6acccbe5839e4acc0c73d3d1b09530..431a47e6530e8277961ebc1f5ca0a6b7f24c32c2 100644 (file)
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -48,6 +48,7 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
 using dcp::Data;
+using namespace dcpomatic;
 
 /** @param film Film that we are encoding.
  *  @param writer Writer that we are using.

diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index 2180f3f6afd0625c20f436186febed35ec2e1c95..01cf0605e0c1692e113d07fc8fef59c952f840ef 100644 (file)
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -63,7 +63,7 @@ public:
        void begin ();
 
        /** Called to pass a bit of video to be encoded as the next DCP frame */
-       void encode (boost::shared_ptr<PlayerVideo> pv, DCPTime time);
+       void encode (boost::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
 
        /** Called when a processing run has finished */
        void end ();
@@ -101,7 +101,7 @@ private:
        Waker _waker;
 
        boost::shared_ptr<PlayerVideo> _last_player_video[EYES_COUNT];
-       boost::optional<DCPTime> _last_player_video_time;
+       boost::optional<dcpomatic::DCPTime> _last_player_video_time;
 
        boost::signals2::scoped_connection _server_found_connection;
 };

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 4517765247075236bd702123852bc6125c27fc7e..1416ddfc20c4d1906b785a67ddc8506d40894b17 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -46,6 +46,7 @@ using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 using boost::function;
+using namespace dcpomatic;
 
 /** @param film Associated film, or 0 */
 Job::Job (shared_ptr<const Film> film)

diff --git a/src/lib/overlaps.cc b/src/lib/overlaps.cc
index 4c75ac0c3e4e567c6baf73ecf5a490d4ccba6075..5ed7a983261fdb3a2b76924bf5cbd531d615f95a 100644 (file)
--- a/src/lib/overlaps.cc
+++ b/src/lib/overlaps.cc
@@ -25,6 +25,7 @@
 
 using boost::shared_ptr;
 using boost::function;
+using namespace dcpomatic;
 
 ContentList overlaps (shared_ptr<const Film> film, ContentList cl, function<bool (shared_ptr<const Content>)> part, DCPTime from, DCPTime to)
 {

diff --git a/src/lib/overlaps.h b/src/lib/overlaps.h
index be3edf9d42559bae365c3e6f364a8572dd4705cf..9bd867030634af03970f54a17ce5f8841d40465a 100644 (file)
--- a/src/lib/overlaps.h
+++ b/src/lib/overlaps.h
@@ -29,5 +29,5 @@ class Film;
  *  ContentList
  */
 ContentList overlaps (
-       boost::shared_ptr<const Film> film, ContentList cl, boost::function<bool (boost::shared_ptr<const Content>)> part, DCPTime from, DCPTime to
+       boost::shared_ptr<const Film> film, ContentList cl, boost::function<bool (boost::shared_ptr<const Content>)> part, dcpomatic::DCPTime from, dcpomatic::DCPTime to
        );

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 50bcef0ec83635656149e35e6fc8db425d4bbefc..e44edd8dc467e0155dea78b256dc942effeea58f 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -75,6 +75,7 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using boost::scoped_ptr;
+using namespace dcpomatic;
 
 int const PlayerProperty::VIDEO_CONTAINER_SIZE = 700;
 int const PlayerProperty::PLAYLIST = 701;

diff --git a/src/lib/player.h b/src/lib/player.h
index 8a81146c9547fb7d7612dc59e38d3f1b0d289880..381aa80b71c113ab3b615bf5151a10487b9d8596 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -68,7 +68,7 @@ public:
        ~Player ();
 
        bool pass ();
-       void seek (DCPTime time, bool accurate);
+       void seek (dcpomatic::DCPTime time, bool accurate);
 
        std::list<boost::shared_ptr<Font> > get_subtitle_fonts ();
        std::list<ReferencedReelAsset> get_reel_assets ();
@@ -86,17 +86,17 @@ public:
        void set_play_referenced ();
        void set_dcp_decode_reduction (boost::optional<int> reduction);
 
-       boost::optional<DCPTime> content_time_to_dcp (boost::shared_ptr<Content> content, ContentTime t);
+       boost::optional<dcpomatic::DCPTime> content_time_to_dcp (boost::shared_ptr<Content> content, dcpomatic::ContentTime t);
 
        boost::signals2::signal<void (ChangeType, int, bool)> Change;
 
        /** Emitted when a video frame is ready.  These emissions happen in the correct order. */
-       boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>, DCPTime)> Video;
-       boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime, int)> Audio;
+       boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime)> Video;
+       boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, dcpomatic::DCPTime, int)> Audio;
        /** Emitted when a text is ready.  This signal may be emitted considerably
         *  after the corresponding Video.
         */
-       boost::signals2::signal<void (PlayerText, TextType, boost::optional<DCPTextTrack>, DCPTimePeriod)> Text;
+       boost::signals2::signal<void (PlayerText, TextType, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod)> Text;
 
 private:
        friend class PlayerWrapper;
@@ -114,27 +114,27 @@ private:
        void film_change (ChangeType, Film::Property);
        void playlist_change (ChangeType);
        void playlist_content_change (ChangeType, int, bool);
-       Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-       DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
-       Frame dcp_to_resampled_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-       DCPTime resampled_audio_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
-       ContentTime dcp_to_content_time (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-       DCPTime content_time_to_dcp (boost::shared_ptr<const Piece> piece, ContentTime t) const;
+       Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, dcpomatic::DCPTime t) const;
+       dcpomatic::DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
+       Frame dcp_to_resampled_audio (boost::shared_ptr<const Piece> piece, dcpomatic::DCPTime t) const;
+       dcpomatic::DCPTime resampled_audio_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
+       dcpomatic::ContentTime dcp_to_content_time (boost::shared_ptr<const Piece> piece, dcpomatic::DCPTime t) const;
+       dcpomatic::DCPTime content_time_to_dcp (boost::shared_ptr<const Piece> piece, dcpomatic::ContentTime t) const;
        boost::shared_ptr<PlayerVideo> black_player_video_frame (Eyes eyes) const;
        void video (boost::weak_ptr<Piece>, ContentVideo);
        void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
        void bitmap_text_start (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentBitmapText);
        void plain_text_start (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentStringText);
-       void subtitle_stop (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, ContentTime);
-       DCPTime one_video_frame () const;
-       void fill_audio (DCPTimePeriod period);
-       std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> discard_audio (
-               boost::shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTime discard_to
+       void subtitle_stop (boost::weak_ptr<Piece>, boost::weak_ptr<const TextContent>, dcpomatic::ContentTime);
+       dcpomatic::DCPTime one_video_frame () const;
+       void fill_audio (dcpomatic::DCPTimePeriod period);
+       std::pair<boost::shared_ptr<AudioBuffers>, dcpomatic::DCPTime> discard_audio (
+               boost::shared_ptr<const AudioBuffers> audio, dcpomatic::DCPTime time, dcpomatic::DCPTime discard_to
                ) const;
-       boost::optional<PositionImage> open_subtitles_for_frame (DCPTime time) const;
-       void emit_video (boost::shared_ptr<PlayerVideo> pv, DCPTime time);
-       void do_emit_video (boost::shared_ptr<PlayerVideo> pv, DCPTime time);
-       void emit_audio (boost::shared_ptr<AudioBuffers> data, DCPTime time);
+       boost::optional<PositionImage> open_subtitles_for_frame (dcpomatic::DCPTime time) const;
+       void emit_video (boost::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
+       void do_emit_video (boost::shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime time);
+       void emit_audio (boost::shared_ptr<AudioBuffers> data, dcpomatic::DCPTime time);
 
        /** Mutex to protect the whole Player state.  When it's used for the preview we have
            seek() and pass() called from the Butler thread and lots of other stuff called
@@ -165,10 +165,10 @@ private:
        bool _play_referenced;
 
        /** Time just after the last video frame we emitted, or the time of the last accurate seek */
-       boost::optional<DCPTime> _last_video_time;
+       boost::optional<dcpomatic::DCPTime> _last_video_time;
        boost::optional<Eyes> _last_video_eyes;
        /** Time just after the last audio frame we emitted, or the time of the last accurate seek */
-       boost::optional<DCPTime> _last_audio_time;
+       boost::optional<dcpomatic::DCPTime> _last_audio_time;
 
        boost::optional<int> _dcp_decode_reduction;
 
@@ -177,20 +177,20 @@ private:
 
        AudioMerger _audio_merger;
        Shuffler* _shuffler;
-       std::list<std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> > _delay;
+       std::list<std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> > _delay;
 
        class StreamState
        {
        public:
                StreamState () {}
 
-               StreamState (boost::shared_ptr<Piece> p, DCPTime l)
+               StreamState (boost::shared_ptr<Piece> p, dcpomatic::DCPTime l)
                        : piece(p)
                        , last_push_end(l)
                {}
 
                boost::shared_ptr<Piece> piece;
-               DCPTime last_push_end;
+               dcpomatic::DCPTime last_push_end;
        };
        std::map<AudioStreamPtr, StreamState> _stream_states;
 

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 6d125afa63ba93d592a7bd7f4580d9f1d6e9ea12..9e96c693a529679b197ae66e0ba6c67d8a2fc248 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -51,6 +51,7 @@ using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 Playlist::Playlist ()
        : _sequence (true)

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index a5dce1498be1d500c9861cb9e2dfc883693967ed..d7db75d0fb9ed44feccfb7a70a0561780eea5eb6 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -59,15 +59,15 @@ public:
 
        std::string video_identifier () const;
 
-       DCPTime length (boost::shared_ptr<const Film> film) const;
-       boost::optional<DCPTime> start () const;
+       dcpomatic::DCPTime length (boost::shared_ptr<const Film> film) const;
+       boost::optional<dcpomatic::DCPTime> start () const;
        int64_t required_disk_space (boost::shared_ptr<const Film> film, int j2k_bandwidth, int audio_channels, int audio_frame_rate) const;
 
        int best_video_frame_rate () const;
-       DCPTime video_end (boost::shared_ptr<const Film> film) const;
-       DCPTime text_end (boost::shared_ptr<const Film> film) const;
-       FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
-       std::string content_summary (boost::shared_ptr<const Film> film, DCPTimePeriod period) const;
+       dcpomatic::DCPTime video_end (boost::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime text_end (boost::shared_ptr<const Film> film) const;
+       FrameRateChange active_frame_rate_change (dcpomatic::DCPTime, int dcp_frame_rate) const;
+       std::string content_summary (boost::shared_ptr<const Film> film, dcpomatic::DCPTimePeriod period) const;
        std::pair<double, double> speed_up_range (int dcp_video_frame_rate) const;
 
        void set_sequence (bool);

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index f5fe872487601f0b0f48d2ad043fdd5a9beb0a4d..81057185aea935c24c01ce96f20b53d2c97630b4 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -60,6 +60,7 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 using dcp::Data;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 int const ReelWriter::_info_size = 48;
 

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index ae64c3ac77ed9c73bd6f4f6939c9f5c6710548cf..9ea576d7ab371dd01ba659cd519c2f1cf512030b 100644 (file)
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -50,7 +50,7 @@ class ReelWriter
 public:
        ReelWriter (
                boost::shared_ptr<const Film> film,
-               DCPTimePeriod period,
+               dcpomatic::DCPTimePeriod period,
                boost::shared_ptr<Job> job,
                int reel_index,
                int reel_count,
@@ -61,7 +61,7 @@ public:
        void fake_write (Frame frame, Eyes eyes, int size);
        void repeat_write (Frame frame, Eyes eyes);
        void write (boost::shared_ptr<const AudioBuffers> audio);
-       void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, DCPTimePeriod period);
+       void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
 
        void finish ();
        boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<Font> > const & fonts);
@@ -69,7 +69,7 @@ public:
 
        Frame start () const;
 
-       DCPTimePeriod period () const {
+       dcpomatic::DCPTimePeriod period () const {
                return _period;
        }
 
@@ -96,7 +96,7 @@ private:
 
        boost::shared_ptr<const Film> _film;
 
-       DCPTimePeriod _period;
+       dcpomatic::DCPTimePeriod _period;
        /** the first picture frame index that does not already exist in our MXF */
        int _first_nonexistant_frame;
        /** the data of the last written frame, if there is one */

diff --git a/src/lib/referenced_reel_asset.h b/src/lib/referenced_reel_asset.h
index 739a8f490b76e562682f74c78fa5bb1fa52470e4..0d66155b53fb51e13680bd0c1a07f8e01cecb50f 100644 (file)
--- a/src/lib/referenced_reel_asset.h
+++ b/src/lib/referenced_reel_asset.h
@@ -26,7 +26,7 @@
 class ReferencedReelAsset
 {
 public:
-       ReferencedReelAsset (boost::shared_ptr<dcp::ReelAsset> asset_, DCPTimePeriod period_)
+       ReferencedReelAsset (boost::shared_ptr<dcp::ReelAsset> asset_, dcpomatic::DCPTimePeriod period_)
                : asset (asset_)
                , period (period_)
        {}
@@ -34,7 +34,7 @@ public:
        /** The asset */
        boost::shared_ptr<dcp::ReelAsset> asset;
        /** Period that this asset covers in the DCP */
-       DCPTimePeriod period;
+       dcpomatic::DCPTimePeriod period;
 };
 
 #endif

diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc
index 8d5f8e6a94892170ce28903af6a47b9c3f1862a0..8b9d93423d390062e53b710fba9feaf06b098a92 100644 (file)
--- a/src/lib/render_text.cc
+++ b/src/lib/render_text.cc
@@ -46,6 +46,7 @@ using std::make_pair;
 using boost::shared_ptr;
 using boost::optional;
 using boost::algorithm::replace_all;
+using namespace dcpomatic;
 
 static FcConfig* fc_config = 0;
 static list<pair<boost::filesystem::path, string> > fc_config_fonts;

diff --git a/src/lib/render_text.h b/src/lib/render_text.h
index 99b4391db7393346166c605b029cee58767e37cb..f235fb45971d69241c1abea7212b31feb095475d 100644 (file)
--- a/src/lib/render_text.h
+++ b/src/lib/render_text.h
@@ -27,5 +27,5 @@ class Font;
 
 std::string marked_up (std::list<StringText> subtitles, int target_height, float fade_factor);
 std::list<PositionImage> render_text (
-       std::list<StringText>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size, DCPTime, int
+       std::list<StringText>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size, dcpomatic::DCPTime, int
        );

diff --git a/src/lib/string_text_file.cc b/src/lib/string_text_file.cc
index c7eadbbb1a9332ba1f7312335bd7ad8acd9e26fd..bf19e482c9ea2e10e13773f39985525fc114ed44 100644 (file)
--- a/src/lib/string_text_file.cc
+++ b/src/lib/string_text_file.cc
@@ -38,6 +38,7 @@ using boost::shared_ptr;
 using boost::scoped_array;
 using boost::optional;
 using dcp::Data;
+using namespace dcpomatic;
 
 StringTextFile::StringTextFile (shared_ptr<const StringTextFileContent> content)
 {

diff --git a/src/lib/string_text_file.h b/src/lib/string_text_file.h
index 0091973a46db925d7ab8751c92442f7ca698cc1f..5ade4a9ec8be3534372db5e9e7157f317bbe9a8c 100644 (file)
--- a/src/lib/string_text_file.h
+++ b/src/lib/string_text_file.h
@@ -43,8 +43,8 @@ class StringTextFile
 public:
        explicit StringTextFile (boost::shared_ptr<const StringTextFileContent>);
 
-       boost::optional<ContentTime> first () const;
-       ContentTime length () const;
+       boost::optional<dcpomatic::ContentTime> first () const;
+       dcpomatic::ContentTime length () const;
 
 protected:
        std::vector<sub::Subtitle> _subtitles;

diff --git a/src/lib/string_text_file_content.cc b/src/lib/string_text_file_content.cc
index b3f7f431e025fe14940159b0dced2c6fbbde3e2c..9a25ef06f00ce6e10532721b88183a9d0ed46d9a 100644 (file)
--- a/src/lib/string_text_file_content.cc
+++ b/src/lib/string_text_file_content.cc
@@ -35,6 +35,7 @@ using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 StringTextFileContent::StringTextFileContent (boost::filesystem::path path)
        : Content (path)

diff --git a/src/lib/string_text_file_content.h b/src/lib/string_text_file_content.h
index 83323172d3efb447227153647a008d6fca5c75c0..959190d32a604ee37c0921928c796a49695f9cf5 100644 (file)
--- a/src/lib/string_text_file_content.h
+++ b/src/lib/string_text_file_content.h
@@ -43,10 +43,10 @@ public:
        std::string summary () const;
        std::string technical_summary () const;
        void as_xml (xmlpp::Node *, bool with_paths) const;
-       DCPTime full_length (boost::shared_ptr<const Film> film) const;
-       DCPTime approximate_length () const;
+       dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime approximate_length () const;
        std::string identifier () const;
 
 private:
-       ContentTime _length;
+       dcpomatic::ContentTime _length;
 };

diff --git a/src/lib/string_text_file_decoder.cc b/src/lib/string_text_file_decoder.cc
index 8c9880b0c7118881942b3cebb2ab76991e25bf06..4cf34a3a94c31ace9c56d4ba4547587cd2ceab58 100644 (file)
--- a/src/lib/string_text_file_decoder.cc
+++ b/src/lib/string_text_file_decoder.cc
@@ -34,6 +34,7 @@ using std::max;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const Film> film, shared_ptr<const StringTextFileContent> content)
        : Decoder (film)

diff --git a/src/lib/string_text_file_decoder.h b/src/lib/string_text_file_decoder.h
index f30e1b7625dee96a1fc7d569c8f64f91c3168124..0c1d31deb1661f78508a6a056b2fb0218642ce33 100644 (file)
--- a/src/lib/string_text_file_decoder.h
+++ b/src/lib/string_text_file_decoder.h
@@ -31,11 +31,11 @@ class StringTextFileDecoder : public Decoder, public StringTextFile
 public:
        StringTextFileDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const StringTextFileContent>);
 
-       void seek (ContentTime time, bool accurate);
+       void seek (dcpomatic::ContentTime time, bool accurate);
        bool pass ();
 
 private:
-       ContentTimePeriod content_time_period (sub::Subtitle s) const;
+       dcpomatic::ContentTimePeriod content_time_period (sub::Subtitle s) const;
 
        size_t _next;
 };

diff --git a/src/lib/text_content.cc b/src/lib/text_content.cc
index 772ed31f56fe1ed3dfdda31a95f72a1291abe2af..901d38647c05bdd20504c8ce6e69e893c56fd1ad 100644 (file)
--- a/src/lib/text_content.cc
+++ b/src/lib/text_content.cc
@@ -39,6 +39,7 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 int const TextContentProperty::X_OFFSET = 500;
 int const TextContentProperty::Y_OFFSET = 501;

diff --git a/src/lib/text_content.h b/src/lib/text_content.h
index 83860dff54fb6f733356a30de07833b282a7d336..c7d1b590d101cbdf5e5acb4c08a822c3c6a0c231 100644 (file)
--- a/src/lib/text_content.h
+++ b/src/lib/text_content.h
@@ -83,9 +83,9 @@ public:
        void set_effect_colour (dcp::Colour);
        void unset_effect_colour ();
        void set_line_spacing (double s);
-       void set_fade_in (ContentTime);
+       void set_fade_in (dcpomatic::ContentTime);
        void unset_fade_in ();
-       void set_fade_out (ContentTime);
+       void set_fade_out (dcpomatic::ContentTime);
        void set_outline_width (int);
        void unset_fade_out ();
        void set_type (TextType type);
@@ -152,12 +152,12 @@ public:
                return _line_spacing;
        }
 
-       boost::optional<ContentTime> fade_in () const {
+       boost::optional<dcpomatic::ContentTime> fade_in () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _fade_in;
        }
 
-       boost::optional<ContentTime> fade_out () const {
+       boost::optional<dcpomatic::ContentTime> fade_out () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _fade_out;
        }
@@ -217,8 +217,8 @@ private:
        boost::optional<dcp::Colour> _effect_colour;
        /** scaling factor for line spacing; 1 is "standard", < 1 is closer together, > 1 is further apart */
        double _line_spacing;
-       boost::optional<ContentTime> _fade_in;
-       boost::optional<ContentTime> _fade_out;
+       boost::optional<dcpomatic::ContentTime> _fade_in;
+       boost::optional<dcpomatic::ContentTime> _fade_out;
        int _outline_width;
        /** what these captions will be used for in the output DCP (not necessarily what
         *  they were originally).

diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index 74fea6ec309d937243f5157ba6ab7a50afdada06..4eaaf37af7cbd50b86ad2fdce8bfbc17253c88c3 100644 (file)
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -36,6 +36,7 @@ using std::min;
 using boost::shared_ptr;
 using boost::optional;
 using boost::function;
+using namespace dcpomatic;
 
 TextDecoder::TextDecoder (
        Decoder* parent,

diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index a82f43f51af2e3a1ddd8bf1178366241cae51add..02afeeb94251132984f24b7ae215e0734433b224 100644 (file)
--- a/src/lib/text_decoder.h
+++ b/src/lib/text_decoder.h
@@ -41,20 +41,20 @@ public:
        TextDecoder (
                Decoder* parent,
                boost::shared_ptr<const TextContent>,
-               ContentTime first
+               dcpomatic::ContentTime first
                );
 
-       ContentTime position (boost::shared_ptr<const Film>) const {
+       dcpomatic::ContentTime position (boost::shared_ptr<const Film>) const {
                return _position;
        }
 
-       void emit_bitmap_start (ContentTime from, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
-       void emit_bitmap (ContentTimePeriod period, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
-       void emit_plain_start (ContentTime from, std::list<dcp::SubtitleString> s);
-       void emit_plain_start (ContentTime from, sub::Subtitle const & subtitle);
-       void emit_plain (ContentTimePeriod period, std::list<dcp::SubtitleString> s);
-       void emit_plain (ContentTimePeriod period, sub::Subtitle const & subtitle);
-       void emit_stop (ContentTime to);
+       void emit_bitmap_start (dcpomatic::ContentTime from, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
+       void emit_bitmap (dcpomatic::ContentTimePeriod period, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
+       void emit_plain_start (dcpomatic::ContentTime from, std::list<dcp::SubtitleString> s);
+       void emit_plain_start (dcpomatic::ContentTime from, sub::Subtitle const & subtitle);
+       void emit_plain (dcpomatic::ContentTimePeriod period, std::list<dcp::SubtitleString> s);
+       void emit_plain (dcpomatic::ContentTimePeriod period, sub::Subtitle const & subtitle);
+       void emit_stop (dcpomatic::ContentTime to);
 
        void seek ();
 
@@ -64,11 +64,11 @@ public:
 
        boost::signals2::signal<void (ContentBitmapText)> BitmapStart;
        boost::signals2::signal<void (ContentStringText)> PlainStart;
-       boost::signals2::signal<void (ContentTime)> Stop;
+       boost::signals2::signal<void (dcpomatic::ContentTime)> Stop;
 
 private:
        boost::shared_ptr<const TextContent> _content;
-       ContentTime _position;
+       dcpomatic::ContentTime _position;
 };
 
 #endif

diff --git a/src/lib/text_ring_buffers.cc b/src/lib/text_ring_buffers.cc
index cc5357804bb0eccfccede815f9c8105f90bc4643..ba727cc41c4154a62c4a9868db213a6abaedd9aa 100644 (file)
--- a/src/lib/text_ring_buffers.cc
+++ b/src/lib/text_ring_buffers.cc
@@ -22,6 +22,7 @@
 
 using std::pair;
 using boost::optional;
+using namespace dcpomatic;
 
 void
 TextRingBuffers::put (PlayerText text, DCPTextTrack track, DCPTimePeriod period)

diff --git a/src/lib/text_ring_buffers.h b/src/lib/text_ring_buffers.h
index 289a38149146c2f27fae90f98f42e9980de41504..7d685d8242b4b9cbbdd1efca4a698dfe92a8e143 100644 (file)
--- a/src/lib/text_ring_buffers.h
+++ b/src/lib/text_ring_buffers.h
@@ -29,10 +29,10 @@
 class TextRingBuffers
 {
 public:
-       void put (PlayerText text, DCPTextTrack track, DCPTimePeriod period);
+       void put (PlayerText text, DCPTextTrack track, dcpomatic::DCPTimePeriod period);
 
        struct Data {
-               Data (PlayerText text_, DCPTextTrack track_, DCPTimePeriod period_)
+               Data (PlayerText text_, DCPTextTrack track_, dcpomatic::DCPTimePeriod period_)
                        : text (text_)
                        , track (track_)
                        , period (period_)
@@ -40,7 +40,7 @@ public:
 
                PlayerText text;
                DCPTextTrack track;
-               DCPTimePeriod period;
+               dcpomatic::DCPTimePeriod period;
        };
 
        boost::optional<Data> get ();

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 340af1ea839ba8c96c75f39fcc7f671ea254255b..1f6fba96302b4f9b3dc8943374860221fcc7b1cf 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -106,6 +106,7 @@ using boost::scoped_array;
 using dcp::Size;
 using dcp::raw_convert;
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 /** Path to our executable, required by the stacktrace stuff and filled
  *  in during App::onInit().

diff --git a/src/lib/util.h b/src/lib/util.h
index 6cb818b3976ad81db3ea366b6e2ecf078475b97d..b760f7f4bc12f7dc35ecae5057b8e034d757ae03 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -72,7 +72,7 @@ class AudioBuffers;
 class TextDecoder;
 
 extern std::string seconds_to_hms (int);
-extern std::string time_to_hmsf (DCPTime time, Frame rate);
+extern std::string time_to_hmsf (dcpomatic::DCPTime time, Frame rate);
 extern std::string seconds_to_approximate_hms (int);
 extern double seconds (struct timeval);
 extern void dcpomatic_setup ();
@@ -105,7 +105,7 @@ extern void checked_fread (void* ptr, size_t size, FILE* stream, boost::filesyst
 extern void checked_fwrite (void const * ptr, size_t size, FILE* stream, boost::filesystem::path path);
 extern size_t utf8_strlen (std::string s);
 extern std::string day_of_week_to_string (boost::gregorian::greg_weekday d);
-extern void emit_subtitle_image (ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, boost::shared_ptr<TextDecoder> decoder);
+extern void emit_subtitle_image (dcpomatic::ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, boost::shared_ptr<TextDecoder> decoder);
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 extern boost::shared_ptr<dcp::CertificateChain> read_swaroop_chain (boost::filesystem::path path);
 extern void write_swaroop_chain (boost::shared_ptr<const dcp::CertificateChain> chain, boost::filesystem::path output);

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index fe35b0df3e800415b097691e59d8bc90e8d315e5..d8d8adbf8becc2372bd331ef67e759a69284884d 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -61,6 +61,7 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 VideoContent::VideoContent (Content* parent)
        : ContentPart (parent)

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 7ecc2813a067cf70f83509f5f1fe6aa23bf755ce..3d07a09470061049396b3aefa06a3bd7392a2e32 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -168,8 +168,8 @@ public:
        void take_from_examiner (boost::shared_ptr<VideoExaminer>);
        void add_properties (std::list<UserProperty> &) const;
 
-       void modify_position (boost::shared_ptr<const Film> film, DCPTime& pos) const;
-       void modify_trim_start (ContentTime& pos) const;
+       void modify_position (boost::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
+       void modify_trim_start (dcpomatic::ContentTime& pos) const;
 
        static boost::shared_ptr<VideoContent> from_xml (Content* parent, cxml::ConstNodePtr, int);
 

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 813320eb86f89ecd5518a315df121a9011500411..9f29a03bfbf8009ddc42a45e9a7539c5d4c6f627 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -35,6 +35,7 @@ using std::max;
 using std::back_inserter;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c)
        : DecoderPart (parent)

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 0fc7ca5a404832a34ba5daadcd567611a5eaa277..c2ba8386ebfa7475a8a7e9aec757e232da60bb6e 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -51,7 +51,7 @@ public:
        friend struct ffmpeg_pts_offset_test;
        friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length);
 
-       ContentTime position (boost::shared_ptr<const Film>) const {
+       dcpomatic::ContentTime position (boost::shared_ptr<const Film>) const {
                return _position;
        }
 
@@ -65,7 +65,7 @@ private:
        /** Time of last thing to be emitted */
        boost::shared_ptr<const Content> _content;
        boost::optional<Frame> _last_emitted;
-       ContentTime _position;
+       dcpomatic::ContentTime _position;
 };
 
 #endif

diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc
index 436046890bb9c709497450ac6d1e5de7d070bed0..bf8bb9f469b22fb772c9b547f8876e40284f4175 100644 (file)
--- a/src/lib/video_mxf_content.cc
+++ b/src/lib/video_mxf_content.cc
@@ -35,6 +35,7 @@
 using std::list;
 using std::string;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 VideoMXFContent::VideoMXFContent (boost::filesystem::path path)
        : Content (path)

diff --git a/src/lib/video_mxf_content.h b/src/lib/video_mxf_content.h
index 27dce1fb7db2f977b8f86aa0c82ff00cd4d6407e..dd470335c061209ec3b253dcec553eaa0265fc10 100644 (file)
--- a/src/lib/video_mxf_content.h
+++ b/src/lib/video_mxf_content.h
@@ -39,8 +39,8 @@ public:
        std::string technical_summary () const;
        std::string identifier () const;
        void as_xml (xmlpp::Node* node, bool with_paths) const;
-       DCPTime full_length (boost::shared_ptr<const Film> film) const;
-       DCPTime approximate_length () const;
+       dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime approximate_length () const;
        void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
 
        static bool valid_mxf (boost::filesystem::path path);

diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index 3c4002ca2b6d9acbbe20079627ebd5f3f39f0c94..1bf2b1bef87737957f55dc92f873b4d761b82b5e 100644 (file)
--- a/src/lib/video_mxf_decoder.cc
+++ b/src/lib/video_mxf_decoder.cc
@@ -30,6 +30,7 @@
 
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const Film> film, shared_ptr<const VideoMXFContent> content)
        : Decoder (film)

diff --git a/src/lib/video_mxf_decoder.h b/src/lib/video_mxf_decoder.h
index 3e3760d97f7e75963e5df014b55ee79d7cbd4d38..78313df0f332ec42ab06631f188ae737fe66ca3e 100644 (file)
--- a/src/lib/video_mxf_decoder.h
+++ b/src/lib/video_mxf_decoder.h
@@ -31,13 +31,13 @@ public:
        VideoMXFDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const VideoMXFContent>);
 
        bool pass ();
-       void seek (ContentTime t, bool accurate);
+       void seek (dcpomatic::ContentTime t, bool accurate);
 
 private:
 
        boost::shared_ptr<const VideoMXFContent> _content;
        /** Time of next thing to return from pass */
-       ContentTime _next;
+       dcpomatic::ContentTime _next;
 
        boost::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
        boost::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;

diff --git a/src/lib/video_ring_buffers.cc b/src/lib/video_ring_buffers.cc
index 0167f4aec4309c62ba47d1966ee04cba278ced5a..bfec507ea4f84a5b22e82271e5966e33e9771e2a 100644 (file)
--- a/src/lib/video_ring_buffers.cc
+++ b/src/lib/video_ring_buffers.cc
@@ -32,6 +32,7 @@ using std::pair;
 using std::string;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 void
 VideoRingBuffers::put (shared_ptr<PlayerVideo> frame, DCPTime time)

diff --git a/src/lib/video_ring_buffers.h b/src/lib/video_ring_buffers.h
index f3e521553168f938448b9a7436fad604b0d1ce59..ba1b2162f952218feccb8ee1c30b9c1d033d7a96 100644 (file)
--- a/src/lib/video_ring_buffers.h
+++ b/src/lib/video_ring_buffers.h
@@ -31,8 +31,8 @@ class PlayerVideo;
 class VideoRingBuffers : public boost::noncopyable
 {
 public:
-       void put (boost::shared_ptr<PlayerVideo> frame, DCPTime time);
-       std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> get ();
+       void put (boost::shared_ptr<PlayerVideo> frame, dcpomatic::DCPTime time);
+       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> get ();
 
        void clear ();
        Frame size () const;
@@ -42,5 +42,5 @@ public:
 
 private:
        mutable boost::mutex _mutex;
-       std::list<std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> > _data;
+       std::list<std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> > _data;
 };

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 79e5c8c3695dccf9e23d3726889a267004509725..3fc01571e559756fc9506bc818a4e07a1e09d258 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -63,6 +63,7 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::Data;
+using namespace dcpomatic;
 
 Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
        : _film (film)

diff --git a/src/lib/writer.h b/src/lib/writer.h
index e08e9f28d0d19e06d51fcd1e2d2baab4203c68d8..ce1d04cedb8c239087bd444c05daa4f859f20b14 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -104,8 +104,8 @@ public:
        void fake_write (Frame, Eyes);
        bool can_repeat (Frame) const;
        void repeat (Frame, Eyes);
-       void write (boost::shared_ptr<const AudioBuffers>, DCPTime time);
-       void write (PlayerText text, TextType type, boost::optional<DCPTextTrack>, DCPTimePeriod period);
+       void write (boost::shared_ptr<const AudioBuffers>, dcpomatic::DCPTime time);
+       void write (PlayerText text, TextType type, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod period);
        void write (std::list<boost::shared_ptr<Font> > fonts);
        void write (ReferencedReelAsset asset);
        void finish ();

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 8422df28e78ff24dcf7666a5b5b757870a05d629..3ba63379bbbecb820c3ad30fd82aeff1fa4fff13 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -89,6 +89,7 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 using boost::thread;
 using boost::bind;
+using namespace dcpomatic;
 
 enum {
        ID_file_open = 1,

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index f4de9cd1aac5b1ddc82f3738d48ac14fb0d68f72..9b3a9376937d4c4c94cf9ec601c4d9613055c48f 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -42,6 +42,7 @@ using boost::bind;
 using boost::optional;
 using boost::const_pointer_cast;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 /** @param parent Parent window.
  *  @param film Film we are using.

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 38f474afda0200de1f9f7385a7f1a5694d3bf063..e866aca3f83a8823d0a52e76edd8e1a07440782d 100644 (file)
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -35,7 +35,7 @@ public:
 
        bool Show (bool show = true);
 
-       void set_cursor (boost::optional<DCPTime> time, boost::optional<float> db);
+       void set_cursor (boost::optional<dcpomatic::DCPTime> time, boost::optional<float> db);
 
 private:
        void film_change (ChangeType, int);

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 079f69cdc005cc03478f7a370376ef5909bd7d63..3da7a50ff2c57dfe515e8a0c16c7c66d816d3dcd 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -37,6 +37,7 @@ using std::map;
 using boost::bind;
 using boost::optional;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 int const AudioPlot::_minimum = -70;
 int const AudioPlot::_cursor_size = 8;

diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index 85306a58d4ee45acf2e210775f9100a094178e87..edb444a2ab9047ed75b7021d7d5df2ebdea6129d 100644 (file)
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -41,7 +41,7 @@ public:
 
        wxColour colour (int n) const;
 
-       boost::signals2::signal<void (boost::optional<DCPTime>, boost::optional<float>)> Cursor;
+       boost::signals2::signal<void (boost::optional<dcpomatic::DCPTime>, boost::optional<float>)> Cursor;
 
        static const int max_smoothing;
 
@@ -52,14 +52,14 @@ private:
                        : db(0)
                {}
 
-               Point (wxPoint draw_, DCPTime time_, float db_)
+               Point (wxPoint draw_, dcpomatic::DCPTime time_, float db_)
                        : draw(draw_)
                        , time(time_)
                        , db(db_)
                {}
 
                wxPoint draw;
-               DCPTime time;
+               dcpomatic::DCPTime time;
                float db;
        };
 

diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 44e6b8da1d9162423bdafdfaab261935cfe9e3ff..061262cddcc96eff127cac8dfcf5b8661e587f77 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -35,6 +35,7 @@ using std::make_pair;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
        : wxDialog (parent, wxID_ANY, _("Closed captions"), wxDefaultPosition, wxDefaultSize,

diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index 4b407fa5a7a7c49ae2631ace6979cba235b88bc9..fb4e9d59b40c5569e90a02c5013f28bd2a051531 100644 (file)
--- a/src/wx/closed_captions_dialog.h
+++ b/src/wx/closed_captions_dialog.h
@@ -31,7 +31,7 @@ class ClosedCaptionsDialog : public wxDialog
 public:
        explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
 
-       void update (DCPTime);
+       void update (dcpomatic::DCPTime);
        void clear ();
        void set_film_and_butler (boost::shared_ptr<Film>, boost::weak_ptr<Butler>);
 
@@ -47,5 +47,5 @@ private:
        std::vector<wxString> _lines;
        std::vector<DCPTextTrack> _tracks;
        boost::weak_ptr<Butler> _butler;
-       DCPTime _last_update;
+       dcpomatic::DCPTime _last_update;
 };

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 82caaf1ff01d4199cf08a62311c78426f11dc676..72ef0e9ebde3c3cb81e2808a9ec17325ca50fca7 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -61,6 +61,7 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using namespace dcpomatic;
 
 class LimitedSplitter : public wxSplitterWindow
 {

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index 4db00fb540de766e7a9c7ea289c7d3212b96ba70..d4ef39cb96210ebb9000823e9c4f42adb1a2767a 100644 (file)
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -39,6 +39,7 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 ContentView::ContentView (wxWindow* parent)
        : wxListCtrl (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER)

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 473ad8cb343e40ab1413f570dfdf3df8172b0185..7cd31634dd218792998ffccf4bfb594ad279f82c 100644 (file)
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -52,6 +52,7 @@ using boost::optional;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
        : wxPanel (parent)

diff --git a/src/wx/controls.h b/src/wx/controls.h
index 7ffe0c4ea5b1c8ebeaabc0c17a4e78230b7de64c..88d21defb8bedd6ca45c0c9dbf95eeb17db70591 100644 (file)
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -83,7 +83,7 @@ private:
        void jump_to_selected_clicked ();
        void timecode_clicked ();
        void active_jobs_changed (boost::optional<std::string>);
-       DCPTime nudge_amount (wxKeyboardState& ev);
+       dcpomatic::DCPTime nudge_amount (wxKeyboardState& ev);
        void image_changed (boost::weak_ptr<PlayerVideo>);
        void outline_content_changed ();
        void eye_changed ();

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index a803eeda18f0bbed8cabf987c2020ec2a0d9ffae..48fbf9fdce1eba2062a2ed72b67fc5d91f6d9ccc 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -67,6 +67,7 @@ using boost::dynamic_pointer_cast;
 using boost::weak_ptr;
 using boost::optional;
 using dcp::Size;
+using namespace dcpomatic;
 
 static
 int

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 97da5f59185e8c1b030b0abb2e683c866e8c4ced..0222d31c95bf487e9dd2375162b5c5a199334c42 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -59,14 +59,14 @@ public:
                return _film;
        }
 
-       void seek (DCPTime t, bool accurate);
-       void seek (boost::shared_ptr<Content> content, ContentTime p, bool accurate);
-       void seek_by (DCPTime by, bool accurate);
+       void seek (dcpomatic::DCPTime t, bool accurate);
+       void seek (boost::shared_ptr<Content> content, dcpomatic::ContentTime p, bool accurate);
+       void seek_by (dcpomatic::DCPTime by, bool accurate);
        /** @return our `playhead' position; this may not lie exactly on a frame boundary */
-       DCPTime position () const {
+       dcpomatic::DCPTime position () const {
                return _video_position;
        }
-       DCPTime one_video_frame () const;
+       dcpomatic::DCPTime one_video_frame () const;
 
        void start ();
        bool stop ();
@@ -106,8 +106,8 @@ public:
 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
        boost::signals2::signal<void ()> PositionChanged;
-       boost::signals2::signal<void (DCPTime)> Started;
-       boost::signals2::signal<void (DCPTime)> Stopped;
+       boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
+       boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
        /** While playing back we reached the end of the film (emitted from GUI thread) */
        boost::signals2::signal<void ()> Finished;
 
@@ -126,8 +126,8 @@ private:
        void config_changed (Config::Property);
        bool maybe_draw_background_image (wxPaintDC& dc);
 
-       DCPTime time () const;
-       DCPTime uncorrected_time () const;
+       dcpomatic::DCPTime time () const;
+       dcpomatic::DCPTime uncorrected_time () const;
        Frame average_latency () const;
 
        void refresh_panel ();
@@ -142,9 +142,9 @@ private:
        bool _coalesce_player_changes;
        std::list<int> _pending_player_changes;
 
-       std::pair<boost::shared_ptr<PlayerVideo>, DCPTime> _player_video;
+       std::pair<boost::shared_ptr<PlayerVideo>, dcpomatic::DCPTime> _player_video;
        boost::shared_ptr<const Image> _frame;
-       DCPTime _video_position;
+       dcpomatic::DCPTime _video_position;
        Position<int> _inter_position;
        dcp::Size _inter_size;
 

diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index 46e8e6d091e297bec3e572a5cf3b9010ddc35859..dba4c0c0e5a8aece6fa5b33990af41f0cbf866cc 100644 (file)
--- a/src/wx/markers_dialog.cc
+++ b/src/wx/markers_dialog.cc
@@ -36,6 +36,7 @@ using boost::bind;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
+using dcpomatic::DCPTime;
 
 class Marker
 {
@@ -100,7 +101,7 @@ private:
        weak_ptr<FilmViewer> viewer;
        dcp::Marker type;
        CheckBox* checkbox;
-       Timecode<DCPTime>* timecode;
+       Timecode<dcpomatic::DCPTime>* timecode;
        Button* set_button;
 };
 

diff --git a/src/wx/move_to_dialog.cc b/src/wx/move_to_dialog.cc
index cb3db90cca14f00e97bc7a3785da681c8e360ff8..266f44264c97f33e966ae6d3e68224f9f34a1aa4 100644 (file)
--- a/src/wx/move_to_dialog.cc
+++ b/src/wx/move_to_dialog.cc
@@ -26,6 +26,7 @@
 using std::list;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 MoveToDialog::MoveToDialog (wxWindow* parent, optional<DCPTime> position, shared_ptr<const Film> film)
        : TableDialog (parent, _("Move content"), 2, 0, true)

diff --git a/src/wx/move_to_dialog.h b/src/wx/move_to_dialog.h
index 4d8d991f51ed209680d47217633c33af7b186e87..3c6f3d064d4610f926f1f64ec7cffd44ccc07377 100644 (file)
--- a/src/wx/move_to_dialog.h
+++ b/src/wx/move_to_dialog.h
@@ -29,9 +29,9 @@ class wxSpinCtrl;
 class MoveToDialog : public TableDialog
 {
 public:
-       MoveToDialog (wxWindow* parent, boost::optional<DCPTime> position, boost::shared_ptr<const Film> film);
+       MoveToDialog (wxWindow* parent, boost::optional<dcpomatic::DCPTime> position, boost::shared_ptr<const Film> film);
 
-       DCPTime position () const;
+       dcpomatic::DCPTime position () const;
 
 private:
        boost::weak_ptr<const Film> _film;

diff --git a/src/wx/playhead_to_frame_dialog.cc b/src/wx/playhead_to_frame_dialog.cc
index 1ae049d26ce9ea2429bc57e189c21e6724b7f48b..4c8bc1cc6ede06f9ca03014808684517dfb68743 100644 (file)
--- a/src/wx/playhead_to_frame_dialog.cc
+++ b/src/wx/playhead_to_frame_dialog.cc
@@ -22,6 +22,7 @@
 #include <dcp/locale_convert.h>
 
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 PlayheadToFrameDialog::PlayheadToFrameDialog (wxWindow* parent, int fps)
        : TableDialog (parent, _("Go to frame"), 2, 1, true)

diff --git a/src/wx/playhead_to_frame_dialog.h b/src/wx/playhead_to_frame_dialog.h
index b6a902a55227f10506e66fd830e961ec3c1e9fc9..ab3898dea1f004e9f1bc717e26cae8d36ce00591 100644 (file)
--- a/src/wx/playhead_to_frame_dialog.h
+++ b/src/wx/playhead_to_frame_dialog.h
@@ -26,7 +26,7 @@ class PlayheadToFrameDialog : public TableDialog
 public:
        PlayheadToFrameDialog (wxWindow* parent, int fps);
 
-       DCPTime get () const;
+       dcpomatic::DCPTime get () const;
 
 private:
        wxTextCtrl* _frame;

diff --git a/src/wx/playhead_to_timecode_dialog.cc b/src/wx/playhead_to_timecode_dialog.cc
index a691aa64e0f7cfc260e9ddd754da11ea04e99176..c622111db52893f225b2fba264165a3e02455b8c 100644 (file)
--- a/src/wx/playhead_to_timecode_dialog.cc
+++ b/src/wx/playhead_to_timecode_dialog.cc
@@ -20,6 +20,8 @@
 
 #include "playhead_to_timecode_dialog.h"
 
+using namespace dcpomatic;
+
 PlayheadToTimecodeDialog::PlayheadToTimecodeDialog (wxWindow* parent, int fps)
        : TableDialog (parent, _("Go to timecode"), 2, 1, true)
        , _fps (fps)

diff --git a/src/wx/playhead_to_timecode_dialog.h b/src/wx/playhead_to_timecode_dialog.h
index adce874342879a7c01c42a22dfe2c6173aa24025..22697858263ffe366f85930a988fe9f090fe869a 100644 (file)
--- a/src/wx/playhead_to_timecode_dialog.h
+++ b/src/wx/playhead_to_timecode_dialog.h
@@ -26,9 +26,9 @@ class PlayheadToTimecodeDialog : public TableDialog
 public:
        PlayheadToTimecodeDialog (wxWindow* parent, int fps);
 
-       DCPTime get () const;
+       dcpomatic::DCPTime get () const;
 
 private:
-       Timecode<DCPTime>* _timecode;
+       Timecode<dcpomatic::DCPTime>* _timecode;
        int _fps;
 };

diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index ad4c038503b1e25567e0baa8b8a03a49ef334284..76e8d8b16d00f1df23698d07257278779f43f14d 100644 (file)
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -40,6 +40,7 @@ using boost::shared_ptr;
 using boost::bind;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using namespace dcpomatic;
 
 int const SubtitleAppearanceDialog::NONE = 0;
 int const SubtitleAppearanceDialog::OUTLINE = 1;

diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index 0b3c661326c95feb81b9800f643b6f9c8e35b508..6c7e468178dc638c2fd0e742e4a4fedef5530dbf 100644 (file)
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -58,9 +58,9 @@ private:
        wxCheckBox* _force_effect_colour;
        wxColourPickerCtrl* _effect_colour;
        wxCheckBox* _force_fade_in;
-       Timecode<ContentTime>* _fade_in;
+       Timecode<dcpomatic::ContentTime>* _fade_in;
        wxCheckBox* _force_fade_out;
-       Timecode<ContentTime>* _fade_out;
+       Timecode<dcpomatic::ContentTime>* _fade_out;
        wxSpinCtrl* _outline_width;
        wxGridBagSizer* _table;
        std::map<RGBA, RGBAColourPicker*> _pickers;

diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc
index 33db37babb57f1bedecaab84a2e50e5b055a9344..d557d09e9b8fe9190c7d7882fd455ccbcfaa8f2d 100644 (file)
--- a/src/wx/swaroop_controls.cc
+++ b/src/wx/swaroop_controls.cc
@@ -41,6 +41,7 @@ using std::sort;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using namespace dcpomatic;
 
 SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewer)
        : Controls (parent, viewer, false)

diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc
index 9b591b19161406408c88bef739a4c4323a1f91d0..271e02d41a357a4050a27715362c0d921a0f0564 100644 (file)
--- a/src/wx/text_view.cc
+++ b/src/wx/text_view.cc
@@ -35,6 +35,7 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::bind;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
 TextView::TextView (
        wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content, shared_ptr<TextContent> text, shared_ptr<Decoder> decoder, weak_ptr<FilmViewer> viewer

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index 1fe07a99919f14b588edcc37ffe69351d02aad85..6ce22dc799dfa9f579b733a0a023faf2bc10a1f9 100644 (file)
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -42,14 +42,14 @@ public:
 
 private:
        void data_start (ContentStringText cts);
-       void data_stop (ContentTime time);
+       void data_stop (dcpomatic::ContentTime time);
        void subtitle_selected (wxListEvent &);
 
        wxListCtrl* _list;
        int _subs;
        boost::optional<FrameRateChange> _frc;
        boost::optional<int> _last_count;
-       std::vector<ContentTime> _start_times;
+       std::vector<dcpomatic::ContentTime> _start_times;
        boost::weak_ptr<Content> _content;
        boost::weak_ptr<FilmViewer> _film_viewer;
 };

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index de5f05ae78ae09703e4541876bab31fb4d8e46fe..2c510efb5bc2ebe08760e494c2cb8c057d0dd744 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -54,6 +54,7 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
+using namespace dcpomatic;
 
 /* 3 hours in 640 pixels */
 double const Timeline::_minimum_pixels_per_second = 640.0 / (60 * 60 * 3);

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index a7f34586305875dc6ce14261d2a9949d3d540505..84cb870f24209f6d055d84a490ac9848d2c5b096 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -107,7 +107,7 @@ private:
        boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &);
        TimelineContentViewList selected_views () const;
        ContentList selected_content () const;
-       void maybe_snap (DCPTime a, DCPTime b, boost::optional<DCPTime>& nearest_distance) const;
+       void maybe_snap (dcpomatic::DCPTime a, dcpomatic::DCPTime b, boost::optional<dcpomatic::DCPTime>& nearest_distance) const;
 
        wxScrolledCanvas* _labels_canvas;
        wxScrolledCanvas* _main_canvas;
@@ -123,12 +123,12 @@ private:
        wxPoint _down_point;
        boost::optional<wxPoint> _zoom_point;
        boost::shared_ptr<TimelineContentView> _down_view;
-       DCPTime _down_view_position;
+       dcpomatic::DCPTime _down_view_position;
        bool _first_move;
        ContentMenu _menu;
        bool _snap;
-       std::list<DCPTime> _start_snaps;
-       std::list<DCPTime> _end_snaps;
+       std::list<dcpomatic::DCPTime> _start_snaps;
+       std::list<dcpomatic::DCPTime> _end_snaps;
        Tool _tool;
        int _x_scroll_rate;
        int _y_scroll_rate;

diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index a55526c88604378691ce162ebf485d20dc0b85a5..6902a11d62633785e1f0d3dd910793e378a4a9ca 100644 (file)
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -27,6 +27,7 @@
 
 using std::list;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
        : TimelineView (tl)

diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc
index f09a52a53b7724e5bec35514bc3d709c93fb55f3..fa89c60a7c82fdf7cda862d87856a83ad8b87b3c 100644 (file)
--- a/src/wx/timeline_reels_view.cc
+++ b/src/wx/timeline_reels_view.cc
@@ -26,6 +26,7 @@
 
 using std::min;
 using std::list;
+using namespace dcpomatic;
 
 TimelineReelsView::TimelineReelsView (Timeline& tl, int y)
        : TimelineView (tl)

diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc
index a31ed5cedd3f7265736ccf5bf5ba5c65a0253c83..e9de1b542fab6b1777993b09a920009d420903bc 100644 (file)
--- a/src/wx/timeline_time_axis_view.cc
+++ b/src/wx/timeline_time_axis_view.cc
@@ -26,6 +26,7 @@
 
 using std::list;
 using std::cout;
+using namespace dcpomatic;
 
 TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
        : TimelineView (tl)

diff --git a/src/wx/timeline_view.cc b/src/wx/timeline_view.cc
index bb6ab6034c1439a81ac23802b6e5c5434c246ddf..fb23fa7b15a896fe220d068688b91b47cd696ece 100644 (file)
--- a/src/wx/timeline_view.cc
+++ b/src/wx/timeline_view.cc
@@ -22,6 +22,7 @@
 #include "timeline.h"
 
 using std::list;
+using namespace dcpomatic;
 
 /** @class TimelineView
  *  @brief Parent class for components of the timeline (e.g. a piece of content or an axis).

diff --git a/src/wx/timeline_view.h b/src/wx/timeline_view.h
index f0ded7bce1583c8478f3c663f95036448f0e1e29..d94e101244de0d028e941b9a9972c15cadf0e0fd 100644 (file)
--- a/src/wx/timeline_view.h
+++ b/src/wx/timeline_view.h
@@ -45,7 +45,7 @@ public:
 protected:
        virtual void do_paint (wxGraphicsContext *, std::list<dcpomatic::Rect<int> > overlaps) = 0;
 
-       int time_x (DCPTime t) const;
+       int time_x (dcpomatic::DCPTime t) const;
 
        Timeline& _timeline;
 

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index f10815ca42c1ce44f5305b79ea8a4666f4c9eeb0..06d655b6bde6138a9411f3616e01828b3a9cacbd 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -48,6 +48,7 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer)
        /* horrid hack for apparent lack of context support with wxWidgets i18n code */

diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h
index 65d8aabc94e124ce8cceeccdf8f885fc95f0d6d3..962a7fedcb17b3fd7bb8a18709f6b9e9a8ab1924 100644 (file)
--- a/src/wx/timing_panel.h
+++ b/src/wx/timing_panel.h
@@ -57,18 +57,18 @@ private:
        wxStaticText* _colon[3];
        wxStaticText* _tip;
        wxStaticText* _position_label;
-       Timecode<DCPTime>* _position;
+       Timecode<dcpomatic::DCPTime>* _position;
        wxButton* _move_to_start_of_reel;
        wxStaticText* _full_length_label;
-       Timecode<DCPTime>* _full_length;
+       Timecode<dcpomatic::DCPTime>* _full_length;
        wxStaticText* _trim_start_label;
-       Timecode<ContentTime>* _trim_start;
+       Timecode<dcpomatic::ContentTime>* _trim_start;
        wxButton* _trim_start_to_playhead;
        wxButton* _trim_end_to_playhead;
        wxStaticText* _trim_end_label;
-       Timecode<ContentTime>* _trim_end;
+       Timecode<dcpomatic::ContentTime>* _trim_end;
        wxStaticText* _play_length_label;
-       Timecode<DCPTime>* _play_length;
+       Timecode<dcpomatic::DCPTime>* _play_length;
        wxStaticText* _video_frame_rate_label;
        wxTextCtrl* _video_frame_rate;
        wxButton* _set_video_frame_rate;

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 6615215d5e7efe2770fc357404ac8768fe7230a3..9c044e1889f51109517276899ef7350135a9aa26 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -51,6 +51,7 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
 using boost::optional;
+using namespace dcpomatic;
 
 static VideoContentScale
 index_to_scale (int n)

diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 795a52a78f2cfa33c5227a3dcb93efaf84a23ed6..8e9a77cab97360c89f546cfb730227466b2e8f2f 100644 (file)
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -70,9 +70,9 @@ private:
        wxStaticText* _bottom_crop_label;
        ContentSpinCtrl<VideoContent>* _bottom_crop;
        wxStaticText* _fade_in_label;
-       Timecode<ContentTime>* _fade_in;
+       Timecode<dcpomatic::ContentTime>* _fade_in;
        wxStaticText* _fade_out_label;
-       Timecode<ContentTime>* _fade_out;
+       Timecode<dcpomatic::ContentTime>* _fade_out;
        wxStaticText* _scale_to_label;
        ContentChoice<VideoContent, VideoContentScale>* _scale;
        wxStaticText* _description;

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 1a537c0875759f16cafe388a1a4f739cb46cde22..d2f463b73ea47dcc7f2792f64e88083235659c2e 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -44,6 +44,7 @@ using std::pair;
 using boost::shared_ptr;
 using boost::optional;
 using dcp::locale_convert;
+using namespace dcpomatic;
 
 wxStaticText *
 #ifdef __WXOSX__

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 1b3c4a2aec19c577c58a6883deba627e2a271f5a..400493f1883203a223be2745811e890af42c70a4 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -84,7 +84,7 @@ extern wxString std_to_wx (std::string);
 extern void dcpomatic_setup_i18n ();
 extern wxString context_translation (wxString);
 extern std::string string_client_data (wxClientData* o);
-extern wxString time_to_timecode (DCPTime t, double fps);
+extern wxString time_to_timecode (dcpomatic::DCPTime t, double fps);
 extern void setup_audio_channels_choice (wxChoice* choice, int minimum);
 extern wxSplashScreen* maybe_show_splash ();
 extern double calculate_mark_interval (double start);

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index a2da8d6900122d7bc9156173216f147f608e2a57..5d65ab693c5f6cbd7394e123cb0aaf2b9f057637 100644 (file)
--- 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 1484213e72b76d54b617355252414a86faa9d589..4a1f689dd9b6bd4a07b6a88105f269c755b0510d 100644 (file)
--- 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 9ebd64ded972bde2bf93d1d824a3bf1ccf3a649c..782451a7d07a3861ab48f649d9b2df7ec32afc28 100644 (file)
--- 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 91edcad9f46c4113080965a1c8746647a2bb60cd..8bd2c46b8684e8cfac4506e4c213ccda4b3060df 100644 (file)
--- 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 93e141c42ff199fc74970063cc53d3f53edba725..cc28412689937c4db139ffa0fb2f19b6f33dbe69 100644 (file)
--- 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 55e34ac5f0fb170596494dccb184d865f772078d..2f8963f5bfed20afee24b899aa638685ee3c60c2 100644 (file)
--- 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 04a0eabe3f5474fdbd84e04c6148ee4f65fffb88..9fef1801b83e8f84a5bd433ec7bcfbde57835909 100644 (file)
--- 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 89eb11a6056b724ed4b232d4c643f30c8b1b03bc..150cd85390e2906a53e264bc30b00625d7059ed3 100644 (file)
--- 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 1637738ad7c7fb66c623f8c043f41e7e709100cc..5b58c369b047fe3a9b05ae10777d819258d302d3 100644 (file)
--- 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 86ce2075c06c31535b448e90c71b9dd9a7e15ffc..428d0f9bb3e75d4c1bb9ac99f92a225068682ade 100644 (file)
--- 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 c69c74c685c5422f38d33d8391b4a06ba64a4b9b..3e825e4433383f455469ae2a52d3011fba47042a 100644 (file)
--- 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 892bc9e4c0909978f4c47be157cda4867badadde..f99229c65d27962c864e0db8a712f008ab4122b0 100644 (file)
--- 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 1e001f0c8f6ac50b630c16f79d25dbef5f45e956..dd10bd4a142287dc65ddf1e415c87e7b8e75cac5 100644 (file)
--- 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 d4614e226cceb84246b40019c7a09a0906e0fd9f..b6b2bbf06c5ee543845c31c3644fba430c779800 100644 (file)
--- 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 18f89713e756d85e7ed529c434ad118f39811c92..f4bf6df3525d7053aa648ecbd24c17f8dca2935a 100644 (file)
--- 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 1736bfc7ea6f1f0f1409c2d617681cd7450c41c0..7b65783c6047dcfd646b1cae21e44bbc3550a531 100644 (file)
--- 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 eea9ebfbe309c84ca36cdb73f04b37a00d1c0f38..15e386d59c29b679616443563882db3289794ec9 100644 (file)
--- 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 070cb235d512cc826c53202540a18a3707d6435d..b15f4691b1cccf3a22ae4d6930af29020ee1021e 100644 (file)
--- 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 0c1f0716166eff0c0a1a9265ab1e736bb3195563..eefdb4122ceb4bd6cc62b908ffd911693234c975 100644 (file)
--- 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 2380449d8a4d9c8cee6aa345e41864df95d3ea3d..966fc66b6f12910fd6cf9f47274ad4752a6b589c 100644 (file)
--- 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 e995a4ed00693a8f7d0e32dec33cfb170553d165..968138f96adb35be43578c83c99ef98fcbb8c9b6 100644 (file)
--- 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 5525eb081cf2106bf0762f1099c327e7c2bef782..10d343268c12520084e779627c93dd534128fe8b 100644 (file)
--- 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 5643310c61efa974743e88e5f96abdc151c59488..545f081bacaf2c40c8a8bac15f196bb264cfdf7d 100644 (file)
--- 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 1e13efa82f456959d4cf538c70dd809fbf7c657f..709bb082757d5bc44e7d11c65ed891bb94d81f2a 100644 (file)
--- 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 6862a12043fa9a497f4ee79f99006a31dc8ef541..307d26ea61824f41d24402aed302c579963e1e53 100644 (file)
--- 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)