Modify previous commit to move restriction code into the UI.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 8d7d2e0fbdbfa65e96da76bea174e661af56d04f..96a79f9cf5abfd6179922da03e376e0a2aac472c 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -48,6 +48,7 @@ class Playlist;
 class AudioContent;
 class Screen;
 class AudioProcessor;
+class AudioMapping;
 struct isdcf_name_test;
 
 /** @class Film
@@ -65,9 +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 audio_analysis_path (boost::shared_ptr<const Playlist>) const;
 
        void send_dcp_to_tms ();
        void make_dcp ();
@@ -137,6 +139,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.
        */
@@ -321,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.