C++11 and whitespace cleanups.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 00c3f71c5b721516d89e76f9576dc8d09bf45c96..7103f627115e51fe5a5d8305589f5601ec4e3848 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -18,23 +18,28 @@
 
 */
 
+
 /** @file  src/film.h
  *  @brief A representation of some audio and video content, and details of
  *  how they should be presented in a DCP.
  */
 
+
 #ifndef DCPOMATIC_FILM_H
 #define DCPOMATIC_FILM_H
 
+
 #include "change_signaller.h"
 #include "dcp_text_track.h"
 #include "frame_rate_change.h"
 #include "signaller.h"
+#include "transcode_job.h"
 #include "types.h"
 #include "util.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/key.h>
 #include <dcp/language_tag.h>
+#include <dcp/rating.h>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
@@ -43,6 +48,7 @@
 #include <string>
 #include <vector>
 
+
 namespace xmlpp {
        class Document;
 }
@@ -64,6 +70,7 @@ struct isdcf_name_test;
 struct recover_test_2d_encrypted;
 struct atmos_encrypted_passthrough_test;
 
+
 class InfoFileHandle
 {
 public:
@@ -93,12 +100,15 @@ private:
  *
  *  The content of a Film is held in a Playlist (created and managed by the Film).
  */
-class Film : public std::enable_shared_from_this<Film>, public Signaller, public boost::noncopyable
+class Film : public std::enable_shared_from_this<Film>, public Signaller
 {
 public:
        explicit Film (boost::optional<boost::filesystem::path> dir);
        ~Film ();
 
+       Film (Film const&) = delete;
+       Film& operator= (Film const&) = delete;
+
        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;
@@ -108,7 +118,7 @@ public:
        boost::filesystem::path subtitle_analysis_path (std::shared_ptr<const Content>) const;
 
        void send_dcp_to_tms ();
-       void make_dcp (bool gui = false, bool check = true);
+       void make_dcp (TranscodeJob::ChangedBehaviour behaviour);
 
        /** @return Logger.
         *  It is safe to call this from any thread.
@@ -150,6 +160,8 @@ public:
        uint64_t required_disk_space () const;
        bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const;
 
+       bool has_sign_language_video_channel () const;
+
        /* Proxies for some Playlist methods */
 
        ContentList content () const;
@@ -183,7 +195,12 @@ public:
 
        std::list<dcpomatic::DCPTimePeriod> reels () const;
        std::list<int> mapped_audio_channels () const;
-       std::vector<dcp::LanguageTag> audio_languages () const;
+
+       boost::optional<dcp::LanguageTag> audio_language () const {
+               return _audio_language;
+       }
+
+       /** @return pair containing the main subtitle language, and additional languages */
        std::pair<boost::optional<dcp::LanguageTag>, std::vector<dcp::LanguageTag>> subtitle_languages () const;
 
        std::string content_summary (dcpomatic::DCPTimePeriod period) const;
@@ -232,6 +249,7 @@ public:
                NAME_LANGUAGE,
                AUDIO_LANGUAGE,
                RELEASE_TERRITORY,
+               SIGN_LANGUAGE_VIDEO_LANGUAGE,
                VERSION_NUMBER,
                STATUS,
                CHAIN,
@@ -348,6 +366,10 @@ public:
                return _release_territory;
        }
 
+       boost::optional<dcp::LanguageTag> sign_language_video_language () const {
+               return _sign_language_video_language;
+       }
+
        int version_number () const {
                return _version_number;
        }
@@ -392,6 +414,10 @@ public:
                return _luminance;
        }
 
+       boost::gregorian::date isdcf_date () const {
+               return _isdcf_date;
+       }
+
        /* SET */
 
        void set_directory (boost::filesystem::path);
@@ -425,6 +451,7 @@ public:
        void set_content_versions (std::vector<std::string> v);
        void set_name_language (dcp::LanguageTag lang);
        void set_release_territory (boost::optional<dcp::LanguageTag::RegionSubtag> region = boost::none);
+       void set_sign_language_video_language (boost::optional<dcp::LanguageTag> tag);
        void set_version_number (int v);
        void set_status (dcp::Status s);
        void set_chain (boost::optional<std::string> c = boost::none);
@@ -436,6 +463,7 @@ public:
        void set_two_d_version_of_three_d (bool t);
        void set_distributor (boost::optional<std::string> d = boost::none);
        void set_luminance (boost::optional<dcp::Luminance> l = boost::none);
+       void set_audio_language (boost::optional<dcp::LanguageTag> language);
 
        void add_ffoc_lfoc (Markers& markers) const;
 
@@ -477,8 +505,6 @@ private:
        void check_settings_consistency ();
        void maybe_set_container_and_resolution ();
 
-       static std::string const metadata_file;
-
        /** Log to write to */
        std::shared_ptr<Log> _log;
        std::shared_ptr<Playlist> _playlist;
@@ -532,6 +558,7 @@ private:
        std::vector<std::string> _content_versions;
        dcp::LanguageTag _name_language;
        boost::optional<dcp::LanguageTag::RegionSubtag> _release_territory;
+       boost::optional<dcp::LanguageTag> _sign_language_video_language;
        int _version_number;
        dcp::Status _status;
        boost::optional<std::string> _chain;
@@ -543,6 +570,7 @@ private:
        bool _red_band = false;
        bool _two_d_version_of_three_d = false;
        boost::optional<dcp::Luminance> _luminance;
+       boost::optional<dcp::LanguageTag> _audio_language;
 
        int _state_version;