Merge master and multifarious hackery.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index f0ccd99e77b33139b95ad23bc6d5678e18c4da9a..84f0b0233ac6247634a9499b94b2c0cc30f8a934 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -103,7 +103,6 @@ public:
        boost::shared_ptr<Playlist> playlist () const;
 
        OutputAudioFrame dcp_audio_frame_rate () const;
-       int dcp_audio_channels () const;
 
        OutputAudioFrame time_to_audio_frames (Time) const;
        OutputVideoFrame time_to_video_frames (Time) const;
@@ -133,7 +132,6 @@ public:
                LOOP,
                DCP_CONTENT_TYPE,
                CONTAINER,
-               FILTERS,
                SCALER,
                AB,
                WITH_SUBTITLES,
@@ -173,11 +171,6 @@ public:
                return _container;
        }
 
-       std::vector<Filter const *> filters () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _filters;
-       }
-
        Scaler const * scaler () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _scaler;
@@ -238,7 +231,6 @@ public:
        void remove_content (boost::shared_ptr<Content>);
        void set_dcp_content_type (DCPContentType const *);
        void set_container (Container const *);
-       void set_filters (std::vector<Filter const *>);
        void set_scaler (Scaler const *);
        void set_ab (bool);
        void set_with_subtitles (bool);
@@ -291,8 +283,6 @@ private:
        DCPContentType const * _dcp_content_type;
        /** The container to put this Film in (flat, scope, etc.) */
        Container const * _container;
-       /** Video filters that should be used when generating DCPs */
-       std::vector<Filter const *> _filters;
        /** Scaler algorithm to use */
        Scaler const * _scaler;
        /** true to create an A/B comparison DCP, where the left half of the image