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 79539acce44a24f8f7be9da8f8d1f9030645bc27..c71f8fa63348a0cabda4480f79db1c1d044836d8 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -38,12 +38,13 @@ public:
                ExportFormat format,
                bool mixdown_to_stereo,
                bool split_reels,
+               bool audio_stream_per_channel,
                int x264_crf
                );
 
        void go ();
 
-       float current_rate () const;
+       boost::optional<float> current_rate () const;
        Frame frames_done () const;
        bool finishing () const {
                return false;
@@ -60,6 +61,7 @@ private:
                        int audio_frame_rate,
                        int channels,
                        ExportFormat,
+                       bool audio_stream_per_channel,
                        int x264_crf,
                        bool three_d,
                        boost::filesystem::path output,
@@ -74,14 +76,19 @@ private:
                std::map<Eyes, boost::shared_ptr<FFmpegFileEncoder> > _encoders;
        };
 
-       std::list<FileEncoderSet> _file_encoders;
        int _output_audio_channels;
 
        mutable boost::mutex _mutex;
-       DCPTime _last_time;
+       dcpomatic::DCPTime _last_time;
 
        EventHistory _history;
 
+       boost::filesystem::path _output;
+       ExportFormat _format;
+       bool _split_reels;
+       bool _audio_stream_per_channel;
+       int _x264_crf;
+
        boost::shared_ptr<Butler> _butler;
 };