Remove Film::make_player().

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

diff --git a/src/lib/film.h b/src/lib/film.h
index f61062be0cc3bfde33d368e3c12e0941a90b79d9..ac25323b932cae277acb3e149b9f4c9108ca144b 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -47,6 +47,8 @@ class Player;
 class Playlist;
 class AudioContent;
 class Screen;
+class AudioProcessor;
+class AudioMapping;
 struct isdcf_name_test;
 
 /** @class Film
@@ -64,13 +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 audio_analysis_dir () const;
+       boost::filesystem::path internal_video_asset_dir () const;
+       boost::filesystem::path internal_video_asset_filename () const;
 
-       boost::filesystem::path video_mxf_filename () const;
-       boost::filesystem::path audio_mxf_filename () const;
-       boost::filesystem::path subtitle_xml_filename () const;
+       boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
 
        void send_dcp_to_tms ();
        void make_dcp ();
@@ -102,7 +101,6 @@ public:
 
        std::vector<CPLSummary> cpls () const;
 
-       boost::shared_ptr<Player> make_player () const;
        boost::shared_ptr<Playlist> playlist () const;
 
        int audio_frame_rate () const;
@@ -140,6 +138,9 @@ public:
 
        std::string subtitle_language () const;
 
+       void make_audio_mapping_default (AudioMapping & mapping) const;
+       std::vector<std::string> audio_output_names () const;
+
        /** Identifiers for the parts of our state;
            used for signalling changes.
        */
@@ -165,6 +166,7 @@ public:
                INTEROP,
                /** The setting of _burn_subtitles has changed */
                BURN_SUBTITLES,
+               AUDIO_PROCESSOR,
        };
 
 
@@ -239,6 +241,10 @@ public:
        bool burn_subtitles () const {
                return _burn_subtitles;
        }
+
+       AudioProcessor const * audio_processor () const {
+               return _audio_processor;
+       }
        
 
        /* SET */
@@ -267,12 +273,13 @@ public:
        void set_sequence_video (bool);
        void set_interop (bool);
        void set_burn_subtitles (bool);
+       void set_audio_processor (AudioProcessor const * processor);
 
        /** Emitted when some property has of the Film has changed */
        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;
@@ -284,7 +291,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>);
 
@@ -309,6 +316,7 @@ private:
        Resolution _resolution;
        bool _signed;
        bool _encrypted;
+       dcp::Key _key;
        /** bandwidth for J2K files in bits per second */
        int _j2k_bandwidth;
        /** ISDCF naming stuff */
@@ -317,7 +325,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.
@@ -326,7 +334,7 @@ private:
        bool _sequence_video;
        bool _interop;
        bool _burn_subtitles;
-       dcp::Key _key;
+       AudioProcessor const * _audio_processor;
 
        int _state_version;