Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0

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

diff --git a/src/lib/film.h b/src/lib/film.h
index a30a630b99096ee82a68572c1378c0a7677d79d1..6bd04572b4f771979dfee6cf568652a4d22da2fd 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -58,15 +58,15 @@ class Film : public boost::enable_shared_from_this<Film>, public boost::noncopya
 public:
        Film (boost::filesystem::path);
 
-       std::string info_dir () const;
-       std::string j2c_path (int, Eyes, bool) const;
-       std::string info_path (int, Eyes) const;
-       std::string internal_video_mxf_dir () const;
-       std::string internal_video_mxf_filename () const;
+       boost::filesystem::path info_dir () const;
+       boost::filesystem::path j2c_path (int, Eyes, bool) const;
+       boost::filesystem::path info_path (int, Eyes) const;
+       boost::filesystem::path internal_video_mxf_dir () const;
+       boost::filesystem::path internal_video_mxf_filename () const;
        boost::filesystem::path audio_analysis_path (boost::shared_ptr<const AudioContent>) const;
 
-       std::string video_mxf_filename () const;
-       std::string audio_mxf_filename () const;
+       boost::filesystem::path video_mxf_filename () const;
+       boost::filesystem::path audio_mxf_filename () const;
 
        void send_dcp_to_tms ();
        void make_dcp ();
@@ -80,8 +80,8 @@ public:
 
        int encoded_frames () const;
        
-       std::string file (std::string f) const;
-       std::string dir (std::string d) const;
+       boost::filesystem::path file (boost::filesystem::path f) const;
+       boost::filesystem::path dir (boost::filesystem::path d) const;
 
        void read_metadata ();
        void write_metadata () const;
@@ -96,7 +96,7 @@ public:
 
        libdcp::Size full_frame () const;
 
-       bool have_dcp () const;
+       std::list<boost::filesystem::path> dcps () const;
 
        boost::shared_ptr<Player> make_player () const;
        boost::shared_ptr<Playlist> playlist () const;
@@ -111,13 +111,22 @@ public:
        /* Proxies for some Playlist methods */
 
        ContentList content () const;
-
        Time length () const;
        bool has_subtitles () const;
        OutputVideoFrame best_video_frame_rate () const;
+       bool content_paths_valid () const;
 
+       libdcp::KDM
+       make_kdm (
+               boost::shared_ptr<libdcp::Certificate> target,
+               boost::filesystem::path dcp,
+               boost::posix_time::ptime from,
+               boost::posix_time::ptime until
+               ) const;
+       
        std::list<libdcp::KDM> make_kdms (
                std::list<boost::shared_ptr<Screen> >,
+               boost::filesystem::path dcp,
                boost::posix_time::ptime from,
                boost::posix_time::ptime until
                ) const;
@@ -154,7 +163,7 @@ public:
 
        /* GET */
 
-       std::string directory () const {
+       boost::filesystem::path directory () const {
                return _directory;
        }
 
@@ -222,12 +231,14 @@ public:
 
        /* SET */
 
-       void set_directory (std::string);
+       void set_directory (boost::filesystem::path);
        void set_name (std::string);
        void set_use_dci_name (bool);
        void examine_and_add_content (boost::shared_ptr<Content>);
        void add_content (boost::shared_ptr<Content>);
        void remove_content (boost::shared_ptr<Content>);
+       void move_content_earlier (boost::shared_ptr<Content>);
+       void move_content_later (boost::shared_ptr<Content>);
        void set_dcp_content_type (DCPContentType const *);
        void set_container (Ratio const *);
        void set_resolution (Resolution);
@@ -268,7 +279,7 @@ private:
        /** Complete path to directory containing the film metadata;
         *  must not be relative.
         */
-       std::string _directory;
+       boost::filesystem::path _directory;
        
        /** Name for DCP-o-matic */
        std::string _name;