Remove swaroop variant.

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index df2dcfcc866f5a7535c697274244dd4a3a02d6fa..c71f8fa63348a0cabda4480f79db1c1d044836d8 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -38,11 +38,8 @@ public:
                ExportFormat format,
                bool mixdown_to_stereo,
                bool split_reels,
+               bool audio_stream_per_channel,
                int x264_crf
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-               , boost::optional<dcp::Key> key
-               , boost::optional<std::string> id
-#endif
                );
 
        void go ();
@@ -64,14 +61,11 @@ private:
                        int audio_frame_rate,
                        int channels,
                        ExportFormat,
+                       bool audio_stream_per_channel,
                        int x264_crf,
                        bool three_d,
                        boost::filesystem::path output,
                        std::string extension
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-                       , boost::optional<dcp::Key> key
-                       , boost::optional<std::string> id
-#endif
                        );
 
                boost::shared_ptr<FFmpegFileEncoder> get (Eyes eyes) const;
@@ -82,7 +76,6 @@ private:
                std::map<Eyes, boost::shared_ptr<FFmpegFileEncoder> > _encoders;
        };
 
-       std::list<FileEncoderSet> _file_encoders;
        int _output_audio_channels;
 
        mutable boost::mutex _mutex;
@@ -90,6 +83,12 @@ private:
 
        EventHistory _history;
 
+       boost::filesystem::path _output;
+       ExportFormat _format;
+       bool _split_reels;
+       bool _audio_stream_per_channel;
+       int _x264_crf;
+
        boost::shared_ptr<Butler> _butler;
 };