Fix build.

diff --git a/src/lib/film.h b/src/lib/film.h
index 87da8e9d94a80cebf3c75a69227ff547d443fb48..87ea700b7cc19e4d52e4ea8fcdeaf79eab8dd852 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -301,9 +301,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;
        }
 
@@ -341,7 +340,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);
 
@@ -423,7 +422,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/util.h b/src/lib/util.h
index 5177bc28eed7fd9df10a4ddfd8f49a6e2a1d7d5d..b760f7f4bc12f7dc35ecae5057b8e034d757ae03 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -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/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index 46e8e6d091e297bec3e572a5cf3b9010ddc35859..441b4566f54c1cea66e53d26e0d45c1fcf3d3b79 100644 (file)
--- a/src/wx/markers_dialog.cc
+++ b/src/wx/markers_dialog.cc
@@ -47,7 +47,7 @@ public:
        {
                checkbox = new CheckBox(parent, name);
                grid->Add (checkbox, wxGBPosition(row, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-               timecode = new Timecode<DCPTime> (parent);
+               timecode = new Timecode<dcpomatic::DCPTime> (parent);
                grid->Add (timecode, wxGBPosition(row, 1));
                set_button = new Button (parent, _("Set from current position"));
                grid->Add (set_button, wxGBPosition(row, 2));
@@ -55,7 +55,7 @@ public:
                shared_ptr<Film> f = film.lock ();
                DCPOMATIC_ASSERT (f);
 
-               optional<DCPTime> t = f->marker (type);
+               optional<dcpomatic::DCPTime> t = f->marker (type);
                checkbox->SetValue (static_cast<bool>(t));
                if (t) {
                        timecode->set (*t, f->video_frame_rate());
@@ -100,7 +100,7 @@ private:
        weak_ptr<FilmViewer> viewer;
        dcp::Marker type;
        CheckBox* checkbox;
-       Timecode<DCPTime>* timecode;
+       Timecode<dcpomatic::DCPTime>* timecode;
        Button* set_button;
 };