Merge master branch.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index e10abfa4bbed2127e14627a4282786b1c9e3dc3f..60646b0c8d78adc52f6fa8da0740d704926ac1c9 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -123,7 +123,6 @@ public:
                SCALER,
                TRIM_START,
                TRIM_END,
-               REEL_SIZE,
                DCP_AB,
                CONTENT_AUDIO_STREAM,
                EXTERNAL_AUDIO,
@@ -209,11 +208,6 @@ public:
                return _trim_end;
        }
 
-       boost::optional<uint64_t> reel_size () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _reel_size;
-       }
-       
        bool dcp_ab () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _dcp_ab;
@@ -371,8 +365,6 @@ public:
        void set_scaler (Scaler const *);
        void set_trim_start (int);
        void set_trim_end (int);
-       void set_reel_size (uint64_t);
-       void unset_reel_size ();
        void set_dcp_ab (bool);
        void set_content_audio_stream (boost::shared_ptr<AudioStream>);
        void set_external_audio (std::vector<std::string>);
@@ -456,8 +448,6 @@ private:
        int _trim_start;
        /** Frames to trim off the end of the DCP */
        int _trim_end;
-       /** Approximate target reel size in bytes; if not set, use a single reel */
-       boost::optional<uint64_t> _reel_size;
        /** true to create an A/B comparison DCP, where the left half of the image
            is the video without any filters or post-processing, and the right half
            has the specified filters and post-processing.