fixup! WIP: stop using video directory and hard-linking (#2756).

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 036bbed7ef3ad8e0a13aa6c24ea5223bbbc52b1b..e48f2658ef8c647c3b7adbb994f0b980964de54c 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -35,6 +35,7 @@
 #include "film_property.h"
 #include "frame_rate_change.h"
 #include "named_channel.h"
+#include "remembered_asset.h"
 #include "resolution.h"
 #include "signaller.h"
 #include "territory_type.h"
@@ -116,11 +117,10 @@ public:
 
        std::shared_ptr<InfoFileHandle> info_file_handle (dcpomatic::DCPTimePeriod period, bool read) 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 (dcpomatic::DCPTimePeriod p) const;
 
        boost::filesystem::path audio_analysis_path (std::shared_ptr<const Playlist>) const;
        boost::filesystem::path subtitle_analysis_path (std::shared_ptr<const Content>) const;
+       boost::filesystem::path assets_path() const;
 
        void send_dcp_to_tms ();
 
@@ -160,7 +160,7 @@ public:
        std::list<DCPTextTrack> closed_caption_tracks () const;
 
        uint64_t required_disk_space () const;
-       bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const;
+       bool should_be_enough_disk_space(double& required, double& available) const;
 
        bool has_sign_language_video_channel () const;
 
@@ -186,7 +186,7 @@ public:
                return _playlist;
        }
 
-       std::list<dcpomatic::DCPTimePeriod> reels () const;
+       std::vector<dcpomatic::DCPTimePeriod> reels() const;
        std::list<int> mapped_audio_channels () const;
 
        boost::optional<dcp::LanguageTag> audio_language () const {
@@ -291,6 +291,10 @@ public:
                return _reel_length;
        }
 
+       std::vector<dcpomatic::DCPTime> custom_reel_boundaries() const {
+               return _custom_reel_boundaries;
+       }
+
        std::string context_id () const {
                return _context_id;
        }
@@ -408,6 +412,7 @@ public:
        void set_audio_processor (AudioProcessor const * processor);
        void set_reel_type (ReelType);
        void set_reel_length (int64_t);
+       void set_custom_reel_boundaries(std::vector<dcpomatic::DCPTime> boundaries);
        void set_reencode_j2k (bool);
        void set_marker (dcp::Marker type, dcpomatic::DCPTime time);
        void unset_marker (dcp::Marker type);
@@ -438,6 +443,10 @@ public:
        boost::optional<std::string> ui_state(std::string key) const;
        void read_ui_state();
 
+       std::vector<RememberedAsset> read_remembered_assets() const;
+       void write_remembered_assets(std::vector<RememberedAsset> const& assets) const;
+       std::string video_identifier() const;
+
        /** Emitted when some property has of the Film is about to change or has changed */
        mutable boost::signals2::signal<void (ChangeType, FilmProperty)> Change;
 
@@ -471,7 +480,6 @@ private:
 
        void signal_change (ChangeType, FilmProperty);
        void signal_change (ChangeType, int);
-       std::string video_identifier () const;
        void playlist_change (ChangeType);
        void playlist_order_changed ();
        void playlist_content_change (ChangeType type, std::weak_ptr<Content>, int, bool frequent);
@@ -527,8 +535,10 @@ private:
        bool _limit_to_smpte_bv20;
        AudioProcessor const * _audio_processor;
        ReelType _reel_type;
-       /** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
+       /** Desired reel length in bytes, if _reel_type == BY_LENGTH */
        int64_t _reel_length;
+       /** Reel boundaries (excluding those at the start and end, sorted in ascending order) if _reel_type == CUSTOM */
+       std::vector<dcpomatic::DCPTime> _custom_reel_boundaries;
        bool _reencode_j2k;
        /** true if the user has ever explicitly set the video frame rate of this film */
        bool _user_explicit_video_frame_rate;