Some missing copy constructors / operator= / noncopyable.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 08fdc587b9754262bf40f362291bcb6a227d95ec..96ba3eafda7ce7a4b6cd1d9c2bbe80d74339c572 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -33,30 +33,26 @@
 #include <boost/signals2.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include "util.h"
-#include "dci_metadata.h"
 #include "types.h"
-#include "ffmpeg_content.h"
 #include "playlist.h"
+#include "dci_metadata.h"
 
 class DCPContentType;
-class Job;
-class Filter;
 class Log;
-class ExamineContentJob;
-class AnalyseAudioJob;
-class ExternalAudioStream;
 class Content;
 class Player;
 
 /** @class Film
+ *
  *  @brief A representation of some audio and video content, and details of
  *  how they should be presented in a DCP.
+ *
+ *  The content of a Film is held in a Playlist (created and managed by the Film)
  */
 class Film : public boost::enable_shared_from_this<Film>
 {
 public:
        Film (std::string d);
-       Film (Film const &);
 
        std::string info_dir () const;
        std::string j2c_path (int f, bool t) const;
@@ -98,7 +94,7 @@ public:
 
        bool have_dcp () const;
 
-       boost::shared_ptr<Player> player () const;
+       boost::shared_ptr<Player> make_player () const;
        boost::shared_ptr<Playlist> playlist () const;
 
        OutputAudioFrame dcp_audio_frame_rate () const;
@@ -135,10 +131,10 @@ public:
                CONTAINER,
                SCALER,
                WITH_SUBTITLES,
-               COLOUR_LUT,
                J2K_BANDWIDTH,
                DCI_METADATA,
                DCP_VIDEO_FRAME_RATE,
+               DCP_AUDIO_CHANNELS
        };
 
 
@@ -179,11 +175,6 @@ public:
                return _with_subtitles;
        }
 
-       int colour_lut () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _colour_lut;
-       }
-
        int j2k_bandwidth () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _j2k_bandwidth;
@@ -217,10 +208,10 @@ public:
        void set_container (Ratio const *);
        void set_scaler (Scaler const *);
        void set_with_subtitles (bool);
-       void set_colour_lut (int);
        void set_j2k_bandwidth (int);
        void set_dci_metadata (DCIMetadata);
        void set_dcp_video_frame_rate (int);
+       void set_dcp_audio_channels (int);
        void set_dci_date_today ();
 
        /** Emitted when some property has of the Film has changed */
@@ -233,9 +224,13 @@ public:
        static int const state_version;
 
 private:
+
+       /* No copy construction */
+       Film (Film const &);
+       Film & operator= (Film const &);
        
        void signal_changed (Property);
-       std::string video_state_identifier () const;
+       std::string video_identifier () const;
        void playlist_changed ();
        void playlist_content_changed (boost::weak_ptr<Content>, int);
        std::string filename_safe_name () const;
@@ -264,11 +259,6 @@ private:
        Scaler const * _scaler;
        /** True if subtitles should be shown for this film */
        bool _with_subtitles;
-       /** index of colour LUT to use when converting RGB to XYZ.
-        *  0: sRGB
-        *  1: Rec 709
-        */
-       int _colour_lut;
        /** bandwidth for J2K files in bits per second */
        int _j2k_bandwidth;
        /** DCI naming stuff */