Assorted C++11/formatting cleanups.

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 6c572f242eae9ca7d004342c4f2441bd573291a9..df7b56edca41e9ecd5475c2f0a9658f1a1b855e5 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -21,9 +21,6 @@
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-#include "encrypted_ecinema_kdm.h"
-#endif
 #include "content.h"
 #include "audio_stream.h"
 
@@ -52,22 +49,22 @@ class FFmpegContent : public Content
 public:
        FFmpegContent (boost::filesystem::path);
        FFmpegContent (cxml::ConstNodePtr, int version, std::list<std::string> &);
-       FFmpegContent (std::vector<boost::shared_ptr<Content> >);
+       FFmpegContent (std::vector<std::shared_ptr<Content>>);
 
-       boost::shared_ptr<FFmpegContent> shared_from_this () {
-               return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
+       std::shared_ptr<FFmpegContent> shared_from_this () {
+               return std::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
        }
 
-       boost::shared_ptr<const FFmpegContent> shared_from_this () const {
-               return boost::dynamic_pointer_cast<const FFmpegContent> (Content::shared_from_this ());
+       std::shared_ptr<const FFmpegContent> shared_from_this () const {
+               return std::dynamic_pointer_cast<const FFmpegContent> (Content::shared_from_this ());
        }
 
-       void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
-       void take_settings_from (boost::shared_ptr<const Content> c);
+       void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job>);
+       void take_settings_from (std::shared_ptr<const Content> c);
        std::string summary () const;
        std::string technical_summary () const;
        void as_xml (xmlpp::Node *, bool with_paths) const;
-       dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const;
        dcpomatic::DCPTime approximate_length () const;
 
        std::string identifier () const;
@@ -76,24 +73,24 @@ public:
 
        void set_filters (std::vector<Filter const *> const &);
 
-       std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
+       std::vector<std::shared_ptr<FFmpegSubtitleStream>> subtitle_streams () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _subtitle_streams;
        }
 
-       boost::shared_ptr<FFmpegSubtitleStream> subtitle_stream () const {
+       std::shared_ptr<FFmpegSubtitleStream> subtitle_stream () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _subtitle_stream;
        }
 
-       std::vector<boost::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const;
+       std::vector<std::shared_ptr<FFmpegAudioStream>> ffmpeg_audio_streams () const;
 
        std::vector<Filter const *> filters () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _filters;
        }
 
-       void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
+       void set_subtitle_stream (std::shared_ptr<FFmpegSubtitleStream>);
 
        boost::optional<dcpomatic::ContentTime> first_video () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -102,33 +99,14 @@ public:
 
        void signal_subtitle_stream_changed ();
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-
-       bool encrypted () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _encrypted;
-       }
-
-       void add_kdm (EncryptedECinemaKDM kdm);
-
-       boost::optional<EncryptedECinemaKDM> kdm () const {
-               return _kdm;
-       }
-
-       boost::optional<std::string> id () const {
-               return _id;
-       }
-
-#endif
-
 private:
-       void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
+       void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
        friend struct ffmpeg_pts_offset_test;
        friend struct audio_sampling_rate_test;
 
-       std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
-       boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
+       std::vector<std::shared_ptr<FFmpegSubtitleStream>> _subtitle_streams;
+       std::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
        boost::optional<dcpomatic::ContentTime> _first_video;
        /** Video filters that should be used when generating DCPs */
        std::vector<Filter const *> _filters;
@@ -138,11 +116,6 @@ private:
        boost::optional<AVColorTransferCharacteristic> _color_trc;
        boost::optional<AVColorSpace> _colorspace;
        boost::optional<int> _bits_per_pixel;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       bool _encrypted;
-       boost::optional<EncryptedECinemaKDM> _kdm;
-       boost::optional<std::string> _id;
-#endif
 };
 
 #endif