C++11 and whitespace cleanups.

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

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index 3b0bdd170e35f52da28ce707fdfc8d1b07914527..393a6d72eaa58bd1d09670015315a43a18097824 100644 (file)
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -32,25 +32,21 @@ class FFmpegEncoder : public Encoder
 {
 public:
        FFmpegEncoder (
-               boost::shared_ptr<const Film> film,
-               boost::weak_ptr<Job> job,
+               std::shared_ptr<const Film> film,
+               std::weak_ptr<Job> job,
                boost::filesystem::path output,
                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 ();
+       void go () override;
 
-       boost::optional<float> current_rate () const;
-       Frame frames_done () const;
-       bool finishing () const {
+       boost::optional<float> current_rate () const override;
+       Frame frames_done () const override;
+       bool finishing () const override {
                return false;
        }
 
@@ -70,18 +66,14 @@ private:
                        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;
+               std::shared_ptr<FFmpegFileEncoder> get (Eyes eyes) const;
                void flush ();
-               void audio (boost::shared_ptr<AudioBuffers>);
+               void audio (std::shared_ptr<AudioBuffers>);
 
        private:
-               std::map<Eyes, boost::shared_ptr<FFmpegFileEncoder> > _encoders;
+               std::map<Eyes, std::shared_ptr<FFmpegFileEncoder>> _encoders;
        };
 
        int _output_audio_channels;
@@ -97,7 +89,7 @@ private:
        bool _audio_stream_per_channel;
        int _x264_crf;
 
-       boost::shared_ptr<Butler> _butler;
+       std::shared_ptr<Butler> _butler;
 };
 
 #endif