Put Font and Screen into dcpomatic namespace.

[dcpomatic.git] / src / lib / film.h

diff --git a/src/lib/film.h b/src/lib/film.h
index e5d29145c8761a25705fd7f92989c20cbf952f41..87ea700b7cc19e4d52e4ea8fcdeaf79eab8dd852 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -45,12 +45,15 @@ namespace xmlpp {
        class Document;
 }
 
+namespace dcpomatic {
+       class Screen;
+}
+
 class DCPContentType;
 class Log;
 class Content;
 class Playlist;
 class AudioContent;
-class Screen;
 class AudioProcessor;
 class AudioMapping;
 class Ratio;
@@ -71,10 +74,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 +126,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 (
@@ -140,7 +143,7 @@ public:
                ) const;
 
        std::list<ScreenKDM> make_kdms (
-               std::list<boost::shared_ptr<Screen> > screens,
+               std::list<boost::shared_ptr<dcpomatic::Screen> > screens,
                boost::filesystem::path cpl_file,
                boost::posix_time::ptime from,
                boost::posix_time::ptime until,
@@ -163,10 +166,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 +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;
        }
 
@@ -337,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);
 
@@ -419,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;