No-op: remove all trailing whitespace.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index b0f1a86855e9d91100fcbb4e0266650dbcb521f3..5e4c01c868cb46341f073f823182e3b77e436bba 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -66,10 +66,10 @@ public:
 
        boost::filesystem::path info_file () const;
        boost::filesystem::path j2c_path (int, Eyes, bool) const;
-       boost::filesystem::path internal_video_mxf_dir () const;
-       boost::filesystem::path internal_video_mxf_filename () const;
+       boost::filesystem::path internal_video_asset_dir () const;
+       boost::filesystem::path internal_video_asset_filename () const;
 
-       boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
+       boost::filesystem::path audio_analysis_path () const;
 
        void send_dcp_to_tms ();
        void make_dcp ();
@@ -101,14 +101,11 @@ public:
 
        std::vector<CPLSummary> cpls () const;
 
-       boost::shared_ptr<Player> make_player () const;
-       boost::shared_ptr<Playlist> playlist () const;
-
        int audio_frame_rate () const;
 
        uint64_t required_disk_space () const;
        bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const;
-       
+
        /* Proxies for some Playlist methods */
 
        ContentList content () const;
@@ -124,7 +121,7 @@ public:
                dcp::LocalTime until,
                dcp::Formulation formulation
                ) const;
-       
+
        std::list<dcp::EncryptedKDM> make_kdms (
                std::list<boost::shared_ptr<Screen> >,
                boost::filesystem::path cpl_file,
@@ -142,6 +139,8 @@ public:
        void make_audio_mapping_default (AudioMapping & mapping) const;
        std::vector<std::string> audio_output_names () const;
 
+       void repeat_content (ContentList, int);
+
        /** Identifiers for the parts of our state;
            used for signalling changes.
        */
@@ -201,7 +200,7 @@ public:
        bool is_signed () const {
                return _signed;
        }
-       
+
        bool encrypted () const {
                return _encrypted;
        }
@@ -246,7 +245,7 @@ public:
        AudioProcessor const * audio_processor () const {
                return _audio_processor;
        }
-       
+
 
        /* SET */
 
@@ -257,6 +256,7 @@ public:
        void examine_and_add_content (boost::shared_ptr<Content>);
        void add_content (boost::shared_ptr<Content>);
        void remove_content (boost::shared_ptr<Content>);
+       void remove_content (ContentList);
        void move_content_earlier (boost::shared_ptr<Content>);
        void move_content_later (boost::shared_ptr<Content>);
        void set_dcp_content_type (DCPContentType const *);
@@ -280,7 +280,7 @@ public:
        mutable boost::signals2::signal<void (Property)> Changed;
 
        /** Emitted when some property of our content has changed */
-       mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
+       mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
 
        /** Current version number of the state file */
        static int const current_state_version;
@@ -292,7 +292,7 @@ private:
        void signal_changed (Property);
        std::string video_identifier () const;
        void playlist_changed ();
-       void playlist_content_changed (boost::weak_ptr<Content>, int);
+       void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
        std::string filename_safe_name () const;
        void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
 
@@ -304,7 +304,7 @@ private:
         *  must not be relative.
         */
        boost::filesystem::path _directory;
-       
+
        /** Name for DCP-o-matic */
        std::string _name;
        /** True if a auto-generated ISDCF-compliant name should be used for our DCP */
@@ -326,7 +326,7 @@ private:
        int _video_frame_rate;
        /** The date that we should use in a ISDCF name */
        boost::gregorian::date _isdcf_date;
-       /** Number of audio channels to put in the DCP */
+       /** Number of audio channels requested for the DCP */
        int _audio_channels;
        /** If true, the DCP will be written in 3D mode; otherwise in 2D.
            This will be regardless of what content is on the playlist.