From: Carl Hetherington Date: Mon, 4 Jan 2021 20:16:53 +0000 (+0100) Subject: std::shared_ptr X-Git-Tag: v2.15.121~25 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26 std::shared_ptr --- diff --git a/src/lib/active_text.cc b/src/lib/active_text.cc index 3a7e1a27e..30f3b8ca6 100644 --- a/src/lib/active_text.cc +++ b/src/lib/active_text.cc @@ -18,16 +18,16 @@ */ + #include "active_text.h" #include "text_content.h" -#include -#include + using std::list; using std::pair; using std::make_pair; -using boost::weak_ptr; -using boost::shared_ptr; +using std::weak_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; diff --git a/src/lib/active_text.h b/src/lib/active_text.h index 90b6b533b..f5211ae7f 100644 --- a/src/lib/active_text.h +++ b/src/lib/active_text.h @@ -40,9 +40,9 @@ public: std::list get_burnt (dcpomatic::DCPTimePeriod period, bool always_burn_captions) const; void clear_before (dcpomatic::DCPTime time); void clear (); - void add_from (boost::weak_ptr content, PlayerText ps, dcpomatic::DCPTime from); - std::pair add_to (boost::weak_ptr content, dcpomatic::DCPTime to); - bool have (boost::weak_ptr content) const; + void add_from (std::weak_ptr content, PlayerText ps, dcpomatic::DCPTime from); + std::pair add_to (std::weak_ptr content, dcpomatic::DCPTime to); + bool have (std::weak_ptr content) const; private: class Period @@ -60,7 +60,7 @@ private: boost::optional to; }; - typedef std::map, std::list > Map; + typedef std::map, std::list, std::owner_less>> Map; mutable boost::mutex _mutex; Map _data; diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc index 6ba6b5ecf..0d6a5e8b8 100644 --- a/src/lib/analyse_audio_job.cc +++ b/src/lib/analyse_audio_job.cc @@ -47,8 +47,8 @@ using std::vector; using std::max; using std::min; using std::cout; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using namespace dcpomatic; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h index 8f88b0fa1..81287d2d2 100644 --- a/src/lib/analyse_audio_job.h +++ b/src/lib/analyse_audio_job.h @@ -46,7 +46,7 @@ class Filter; class AnalyseAudioJob : public Job { public: - AnalyseAudioJob (boost::shared_ptr, boost::shared_ptr, bool from_zero); + AnalyseAudioJob (std::shared_ptr, std::shared_ptr, bool from_zero); ~AnalyseAudioJob (); std::string name () const; @@ -58,9 +58,9 @@ public: } private: - void analyse (boost::shared_ptr, dcpomatic::DCPTime time); + void analyse (std::shared_ptr, dcpomatic::DCPTime time); - boost::shared_ptr _playlist; + std::shared_ptr _playlist; /** playlist's audio analysis path when the job was created */ boost::filesystem::path _path; dcpomatic::DCPTime _start; @@ -73,9 +73,9 @@ private: float* _sample_peak; Frame* _sample_peak_frame; - boost::shared_ptr _analysis; + std::shared_ptr _analysis; - boost::shared_ptr _ebur128; + std::shared_ptr _ebur128; std::vector _filters; boost::scoped_ptr _leqm; diff --git a/src/lib/analyse_subtitles_job.cc b/src/lib/analyse_subtitles_job.cc index 92fb9657c..df3cb3181 100644 --- a/src/lib/analyse_subtitles_job.cc +++ b/src/lib/analyse_subtitles_job.cc @@ -31,8 +31,8 @@ #include "i18n.h" using std::string; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/lib/analyse_subtitles_job.h b/src/lib/analyse_subtitles_job.h index 88b5d23dc..5ad9dd4a4 100644 --- a/src/lib/analyse_subtitles_job.h +++ b/src/lib/analyse_subtitles_job.h @@ -28,7 +28,7 @@ class Content; class AnalyseSubtitlesJob : public Job { public: - AnalyseSubtitlesJob (boost::shared_ptr film, boost::shared_ptr content); + AnalyseSubtitlesJob (std::shared_ptr film, std::shared_ptr content); std::string name () const; std::string json_name () const; @@ -41,7 +41,7 @@ public: private: void analyse (PlayerText text, TextType type); - boost::weak_ptr _content; + std::weak_ptr _content; boost::filesystem::path _path; boost::optional > _bounding_box; }; diff --git a/src/lib/atmos_content.cc b/src/lib/atmos_content.cc index 0543437a3..e69474e01 100644 --- a/src/lib/atmos_content.cc +++ b/src/lib/atmos_content.cc @@ -28,7 +28,7 @@ DCPOMATIC_ENABLE_WARNINGS using std::string; -using boost::shared_ptr; +using std::shared_ptr; int const AtmosContentProperty::EDIT_RATE = 700; diff --git a/src/lib/atmos_content.h b/src/lib/atmos_content.h index 0344b6225..948c3d3c0 100644 --- a/src/lib/atmos_content.h +++ b/src/lib/atmos_content.h @@ -37,7 +37,7 @@ class AtmosContent : public ContentPart public: AtmosContent (Content* parent); - static boost::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr node); + static std::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr node); void as_xml (xmlpp::Node* node) const; diff --git a/src/lib/atmos_decoder.cc b/src/lib/atmos_decoder.cc index 4ebb07f8a..51ee7f0a4 100644 --- a/src/lib/atmos_decoder.cc +++ b/src/lib/atmos_decoder.cc @@ -27,7 +27,7 @@ #include "film.h" -using boost::shared_ptr; +using std::shared_ptr; AtmosDecoder::AtmosDecoder (Decoder* parent, shared_ptr content) diff --git a/src/lib/atmos_decoder.h b/src/lib/atmos_decoder.h index 3003d5a07..935fd9925 100644 --- a/src/lib/atmos_decoder.h +++ b/src/lib/atmos_decoder.h @@ -28,19 +28,19 @@ class AtmosDecoder : public DecoderPart { public: - AtmosDecoder (Decoder* parent, boost::shared_ptr content); + AtmosDecoder (Decoder* parent, std::shared_ptr content); - boost::optional position (boost::shared_ptr) const { + boost::optional position (std::shared_ptr) const { return _position; } void seek (); - void emit (boost::shared_ptr film, boost::shared_ptr data, Frame frame, AtmosMetadata metadata); + void emit (std::shared_ptr film, std::shared_ptr data, Frame frame, AtmosMetadata metadata); boost::signals2::signal Data; private: - boost::shared_ptr _content; + std::shared_ptr _content; boost::optional _position; }; diff --git a/src/lib/atmos_metadata.cc b/src/lib/atmos_metadata.cc index 0a4b4f1b1..0fe23f3b0 100644 --- a/src/lib/atmos_metadata.cc +++ b/src/lib/atmos_metadata.cc @@ -23,7 +23,7 @@ #include -using boost::shared_ptr; +using std::shared_ptr; AtmosMetadata::AtmosMetadata (shared_ptr asset) diff --git a/src/lib/atmos_metadata.h b/src/lib/atmos_metadata.h index 4e3fc855f..65f2cc6c2 100644 --- a/src/lib/atmos_metadata.h +++ b/src/lib/atmos_metadata.h @@ -22,13 +22,12 @@ #define DCPOMATIC_ATMOS_METADATA_H #include -#include class AtmosMetadata { public: - AtmosMetadata (boost::shared_ptr asset); - boost::shared_ptr create (dcp::Fraction edit_rate) const; + AtmosMetadata (std::shared_ptr asset); + std::shared_ptr create (dcp::Fraction edit_rate) const; private: int _first_frame; diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc index 36ae8871a..3f41a52a0 100644 --- a/src/lib/atmos_mxf_content.cc +++ b/src/lib/atmos_mxf_content.cc @@ -33,7 +33,7 @@ using std::list; using std::string; -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; AtmosMXFContent::AtmosMXFContent (boost::filesystem::path path) diff --git a/src/lib/atmos_mxf_content.h b/src/lib/atmos_mxf_content.h index 350c4a35d..b485167c5 100644 --- a/src/lib/atmos_mxf_content.h +++ b/src/lib/atmos_mxf_content.h @@ -18,7 +18,10 @@ */ + #include "content.h" +#include + class AtmosMXFContent : public Content { @@ -26,18 +29,18 @@ public: AtmosMXFContent (boost::filesystem::path path); AtmosMXFContent (cxml::ConstNodePtr node, int version); - boost::shared_ptr shared_from_this () { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () { + return std::dynamic_pointer_cast (Content::shared_from_this()); } - boost::shared_ptr shared_from_this () const { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () const { + return std::dynamic_pointer_cast (Content::shared_from_this()); } - void examine (boost::shared_ptr film, boost::shared_ptr job); + void examine (std::shared_ptr film, std::shared_ptr job); std::string summary () const; void as_xml (xmlpp::Node* node, bool with_path) const; - dcpomatic::DCPTime full_length (boost::shared_ptr film) const; + dcpomatic::DCPTime full_length (std::shared_ptr film) const; dcpomatic::DCPTime approximate_length () const; static bool valid_mxf (boost::filesystem::path path); diff --git a/src/lib/atmos_mxf_decoder.cc b/src/lib/atmos_mxf_decoder.cc index 3f6f4a857..6c7cda61a 100644 --- a/src/lib/atmos_mxf_decoder.cc +++ b/src/lib/atmos_mxf_decoder.cc @@ -26,9 +26,9 @@ #include #include -using boost::shared_ptr; +using std::shared_ptr; -AtmosMXFDecoder::AtmosMXFDecoder (boost::shared_ptr film, boost::shared_ptr content) +AtmosMXFDecoder::AtmosMXFDecoder (std::shared_ptr film, std::shared_ptr content) : Decoder (film) , _content (content) { diff --git a/src/lib/atmos_mxf_decoder.h b/src/lib/atmos_mxf_decoder.h index f5b7fe1ee..4e7ce5c6f 100644 --- a/src/lib/atmos_mxf_decoder.h +++ b/src/lib/atmos_mxf_decoder.h @@ -28,15 +28,15 @@ class AtmosMXFContent; class AtmosMXFDecoder : public Decoder { public: - AtmosMXFDecoder (boost::shared_ptr film, boost::shared_ptr); + AtmosMXFDecoder (std::shared_ptr film, std::shared_ptr); bool pass (); void seek (dcpomatic::ContentTime t, bool accurate); private: - boost::shared_ptr _content; + std::shared_ptr _content; dcpomatic::ContentTime _next; - boost::shared_ptr _reader; + std::shared_ptr _reader; boost::optional _metadata; }; diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc index f69bcd362..41591b062 100644 --- a/src/lib/audio_analysis.cc +++ b/src/lib/audio_analysis.cc @@ -45,9 +45,9 @@ using std::max; using std::pair; using std::make_pair; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using dcp::raw_convert; using namespace dcpomatic; diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h index 99a69edb4..c3aec6e29 100644 --- a/src/lib/audio_analysis.h +++ b/src/lib/audio_analysis.h @@ -126,7 +126,7 @@ public: void write (boost::filesystem::path); - float gain_correction (boost::shared_ptr playlist); + float gain_correction (std::shared_ptr playlist); private: std::vector > _data; diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc index cfe762659..1de2af2ec 100644 --- a/src/lib/audio_buffers.cc +++ b/src/lib/audio_buffers.cc @@ -27,7 +27,7 @@ #include using std::bad_alloc; -using boost::shared_ptr; +using std::shared_ptr; /** Construct an AudioBuffers. Audio data is undefined after this constructor. * @param channels Number of channels. @@ -47,13 +47,13 @@ AudioBuffers::AudioBuffers (AudioBuffers const & other) copy_from (&other, other._frames, 0, 0); } -AudioBuffers::AudioBuffers (boost::shared_ptr other) +AudioBuffers::AudioBuffers (std::shared_ptr other) { allocate (other->_channels, other->_frames); copy_from (other.get(), other->_frames, 0, 0); } -AudioBuffers::AudioBuffers (boost::shared_ptr other, int32_t frames_to_copy, int32_t read_offset) +AudioBuffers::AudioBuffers (std::shared_ptr other, int32_t frames_to_copy, int32_t read_offset) { allocate (other->_channels, frames_to_copy); copy_from (other.get(), frames_to_copy, read_offset, 0); diff --git a/src/lib/audio_buffers.h b/src/lib/audio_buffers.h index 63e4fac9d..7a02b2b0a 100644 --- a/src/lib/audio_buffers.h +++ b/src/lib/audio_buffers.h @@ -22,11 +22,14 @@ * @brief AudioBuffers class. */ + #ifndef DCPOMATIC_AUDIO_BUFFERS_H #define DCPOMATIC_AUDIO_BUFFERS_H -#include + #include +#include + /** @class AudioBuffers * @brief A class to hold multi-channel audio data in float format. @@ -40,14 +43,14 @@ class AudioBuffers public: AudioBuffers (int channels, int32_t frames); AudioBuffers (AudioBuffers const &); - explicit AudioBuffers (boost::shared_ptr); - AudioBuffers (boost::shared_ptr other, int32_t frames_to_copy, int32_t read_offset); + explicit AudioBuffers (std::shared_ptr); + AudioBuffers (std::shared_ptr other, int32_t frames_to_copy, int32_t read_offset); ~AudioBuffers (); AudioBuffers & operator= (AudioBuffers const &); - boost::shared_ptr clone () const; - boost::shared_ptr channel (int) const; + std::shared_ptr clone () const; + std::shared_ptr channel (int) const; void ensure_size (int32_t); @@ -78,7 +81,7 @@ public: void move (int32_t frames, int32_t from, int32_t to); void accumulate_channel (AudioBuffers const * from, int from_channel, int to_channel, float gain = 1); void accumulate_frames (AudioBuffers const * from, int32_t frames, int32_t read_offset, int32_t write_offset); - void append (boost::shared_ptr other); + void append (std::shared_ptr other); void trim_start (int32_t frames); private: diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 22521c9e9..79a00b249 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -39,8 +39,8 @@ using std::fixed; using std::list; using std::pair; using std::setprecision; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::optional; using dcp::raw_convert; using namespace dcpomatic; diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h index b109cc15e..83a5e327e 100644 --- a/src/lib/audio_content.h +++ b/src/lib/audio_content.h @@ -44,15 +44,15 @@ class AudioContent : public ContentPart { public: explicit AudioContent (Content* parent); - AudioContent (Content* parent, std::vector >); + AudioContent (Content* parent, std::vector >); void as_xml (xmlpp::Node *) const; std::string technical_summary () const; - void take_settings_from (boost::shared_ptr c); + void take_settings_from (std::shared_ptr c); AudioMapping mapping () const; void set_mapping (AudioMapping); - int resampled_frame_rate (boost::shared_ptr film) const; + int resampled_frame_rate (std::shared_ptr film) const; std::vector channel_names () const; void set_gain (double); @@ -68,7 +68,7 @@ public: return _delay; } - std::string processing_description (boost::shared_ptr film) const; + std::string processing_description (std::shared_ptr film) const; std::vector streams () const { boost::mutex::scoped_lock lm (_mutex); @@ -80,12 +80,12 @@ public: void set_streams (std::vector streams); AudioStreamPtr stream () const; - void add_properties (boost::shared_ptr film, std::list &) const; + void add_properties (std::shared_ptr film, std::list &) const; - void modify_position (boost::shared_ptr film, dcpomatic::DCPTime& pos) const; + void modify_position (std::shared_ptr film, dcpomatic::DCPTime& pos) const; void modify_trim_start (dcpomatic::ContentTime& pos) const; - static boost::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr, int version); + static std::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr, int version); private: diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc index 051fb4dd8..5334dfa34 100644 --- a/src/lib/audio_decoder.cc +++ b/src/lib/audio_decoder.cc @@ -33,7 +33,7 @@ using std::cout; using std::map; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h index 897ddb7e4..2b6e3f758 100644 --- a/src/lib/audio_decoder.h +++ b/src/lib/audio_decoder.h @@ -29,7 +29,6 @@ #include "content_audio.h" #include "audio_stream.h" #include "decoder_part.h" -#include #include class AudioBuffers; @@ -42,30 +41,30 @@ class Resampler; /** @class AudioDecoder. * @brief Parent class for audio decoders. */ -class AudioDecoder : public boost::enable_shared_from_this, public DecoderPart +class AudioDecoder : public std::enable_shared_from_this, public DecoderPart { public: - AudioDecoder (Decoder* parent, boost::shared_ptr content, bool fast); + AudioDecoder (Decoder* parent, std::shared_ptr content, bool fast); - boost::optional position (boost::shared_ptr film) const; - void emit (boost::shared_ptr film, AudioStreamPtr stream, boost::shared_ptr, dcpomatic::ContentTime, bool time_already_delayed = false); + boost::optional position (std::shared_ptr film) const; + void emit (std::shared_ptr film, AudioStreamPtr stream, std::shared_ptr, dcpomatic::ContentTime, bool time_already_delayed = false); void seek (); void flush (); - dcpomatic::ContentTime stream_position (boost::shared_ptr film, AudioStreamPtr stream) const; + dcpomatic::ContentTime stream_position (std::shared_ptr film, AudioStreamPtr stream) const; boost::signals2::signal Data; private: void silence (int milliseconds); - boost::shared_ptr _content; + std::shared_ptr _content; /** Frame after the last one that was emitted from Data (i.e. at the resampled rate, if applicable) * for each AudioStream. */ typedef std::map PositionMap; PositionMap _positions; - typedef std::map > ResamplerMap; + typedef std::map > ResamplerMap; ResamplerMap _resamplers; bool _fast; diff --git a/src/lib/audio_delay.cc b/src/lib/audio_delay.cc index 391a201a2..167c522e8 100644 --- a/src/lib/audio_delay.cc +++ b/src/lib/audio_delay.cc @@ -24,7 +24,7 @@ #include using std::cout; -using boost::shared_ptr; +using std::shared_ptr; AudioDelay::AudioDelay (int samples) : _samples (samples) diff --git a/src/lib/audio_delay.h b/src/lib/audio_delay.h index 44e8c009b..3731013e5 100644 --- a/src/lib/audio_delay.h +++ b/src/lib/audio_delay.h @@ -18,7 +18,9 @@ */ -#include + +#include + class AudioBuffers; @@ -29,10 +31,10 @@ class AudioDelay { public: explicit AudioDelay (int samples); - boost::shared_ptr run (boost::shared_ptr in); + std::shared_ptr run (std::shared_ptr in); void flush (); private: - boost::shared_ptr _tail; + std::shared_ptr _tail; int _samples; }; diff --git a/src/lib/audio_filter.cc b/src/lib/audio_filter.cc index 3d3ecdfbb..24aa244f2 100644 --- a/src/lib/audio_filter.cc +++ b/src/lib/audio_filter.cc @@ -24,7 +24,7 @@ #include using std::min; -using boost::shared_ptr; +using std::shared_ptr; /** @return array of floats which the caller must destroy with delete[] */ float * diff --git a/src/lib/audio_filter.h b/src/lib/audio_filter.h index fb7b7b92c..500cfa6e2 100644 --- a/src/lib/audio_filter.h +++ b/src/lib/audio_filter.h @@ -21,7 +21,9 @@ #ifndef DCPOMATIC_AUDIO_FILTER_H #define DCPOMATIC_AUDIO_FILTER_H -#include + +#include + class AudioBuffers; struct audio_filter_impulse_input_test; @@ -43,7 +45,7 @@ public: virtual ~AudioFilter (); - boost::shared_ptr run (boost::shared_ptr in); + std::shared_ptr run (std::shared_ptr in); void flush (); @@ -55,7 +57,7 @@ protected: float* _ir; int _M; - boost::shared_ptr _tail; + std::shared_ptr _tail; }; class LowPassAudioFilter : public AudioFilter diff --git a/src/lib/audio_filter_graph.cc b/src/lib/audio_filter_graph.cc index 0eeeb3c4a..6318c68ab 100644 --- a/src/lib/audio_filter_graph.cc +++ b/src/lib/audio_filter_graph.cc @@ -32,7 +32,7 @@ extern "C" { using std::string; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; AudioFilterGraph::AudioFilterGraph (int sample_rate, int channels) : _sample_rate (sample_rate) diff --git a/src/lib/audio_filter_graph.h b/src/lib/audio_filter_graph.h index fa52741b9..91216c7c3 100644 --- a/src/lib/audio_filter_graph.h +++ b/src/lib/audio_filter_graph.h @@ -31,7 +31,7 @@ public: AudioFilterGraph (int sample_rate, int channels); ~AudioFilterGraph (); - void process (boost::shared_ptr audio); + void process (std::shared_ptr audio); protected: std::string src_parameters () const; diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index 40dc4ebfa..37a3d5fa2 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -39,8 +39,8 @@ using std::string; using std::min; using std::vector; using std::abs; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::optional; using dcp::raw_convert; diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc index 74bb7717d..347a96f5a 100644 --- a/src/lib/audio_merger.cc +++ b/src/lib/audio_merger.cc @@ -31,7 +31,7 @@ using std::max; using std::list; using std::cout; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; @@ -95,7 +95,7 @@ AudioMerger::pull (DCPTime time) /** Push some data into the merger at a given time */ void -AudioMerger::push (boost::shared_ptr audio, DCPTime time) +AudioMerger::push (std::shared_ptr audio, DCPTime time) { DCPOMATIC_ASSERT (audio->frames() > 0); diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h index d5a6ec43a..adaf72f81 100644 --- a/src/lib/audio_merger.h +++ b/src/lib/audio_merger.h @@ -33,8 +33,8 @@ class AudioMerger public: explicit AudioMerger (int frame_rate); - std::list, dcpomatic::DCPTime> > pull (dcpomatic::DCPTime time); - void push (boost::shared_ptr audio, dcpomatic::DCPTime time); + std::list, dcpomatic::DCPTime> > pull (dcpomatic::DCPTime time); + void push (std::shared_ptr audio, dcpomatic::DCPTime time); void clear (); private: @@ -54,13 +54,13 @@ private: , frame_rate (r) {} - Buffer (boost::shared_ptr a, dcpomatic::DCPTime t, int r) + Buffer (std::shared_ptr a, dcpomatic::DCPTime t, int r) : audio (a) , time (t) , frame_rate (r) {} - boost::shared_ptr audio; + std::shared_ptr audio; dcpomatic::DCPTime time; int frame_rate; diff --git a/src/lib/audio_processor.h b/src/lib/audio_processor.h index 194c9bf0e..e2f1c48eb 100644 --- a/src/lib/audio_processor.h +++ b/src/lib/audio_processor.h @@ -26,7 +26,6 @@ #define DCPOMATIC_AUDIO_PROCESSOR_H #include "types.h" -#include #include #include #include @@ -52,9 +51,9 @@ public: /** @return Number of output channels */ virtual int out_channels () const = 0; /** @return A clone of this AudioProcessor for operation at the specified sampling rate */ - virtual boost::shared_ptr clone (int sampling_rate) const = 0; + virtual std::shared_ptr clone (int sampling_rate) const = 0; /** Process some data, returning the processed result truncated or padded to `channels' */ - virtual boost::shared_ptr run (boost::shared_ptr, int channels) = 0; + virtual std::shared_ptr run (std::shared_ptr, int channels) = 0; virtual void flush () {} /** Make the supplied audio mapping into a sensible default for this processor */ virtual void make_audio_mapping_default (AudioMapping& mapping) const = 0; diff --git a/src/lib/audio_ring_buffers.cc b/src/lib/audio_ring_buffers.cc index cd7f4f597..c0559f61c 100644 --- a/src/lib/audio_ring_buffers.cc +++ b/src/lib/audio_ring_buffers.cc @@ -29,7 +29,7 @@ using std::cout; using std::make_pair; using std::pair; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; diff --git a/src/lib/audio_ring_buffers.h b/src/lib/audio_ring_buffers.h index bfaad5ec9..2cfc0a30b 100644 --- a/src/lib/audio_ring_buffers.h +++ b/src/lib/audio_ring_buffers.h @@ -24,7 +24,6 @@ #include "audio_buffers.h" #include "types.h" #include "dcpomatic_time.h" -#include #include #include @@ -33,7 +32,7 @@ class AudioRingBuffers : public boost::noncopyable public: AudioRingBuffers (); - void put (boost::shared_ptr data, dcpomatic::DCPTime time, int frame_rate); + void put (std::shared_ptr data, dcpomatic::DCPTime time, int frame_rate); boost::optional get (float* out, int channels, int frames); boost::optional peek () const; @@ -42,7 +41,7 @@ public: private: mutable boost::mutex _mutex; - std::list, dcpomatic::DCPTime> > _buffers; + std::list, dcpomatic::DCPTime> > _buffers; int _used_in_head; }; diff --git a/src/lib/audio_stream.h b/src/lib/audio_stream.h index e50a53b8a..a7e204065 100644 --- a/src/lib/audio_stream.h +++ b/src/lib/audio_stream.h @@ -65,6 +65,6 @@ private: AudioMapping _mapping; }; -typedef boost::shared_ptr AudioStreamPtr; +typedef std::shared_ptr AudioStreamPtr; #endif diff --git a/src/lib/bitmap_text.h b/src/lib/bitmap_text.h index 2314c2db0..b8861c10a 100644 --- a/src/lib/bitmap_text.h +++ b/src/lib/bitmap_text.h @@ -21,20 +21,22 @@ #ifndef DCPOMATIC_BITMAP_CAPTION_H #define DCPOMATIC_BITMAP_CAPTION_H + #include "rect.h" -#include +#include + class Image; class BitmapText { public: - BitmapText (boost::shared_ptr i, dcpomatic::Rect r) + BitmapText (std::shared_ptr i, dcpomatic::Rect r) : image (i) , rectangle (r) {} - boost::shared_ptr image; + std::shared_ptr image; /** Area that the subtitle covers on its corresponding video, expressed in * proportions of the image size; e.g. rectangle.x = 0.5 would mean that * the rectangle starts half-way across the video. diff --git a/src/lib/butler.cc b/src/lib/butler.cc index 270abd2d6..d09b0356a 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -27,15 +27,14 @@ #include "compose.hpp" #include "exceptions.h" #include "video_content.h" -#include -#include + using std::cout; using std::pair; using std::make_pair; using std::string; -using boost::weak_ptr; -using boost::shared_ptr; +using std::weak_ptr; +using std::shared_ptr; using boost::bind; using boost::optional; using boost::function; diff --git a/src/lib/butler.h b/src/lib/butler.h index ab6fd7853..49a57a826 100644 --- a/src/lib/butler.h +++ b/src/lib/butler.h @@ -23,8 +23,6 @@ #include "text_ring_buffers.h" #include "audio_mapping.h" #include "exception_store.h" -#include -#include #include #include #include @@ -37,8 +35,8 @@ class Butler : public ExceptionStore, public boost::noncopyable { public: Butler ( - boost::weak_ptr film, - boost::shared_ptr player, + std::weak_ptr film, + std::shared_ptr player, AudioMapping map, int audio_channels, boost::function pixel_format, @@ -70,7 +68,7 @@ public: std::string summary () const; }; - std::pair, dcpomatic::DCPTime> get_video (bool blocking, Error* e = 0); + std::pair, dcpomatic::DCPTime> get_video (bool blocking, Error* e = 0); boost::optional get_audio (float* out, Frame frames); boost::optional get_closed_caption (); @@ -80,16 +78,16 @@ public: private: void thread (); - void video (boost::shared_ptr video, dcpomatic::DCPTime time); - void audio (boost::shared_ptr audio, dcpomatic::DCPTime time, int frame_rate); + void video (std::shared_ptr video, dcpomatic::DCPTime time); + void audio (std::shared_ptr audio, dcpomatic::DCPTime time, int frame_rate); void text (PlayerText pt, TextType type, boost::optional track, dcpomatic::DCPTimePeriod period); bool should_run () const; - void prepare (boost::weak_ptr video); + void prepare (std::weak_ptr video); void player_change (ChangeType type, int property); void seek_unlocked (dcpomatic::DCPTime position, bool accurate); - boost::weak_ptr _film; - boost::shared_ptr _player; + std::weak_ptr _film; + std::shared_ptr _player; boost::thread _thread; VideoRingBuffers _video; @@ -98,7 +96,7 @@ private: boost::thread_group _prepare_pool; boost::asio::io_service _prepare_service; - boost::shared_ptr _prepare_work; + std::shared_ptr _prepare_work; /** mutex to protect _pending_seek_position, _pending_seek_accurate, _finished, _died, _stop_thread */ boost::mutex _mutex; diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc index 644e730bb..45a662e37 100644 --- a/src/lib/check_content_change_job.cc +++ b/src/lib/check_content_change_job.cc @@ -31,7 +31,7 @@ using std::string; using std::list; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; /** @param gui true if we are running this job from the GUI, false if it's the CLI */ CheckContentChangeJob::CheckContentChangeJob (shared_ptr film, shared_ptr following, bool gui) diff --git a/src/lib/check_content_change_job.h b/src/lib/check_content_change_job.h index 152cdb9e7..739d2651f 100644 --- a/src/lib/check_content_change_job.h +++ b/src/lib/check_content_change_job.h @@ -27,7 +27,7 @@ class CheckContentChangeJob : public Job { public: - CheckContentChangeJob (boost::shared_ptr, boost::shared_ptr following = boost::shared_ptr(), bool gui = true); + CheckContentChangeJob (std::shared_ptr, std::shared_ptr following = std::shared_ptr(), bool gui = true); ~CheckContentChangeJob (); std::string name () const; @@ -35,6 +35,6 @@ public: void run (); private: - boost::shared_ptr _following; + std::shared_ptr _following; bool _gui; }; diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc index 1902f15f9..48cba2b8f 100644 --- a/src/lib/cinema.cc +++ b/src/lib/cinema.cc @@ -29,7 +29,7 @@ using std::list; using std::string; -using boost::shared_ptr; +using std::shared_ptr; using dcp::raw_convert; using dcpomatic::Screen; diff --git a/src/lib/cinema.h b/src/lib/cinema.h index 86245953b..daa4aa8bf 100644 --- a/src/lib/cinema.h +++ b/src/lib/cinema.h @@ -22,8 +22,10 @@ * @brief Cinema class. */ + #include -#include +#include + namespace xmlpp { class Element; @@ -39,7 +41,7 @@ namespace dcpomatic { * This is a cinema name, some metadata and a list of * Screen objects. */ -class Cinema : public boost::enable_shared_from_this +class Cinema : public std::enable_shared_from_this { public: Cinema (std::string const & name_, std::list const & e, std::string notes_, int utc_offset_hour, int utc_offset_minute) @@ -56,8 +58,8 @@ public: void as_xml (xmlpp::Element *) const; - void add_screen (boost::shared_ptr); - void remove_screen (boost::shared_ptr); + void add_screen (std::shared_ptr); + void remove_screen (std::shared_ptr); void set_utc_offset_hour (int h); void set_utc_offset_minute (int m); @@ -74,12 +76,12 @@ public: return _utc_offset_minute; } - std::list > screens () const { + std::list > screens () const { return _screens; } private: - std::list > _screens; + std::list > _screens; /** Offset such that the equivalent time in UTC can be determined by subtracting the offset from the local time. */ diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index 22404c279..d0e0f4638 100644 --- a/src/lib/colour_conversion.cc +++ b/src/lib/colour_conversion.cc @@ -42,9 +42,9 @@ using std::list; using std::string; using std::cout; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using dcp::raw_convert; vector PresetColourConversion::_presets; diff --git a/src/lib/combine_dcp_job.cc b/src/lib/combine_dcp_job.cc index b3c29b205..3497d4b72 100644 --- a/src/lib/combine_dcp_job.cc +++ b/src/lib/combine_dcp_job.cc @@ -28,7 +28,7 @@ using std::string; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; CombineDCPJob::CombineDCPJob (vector inputs, boost::filesystem::path output) diff --git a/src/lib/config.cc b/src/lib/config.cc index 6e8106aae..e2425799d 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -59,9 +59,9 @@ using std::max; using std::remove; using std::exception; using std::cerr; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using boost::algorithm::trim; using dcp::raw_convert; diff --git a/src/lib/config.h b/src/lib/config.h index 87afcbba8..957a84666 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -142,11 +141,11 @@ public: return _tms_password; } - std::list > cinemas () const { + std::list > cinemas () const { return _cinemas; } - std::list > dkdm_recipients () const { + std::list > dkdm_recipients () const { return _dkdm_recipients; } @@ -302,11 +301,11 @@ public: return _notification_email; } - boost::shared_ptr signer_chain () const { + std::shared_ptr signer_chain () const { return _signer_chain; } - boost::shared_ptr decryption_chain () const { + std::shared_ptr decryption_chain () const { return _decryption_chain; } @@ -348,7 +347,7 @@ public: return _player_history; } - boost::shared_ptr dkdms () const { + std::shared_ptr dkdms () const { return _dkdms; } @@ -588,22 +587,22 @@ public: maybe_set (_tms_password, p); } - void add_cinema (boost::shared_ptr c) { + void add_cinema (std::shared_ptr c) { _cinemas.push_back (c); changed (CINEMAS); } - void remove_cinema (boost::shared_ptr c) { + void remove_cinema (std::shared_ptr c) { _cinemas.remove (c); changed (CINEMAS); } - void add_dkdm_recipient (boost::shared_ptr c) { + void add_dkdm_recipient (std::shared_ptr c) { _dkdm_recipients.push_back (c); changed (DKDM_RECIPIENTS); } - void remove_dkdm_recipient (boost::shared_ptr c) { + void remove_dkdm_recipient (std::shared_ptr c) { _dkdm_recipients.remove (c); changed (DKDM_RECIPIENTS); } @@ -769,11 +768,11 @@ public: void reset_notification_email (); - void set_signer_chain (boost::shared_ptr s) { + void set_signer_chain (std::shared_ptr s) { maybe_set (_signer_chain, s); } - void set_decryption_chain (boost::shared_ptr c) { + void set_decryption_chain (std::shared_ptr c) { maybe_set (_decryption_chain, c); } @@ -810,7 +809,7 @@ public: } #endif - void set_dkdms (boost::shared_ptr dkdms) { + void set_dkdms (std::shared_ptr dkdms) { _dkdms = dkdms; changed (); } @@ -1075,7 +1074,7 @@ public: void copy_and_link (boost::filesystem::path new_file) const; bool have_write_permission () const; - void save_template (boost::shared_ptr film, std::string name) const; + void save_template (std::shared_ptr film, std::string name) const; bool existing_template (std::string name) const; std::list templates () const; boost::filesystem::path template_path (std::string name) const; @@ -1097,7 +1096,7 @@ private: void set_cover_sheet_to_default (); void read_cinemas (cxml::Document const & f); void read_dkdm_recipients (cxml::Document const & f); - boost::shared_ptr create_certificate_chain (); + std::shared_ptr create_certificate_chain (); boost::filesystem::path directory_or (boost::optional dir, boost::filesystem::path a) const; void add_to_history_internal (std::vector& h, boost::filesystem::path p); void clean_history_internal (std::vector& h); @@ -1178,8 +1177,8 @@ private: */ boost::optional _default_kdm_directory; bool _upload_after_make_dcp; - std::list > _cinemas; - std::list > _dkdm_recipients; + std::list > _cinemas; + std::list > _dkdm_recipients; std::string _mail_server; int _mail_port; EmailProtocol _mail_protocol; @@ -1196,11 +1195,11 @@ private: std::vector _notification_cc; std::string _notification_bcc; std::string _notification_email; - boost::shared_ptr _signer_chain; + std::shared_ptr _signer_chain; /** Chain used to decrypt KDMs; the leaf of this chain is the target * certificate for making KDMs given to DCP-o-matic. */ - boost::shared_ptr _decryption_chain; + std::shared_ptr _decryption_chain; /** true to check for updates on startup */ bool _check_for_updates; bool _check_for_test_updates; @@ -1214,7 +1213,7 @@ private: #endif std::vector _history; std::vector _player_history; - boost::shared_ptr _dkdms; + std::shared_ptr _dkdms; boost::filesystem::path _cinemas_file; boost::filesystem::path _dkdm_recipients_file; bool _show_hints_before_make_dcp; diff --git a/src/lib/content.cc b/src/lib/content.cc index 4242477d4..efcec534c 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -48,7 +48,7 @@ using std::cout; using std::vector; using std::max; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using dcp::raw_convert; using dcp::locale_convert; @@ -206,7 +206,7 @@ Content::signal_change (ChangeType c, int p) } else { emit (boost::bind (boost::ref(Change), c, shared_from_this(), p, _change_signals_frequent)); } - } catch (boost::bad_weak_ptr &) { + } catch (std::bad_weak_ptr &) { /* This must be during construction; never mind */ } } diff --git a/src/lib/content.h b/src/lib/content.h index 5f8e9f53d..8a28762d3 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -34,7 +34,7 @@ #include #include #include -#include + namespace xmlpp { class Node; @@ -62,23 +62,23 @@ public: /** @class Content * @brief A piece of content represented by one or more files on disk. */ -class Content : public boost::enable_shared_from_this, public Signaller, public boost::noncopyable +class Content : public std::enable_shared_from_this, public Signaller, public boost::noncopyable { public: explicit Content (); Content (dcpomatic::DCPTime); Content (boost::filesystem::path); Content (cxml::ConstNodePtr); - Content (std::vector >); + Content (std::vector >); virtual ~Content () {} /** Examine the content to establish digest, frame rates and any other * useful metadata. * @param job Job to use to report progress, or 0. */ - virtual void examine (boost::shared_ptr film, boost::shared_ptr job); + virtual void examine (std::shared_ptr film, std::shared_ptr job); - virtual void take_settings_from (boost::shared_ptr c); + virtual void take_settings_from (std::shared_ptr c); /** @return Quick one-line summary of the content, as will be presented in the * film editor. @@ -91,15 +91,15 @@ public: virtual std::string technical_summary () const; virtual void as_xml (xmlpp::Node *, bool with_paths) const; - virtual dcpomatic::DCPTime full_length (boost::shared_ptr) const = 0; + virtual dcpomatic::DCPTime full_length (std::shared_ptr) const = 0; virtual dcpomatic::DCPTime approximate_length () const = 0; virtual std::string identifier () const; /** @return points at which to split this content when * REELTYPE_BY_VIDEO_CONTENT is in use. */ - virtual std::list reel_split_points (boost::shared_ptr) const; + virtual std::list reel_split_points (std::shared_ptr) const; - boost::shared_ptr clone () const; + std::shared_ptr clone () const; void set_paths (std::vector paths); @@ -136,7 +136,7 @@ public: return _digest; } - void set_position (boost::shared_ptr film, dcpomatic::DCPTime, bool force_emit = false); + void set_position (std::shared_ptr film, dcpomatic::DCPTime, bool force_emit = false); /** dcpomatic::DCPTime that this content starts; i.e. the time that the first * bit of the content (trimmed or not) will happen. @@ -161,11 +161,11 @@ public: } /** @return Time immediately after the last thing in this content */ - dcpomatic::DCPTime end (boost::shared_ptr film) const { + dcpomatic::DCPTime end (std::shared_ptr film) const { return position() + length_after_trim(film); } - dcpomatic::DCPTime length_after_trim (boost::shared_ptr film) const; + dcpomatic::DCPTime length_after_trim (std::shared_ptr film) const; boost::optional video_frame_rate () const { boost::mutex::scoped_lock lm (_mutex); @@ -175,30 +175,30 @@ public: void set_video_frame_rate (double r); void unset_video_frame_rate (); - double active_video_frame_rate (boost::shared_ptr film) const; + double active_video_frame_rate (std::shared_ptr film) const; void set_change_signals_frequent (bool f) { _change_signals_frequent = f; } - std::list user_properties (boost::shared_ptr film) const; + std::list user_properties (std::shared_ptr film) const; std::string calculate_digest () const; /* CHANGE_TYPE_PENDING and CHANGE_TYPE_CANCELLED may be emitted from any thread; CHANGE_TYPE_DONE always from GUI thread */ - boost::signals2::signal, int, bool)> Change; + boost::signals2::signal, int, bool)> Change; - boost::shared_ptr video; - boost::shared_ptr audio; - std::list > text; - boost::shared_ptr atmos; + std::shared_ptr video; + std::shared_ptr audio; + std::list > text; + std::shared_ptr atmos; - boost::shared_ptr only_text () const; - boost::shared_ptr text_of_original_type (TextType type) const; + std::shared_ptr only_text () const; + std::shared_ptr text_of_original_type (TextType type) const; protected: - virtual void add_properties (boost::shared_ptr film, std::list &) const; + virtual void add_properties (std::shared_ptr film, std::list &) const; /** _mutex which should be used to protect accesses, as examine * jobs can update content state in threads other than the main one. diff --git a/src/lib/content_atmos.h b/src/lib/content_atmos.h index 57b7e404f..891ca3b83 100644 --- a/src/lib/content_atmos.h +++ b/src/lib/content_atmos.h @@ -24,7 +24,6 @@ #include "atmos_metadata.h" #include "types.h" #include -#include /** @class ContentAtmos * @brief Some Atmos data that has come out of a decoder. @@ -32,13 +31,13 @@ class ContentAtmos { public: - ContentAtmos (boost::shared_ptr data_, Frame frame_, AtmosMetadata metadata_) + ContentAtmos (std::shared_ptr data_, Frame frame_, AtmosMetadata metadata_) : data (data_) , frame (frame_) , metadata (metadata_) {} - boost::shared_ptr data; + std::shared_ptr data; Frame frame; AtmosMetadata metadata; }; diff --git a/src/lib/content_audio.h b/src/lib/content_audio.h index 509e7e4a6..0d16799d7 100644 --- a/src/lib/content_audio.h +++ b/src/lib/content_audio.h @@ -39,12 +39,12 @@ public: , frame (0) {} - ContentAudio (boost::shared_ptr a, Frame f) + ContentAudio (std::shared_ptr a, Frame f) : audio (a) , frame (f) {} - boost::shared_ptr audio; + std::shared_ptr audio; Frame frame; }; diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 0e8b04eda..c4e389c7c 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -45,7 +45,7 @@ using std::string; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; /** Create a Content object from an XML node. @@ -59,7 +59,7 @@ content_factory (cxml::ConstNodePtr node, int version, list& notes) { string const type = node->string_child ("Type"); - boost::shared_ptr content; + std::shared_ptr content; if (type == "FFmpeg") { /* SndfileContent is now handled by the FFmpeg code rather than by diff --git a/src/lib/content_factory.h b/src/lib/content_factory.h index 2522ad017..ab76a29dc 100644 --- a/src/lib/content_factory.h +++ b/src/lib/content_factory.h @@ -23,10 +23,9 @@ */ #include -#include class Film; class Content; -extern boost::shared_ptr content_factory (cxml::ConstNodePtr, int, std::list &); -extern std::list > content_factory (boost::filesystem::path); +extern std::shared_ptr content_factory (cxml::ConstNodePtr, int, std::list &); +extern std::list > content_factory (boost::filesystem::path); diff --git a/src/lib/content_part.h b/src/lib/content_part.h index eb96b1371..a81334270 100644 --- a/src/lib/content_part.h +++ b/src/lib/content_part.h @@ -24,7 +24,6 @@ #include "content.h" #include "change_signaller.h" -#include #include class Content; diff --git a/src/lib/content_store.h b/src/lib/content_store.h index 028fa2797..d5a6336a5 100644 --- a/src/lib/content_store.h +++ b/src/lib/content_store.h @@ -18,7 +18,9 @@ */ -#include + +#include + class Content; @@ -28,5 +30,5 @@ class Content; class ContentStore { public: - virtual boost::shared_ptr get (std::string digest) const = 0; + virtual std::shared_ptr get (std::string digest) const = 0; }; diff --git a/src/lib/content_text.h b/src/lib/content_text.h index 0c0df1ee6..c6d7d6ec2 100644 --- a/src/lib/content_text.h +++ b/src/lib/content_text.h @@ -48,7 +48,7 @@ private: class ContentBitmapText : public ContentText { public: - ContentBitmapText (dcpomatic::ContentTime f, boost::shared_ptr im, dcpomatic::Rect r) + ContentBitmapText (dcpomatic::ContentTime f, std::shared_ptr im, dcpomatic::Rect r) : ContentText (f) , sub (im, r) {} diff --git a/src/lib/content_video.h b/src/lib/content_video.h index 8b3d984df..ee169b6c5 100644 --- a/src/lib/content_video.h +++ b/src/lib/content_video.h @@ -37,14 +37,14 @@ public: , part (PART_WHOLE) {} - ContentVideo (boost::shared_ptr i, Frame f, Eyes e, Part p) + ContentVideo (std::shared_ptr i, Frame f, Eyes e, Part p) : image (i) , frame (f) , eyes (e) , part (p) {} - boost::shared_ptr image; + std::shared_ptr image; Frame frame; Eyes eyes; Part part; diff --git a/src/lib/copy_dcp_details_to_film.cc b/src/lib/copy_dcp_details_to_film.cc index c33b0974b..9bd88a422 100644 --- a/src/lib/copy_dcp_details_to_film.cc +++ b/src/lib/copy_dcp_details_to_film.cc @@ -26,14 +26,13 @@ #include "audio_content.h" #include "ratio.h" #include "dcp_content_type.h" -#include #include using std::map; using std::string; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; void diff --git a/src/lib/copy_dcp_details_to_film.h b/src/lib/copy_dcp_details_to_film.h index 38eb7fcc9..1b5c05811 100644 --- a/src/lib/copy_dcp_details_to_film.h +++ b/src/lib/copy_dcp_details_to_film.h @@ -18,9 +18,11 @@ */ -#include + +#include + class DCPContent; class Film; -extern void copy_dcp_details_to_film (boost::shared_ptr dcp, boost::shared_ptr film); +extern void copy_dcp_details_to_film (std::shared_ptr dcp, std::shared_ptr film); diff --git a/src/lib/copy_to_drive_job.cc b/src/lib/copy_to_drive_job.cc index f78d3d3c5..eafa126b6 100644 --- a/src/lib/copy_to_drive_job.cc +++ b/src/lib/copy_to_drive_job.cc @@ -37,7 +37,7 @@ using std::string; using std::cout; using std::min; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using dcp::raw_convert; diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index 27822a1d3..247bf4aab 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -57,7 +57,7 @@ using std::vector; using std::cerr; using std::cout; using std::runtime_error; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using boost::function; diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc index a16907ebe..76c451a6f 100644 --- a/src/lib/cross_osx.cc +++ b/src/lib/cross_osx.cc @@ -64,7 +64,7 @@ using std::cerr; using std::cout; using std::runtime_error; using std::map; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using boost::function; diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc index ad5a88664..1fe555648 100644 --- a/src/lib/cross_windows.cc +++ b/src/lib/cross_windows.cc @@ -59,7 +59,7 @@ using std::cerr; using std::cout; using std::runtime_error; using std::map; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; static std::vector > locked_volumes; diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc index 2f56a4ee7..8baf489d1 100644 --- a/src/lib/dcp.cc +++ b/src/lib/dcp.cc @@ -34,8 +34,8 @@ using std::list; using std::string; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; /** Find all the CPLs in our directories, cross-add assets and return the CPLs */ diff --git a/src/lib/dcp.h b/src/lib/dcp.h index d449fdb39..d72ce6833 100644 --- a/src/lib/dcp.h +++ b/src/lib/dcp.h @@ -22,7 +22,6 @@ #define DCPOMATIC_DCP_H #include -#include #include #include @@ -31,15 +30,15 @@ class DCPContent; class DCP { public: - std::list > cpls () const; + std::list > cpls () const; protected: - explicit DCP (boost::shared_ptr content, bool tolerant) + explicit DCP (std::shared_ptr content, bool tolerant) : _dcp_content (content) , _tolerant (tolerant) {} - boost::shared_ptr _dcp_content; + std::shared_ptr _dcp_content; private: bool _tolerant; diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 3b90c9c4f..d4bd58e58 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -53,11 +53,11 @@ using std::pair; using std::vector; using std::list; using std::map; -using boost::shared_ptr; +using std::shared_ptr; using boost::scoped_ptr; using boost::optional; using boost::function; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h index 473dbae36..c235dd823 100644 --- a/src/lib/dcp_content.h +++ b/src/lib/dcp_content.h @@ -53,26 +53,26 @@ public: DCPContent (boost::filesystem::path p); DCPContent (cxml::ConstNodePtr, int version); - boost::shared_ptr shared_from_this () { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () { + return std::dynamic_pointer_cast (Content::shared_from_this ()); } - boost::shared_ptr shared_from_this () const { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () const { + return std::dynamic_pointer_cast (Content::shared_from_this ()); } - dcpomatic::DCPTime full_length (boost::shared_ptr film) const; + dcpomatic::DCPTime full_length (std::shared_ptr film) const; dcpomatic::DCPTime approximate_length () const; - void examine (boost::shared_ptr film, boost::shared_ptr); + void examine (std::shared_ptr film, std::shared_ptr); std::string summary () const; std::string technical_summary () const; void as_xml (xmlpp::Node *, bool with_paths) const; std::string identifier () const; - void take_settings_from (boost::shared_ptr c); + void take_settings_from (std::shared_ptr c); void set_default_colour_conversion (); - std::list reel_split_points (boost::shared_ptr film) const; + std::list reel_split_points (std::shared_ptr film) const; std::vector directories () const; @@ -99,7 +99,7 @@ public: return _reference_video; } - bool can_reference_video (boost::shared_ptr film, std::string &) const; + bool can_reference_video (std::shared_ptr film, std::string &) const; void set_reference_audio (bool r); @@ -108,7 +108,7 @@ public: return _reference_audio; } - bool can_reference_audio (boost::shared_ptr film, std::string &) const; + bool can_reference_audio (std::shared_ptr film, std::string &) const; void set_reference_text (TextType type, bool r); @@ -120,7 +120,7 @@ public: return _reference_text[type]; } - bool can_reference_text (boost::shared_ptr film, TextType type, std::string &) const; + bool can_reference_text (std::shared_ptr film, TextType type, std::string &) const; void set_cpl (std::string id); @@ -169,14 +169,14 @@ public: private: friend struct reels_test5; - void add_properties (boost::shared_ptr film, std::list& p) const; + void add_properties (std::shared_ptr film, std::list& p) const; void read_directory (boost::filesystem::path); void read_sub_directory (boost::filesystem::path); - std::list reels (boost::shared_ptr film) const; + std::list reels (std::shared_ptr film) const; bool can_reference ( - boost::shared_ptr film, - boost::function )>, + std::shared_ptr film, + boost::function )>, std::string overlapping, std::string& why_not ) const; diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 17710a3bd..aa8fed2b4 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -59,8 +59,8 @@ using std::cout; using std::map; using std::string; using std::vector; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::optional; using namespace dcpomatic; diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index 99bdb8bd4..553f05aed 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -42,14 +42,14 @@ class DCPDecoder : public DCP, public Decoder { public: DCPDecoder ( - boost::shared_ptr film, - boost::shared_ptr, + std::shared_ptr film, + std::shared_ptr, bool fast, bool tolerant, - boost::shared_ptr old + std::shared_ptr old ); - std::list > reels () const { + std::list > reels () const { return _reels; } @@ -75,28 +75,28 @@ private: void pass_texts (dcpomatic::ContentTime next, dcp::Size size); void pass_texts ( dcpomatic::ContentTime next, - boost::shared_ptr asset, + std::shared_ptr asset, bool reference, int64_t entry_point, - boost::shared_ptr decoder, + std::shared_ptr decoder, dcp::Size size ); - std::string calculate_lazy_digest (boost::shared_ptr) const; + std::string calculate_lazy_digest (std::shared_ptr) const; /** Time of next thing to return from pass relative to the start of _reel */ dcpomatic::ContentTime _next; - std::list > _reels; + std::list > _reels; - std::list >::iterator _reel; + std::list >::iterator _reel; /** Offset of _reel from the start of the content in frames */ int64_t _offset; /** Reader for current mono picture asset, if applicable */ - boost::shared_ptr _mono_reader; + std::shared_ptr _mono_reader; /** Reader for current stereo picture asset, if applicable */ - boost::shared_ptr _stereo_reader; + std::shared_ptr _stereo_reader; /** Reader for current sound asset, if applicable */ - boost::shared_ptr _sound_reader; - boost::shared_ptr _atmos_reader; + std::shared_ptr _sound_reader; + std::shared_ptr _atmos_reader; boost::optional _atmos_metadata; bool _decode_referenced; diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc index c530492cf..dfd8ed8d7 100644 --- a/src/lib/dcp_encoder.cc +++ b/src/lib/dcp_encoder.cc @@ -47,9 +47,9 @@ using std::string; using std::cout; using std::list; using std::vector; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h index e5df30fb5..65782d968 100644 --- a/src/lib/dcp_encoder.h +++ b/src/lib/dcp_encoder.h @@ -24,7 +24,6 @@ #include "dcp_text_track.h" #include "encoder.h" #include -#include class Film; class J2KEncoder; @@ -38,7 +37,7 @@ class AudioBuffers; class DCPEncoder : public Encoder { public: - DCPEncoder (boost::shared_ptr film, boost::weak_ptr job); + DCPEncoder (std::shared_ptr film, std::weak_ptr job); ~DCPEncoder (); void go (); @@ -53,13 +52,13 @@ public: private: - void video (boost::shared_ptr, dcpomatic::DCPTime); - void audio (boost::shared_ptr, dcpomatic::DCPTime); + void video (std::shared_ptr, dcpomatic::DCPTime); + void audio (std::shared_ptr, dcpomatic::DCPTime); void text (PlayerText, TextType, boost::optional, dcpomatic::DCPTimePeriod); - void atmos (boost::shared_ptr, dcpomatic::DCPTime, AtmosMetadata metadata); + void atmos (std::shared_ptr, dcpomatic::DCPTime, AtmosMetadata metadata); - boost::shared_ptr _writer; - boost::shared_ptr _j2k_encoder; + std::shared_ptr _writer; + std::shared_ptr _j2k_encoder; bool _finishing; bool _non_burnt_subtitles; diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc index 27eb74a5d..fc1fbc53a 100644 --- a/src/lib/dcp_examiner.cc +++ b/src/lib/dcp_examiner.cc @@ -53,8 +53,8 @@ using std::list; using std::cout; using std::runtime_error; using std::map; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) : DCP (content, tolerant) diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h index 232d7f0d8..f577e2b35 100644 --- a/src/lib/dcp_examiner.h +++ b/src/lib/dcp_examiner.h @@ -34,7 +34,7 @@ class DCPContent; class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer { public: - explicit DCPExaminer (boost::shared_ptr, bool tolerant); + explicit DCPExaminer (std::shared_ptr, bool tolerant); bool has_video () const { return _has_video; diff --git a/src/lib/dcp_subtitle.cc b/src/lib/dcp_subtitle.cc index f9aa7e0d9..6f579b2d3 100644 --- a/src/lib/dcp_subtitle.cc +++ b/src/lib/dcp_subtitle.cc @@ -28,7 +28,7 @@ using std::string; using std::exception; -using boost::shared_ptr; +using std::shared_ptr; shared_ptr DCPSubtitle::load (boost::filesystem::path file) const diff --git a/src/lib/dcp_subtitle.h b/src/lib/dcp_subtitle.h index 66e7a3f25..9cd0685aa 100644 --- a/src/lib/dcp_subtitle.h +++ b/src/lib/dcp_subtitle.h @@ -21,7 +21,6 @@ #ifndef DCPOMATIC_DCP_SUBTITLE_H #define DCPOMATIC_DCP_SUBTITLE_H -#include #include namespace dcp { @@ -31,7 +30,7 @@ namespace dcp { class DCPSubtitle { protected: - boost::shared_ptr load (boost::filesystem::path) const; + std::shared_ptr load (boost::filesystem::path) const; }; #endif diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index 43936314b..d58779ee2 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -33,8 +33,8 @@ using std::string; using std::list; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using dcp::raw_convert; using namespace dcpomatic; diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h index 5ff409546..f4a767d21 100644 --- a/src/lib/dcp_subtitle_content.h +++ b/src/lib/dcp_subtitle_content.h @@ -27,11 +27,11 @@ public: DCPSubtitleContent (boost::filesystem::path); DCPSubtitleContent (cxml::ConstNodePtr, int); - void examine (boost::shared_ptr film, boost::shared_ptr); + void examine (std::shared_ptr film, std::shared_ptr); 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 film) const; + dcpomatic::DCPTime full_length (std::shared_ptr film) const; dcpomatic::DCPTime approximate_length () const; private: diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc index 16a738a51..5c14b7885 100644 --- a/src/lib/dcp_subtitle_decoder.cc +++ b/src/lib/dcp_subtitle_decoder.cc @@ -29,8 +29,8 @@ using std::list; using std::map; using std::string; using std::vector; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::bind; using namespace dcpomatic; diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h index b53b88ded..31b8e6a8e 100644 --- a/src/lib/dcp_subtitle_decoder.h +++ b/src/lib/dcp_subtitle_decoder.h @@ -27,7 +27,7 @@ class DCPSubtitleContent; class DCPSubtitleDecoder : public DCPSubtitle, public Decoder { public: - DCPSubtitleDecoder (boost::shared_ptr film, boost::shared_ptr); + DCPSubtitleDecoder (std::shared_ptr film, std::shared_ptr); bool pass (); void seek (dcpomatic::ContentTime time, bool accurate); @@ -35,10 +35,10 @@ public: std::vector fonts () const; private: - dcpomatic::ContentTimePeriod content_time_period (boost::shared_ptr s) const; + dcpomatic::ContentTimePeriod content_time_period (std::shared_ptr s) const; - std::list > _subtitles; - std::list >::const_iterator _next; + std::list > _subtitles; + std::list >::const_iterator _next; std::vector _fonts; }; diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index ffeb23a46..ddad3d8e0 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -58,7 +58,7 @@ DCPOMATIC_ENABLE_WARNINGS using std::string; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using dcp::Size; using dcp::ArrayData; using dcp::raw_convert; diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h index aa11d7d3c..5d8b9b720 100644 --- a/src/lib/dcp_video.h +++ b/src/lib/dcp_video.h @@ -42,8 +42,8 @@ class PlayerVideo; class DCPVideo : public boost::noncopyable { public: - DCPVideo (boost::shared_ptr, int, int, int, Resolution); - DCPVideo (boost::shared_ptr, cxml::ConstNodePtr); + DCPVideo (std::shared_ptr, int, int, int, Resolution); + DCPVideo (std::shared_ptr, cxml::ConstNodePtr); dcp::ArrayData encode_locally (); dcp::ArrayData encode_remotely (EncodeServerDescription, int timeout = 30); @@ -54,15 +54,15 @@ public: Eyes eyes () const; - bool same (boost::shared_ptr other) const; + bool same (std::shared_ptr other) const; - static boost::shared_ptr convert_to_xyz (boost::shared_ptr frame, dcp::NoteHandler note); + static std::shared_ptr convert_to_xyz (std::shared_ptr frame, dcp::NoteHandler note); private: void add_metadata (xmlpp::Element *) const; - boost::shared_ptr _frame; + std::shared_ptr _frame; int _index; ///< frame index within the DCP's intrinsic duration int _frames_per_second; ///< Frames per second that we will use for the DCP int _j2k_bandwidth; ///< J2K bandwidth to use diff --git a/src/lib/dcpomatic_log.cc b/src/lib/dcpomatic_log.cc index 63b5ad375..a64dc907c 100644 --- a/src/lib/dcpomatic_log.cc +++ b/src/lib/dcpomatic_log.cc @@ -22,4 +22,4 @@ #include "null_log.h" /** The current log; set up by the front-ends when they have a Film to log into */ -boost::shared_ptr dcpomatic_log (new NullLog()); +std::shared_ptr dcpomatic_log (new NullLog()); diff --git a/src/lib/dcpomatic_log.h b/src/lib/dcpomatic_log.h index d5d230414..c557bb17d 100644 --- a/src/lib/dcpomatic_log.h +++ b/src/lib/dcpomatic_log.h @@ -20,10 +20,9 @@ #include "log.h" #include "compose.hpp" -#include /** The current log; set up by the front-ends when they have a Film to log into */ -extern boost::shared_ptr dcpomatic_log; +extern std::shared_ptr dcpomatic_log; #define LOG_GENERAL(...) dcpomatic_log->log(String::compose(__VA_ARGS__), LogEntry::TYPE_GENERAL); #define LOG_GENERAL_NC(...) dcpomatic_log->log(__VA_ARGS__, LogEntry::TYPE_GENERAL); diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc index 580c7d36b..a92a294e6 100644 --- a/src/lib/dcpomatic_socket.cc +++ b/src/lib/dcpomatic_socket.cc @@ -28,8 +28,8 @@ #include "i18n.h" -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; /** @param timeout Timeout in seconds */ Socket::Socket (int timeout) diff --git a/src/lib/dcpomatic_socket.h b/src/lib/dcpomatic_socket.h index 1fa0b046f..49a278588 100644 --- a/src/lib/dcpomatic_socket.h +++ b/src/lib/dcpomatic_socket.h @@ -22,7 +22,6 @@ #include #include #include -#include /** @class Socket * @brief A class to wrap a boost::asio::ip::tcp::socket with some things @@ -52,10 +51,10 @@ public: class ReadDigestScope { public: - ReadDigestScope (boost::shared_ptr socket); + ReadDigestScope (std::shared_ptr socket); bool check (); private: - boost::weak_ptr _socket; + std::weak_ptr _socket; }; /** After one of these is created everything that is sent from the socket will be @@ -65,10 +64,10 @@ public: class WriteDigestScope { public: - WriteDigestScope (boost::shared_ptr socket); + WriteDigestScope (std::shared_ptr socket); ~WriteDigestScope (); private: - boost::weak_ptr _socket; + std::weak_ptr _socket; }; private: diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index d51282b53..a53118061 100644 --- a/src/lib/decoder.cc +++ b/src/lib/decoder.cc @@ -27,8 +27,8 @@ using std::cout; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using namespace dcpomatic; Decoder::Decoder (weak_ptr film) diff --git a/src/lib/decoder.h b/src/lib/decoder.h index 169d55553..da5be4af6 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -45,15 +45,15 @@ class DecoderPart; class Decoder : public boost::noncopyable, public WeakConstFilm { public: - Decoder (boost::weak_ptr film); + Decoder (std::weak_ptr film); virtual ~Decoder () {} - boost::shared_ptr video; - boost::shared_ptr audio; - std::list > text; - boost::shared_ptr atmos; + std::shared_ptr video; + std::shared_ptr audio; + std::list > text; + std::shared_ptr atmos; - boost::shared_ptr only_text () const; + std::shared_ptr only_text () const; /** Do some decoding and perhaps emit video, audio or subtitle data. * @return true if this decoder will emit no more data unless a seek() happens. diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc index 12e3f3ddd..f68a443b5 100644 --- a/src/lib/decoder_factory.cc +++ b/src/lib/decoder_factory.cc @@ -36,8 +36,8 @@ #include using std::list; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; template shared_ptr diff --git a/src/lib/decoder_factory.h b/src/lib/decoder_factory.h index 0cd90a585..1a39f37e2 100644 --- a/src/lib/decoder_factory.h +++ b/src/lib/decoder_factory.h @@ -20,10 +20,10 @@ class ImageDecoder; -extern boost::shared_ptr decoder_factory ( - boost::shared_ptr film, - boost::shared_ptr content, +extern std::shared_ptr decoder_factory ( + std::shared_ptr film, + std::shared_ptr content, bool fast, bool tolerant, - boost::shared_ptr old_decoder + std::shared_ptr old_decoder ); diff --git a/src/lib/decoder_part.cc b/src/lib/decoder_part.cc index 3e06204de..2bab1603e 100644 --- a/src/lib/decoder_part.cc +++ b/src/lib/decoder_part.cc @@ -21,7 +21,7 @@ #include "decoder_part.h" #include "decoder.h" -using boost::shared_ptr; +using std::shared_ptr; DecoderPart::DecoderPart (Decoder* parent) : _parent (parent) diff --git a/src/lib/decoder_part.h b/src/lib/decoder_part.h index c8e13445a..96225f3dd 100644 --- a/src/lib/decoder_part.h +++ b/src/lib/decoder_part.h @@ -34,7 +34,7 @@ public: DecoderPart (Decoder* parent); virtual ~DecoderPart () {} - virtual boost::optional position (boost::shared_ptr film) const = 0; + virtual boost::optional position (std::shared_ptr film) const = 0; virtual void seek () = 0; void set_ignore (bool i) { diff --git a/src/lib/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc index b9db06152..a12d95a4c 100644 --- a/src/lib/dkdm_recipient.cc +++ b/src/lib/dkdm_recipient.cc @@ -27,7 +27,7 @@ using std::string; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; using dcp::raw_convert; diff --git a/src/lib/dkdm_recipient.h b/src/lib/dkdm_recipient.h index ecaccd0a0..7cf59a495 100644 --- a/src/lib/dkdm_recipient.h +++ b/src/lib/dkdm_recipient.h @@ -54,9 +54,9 @@ public: KDMWithMetadataPtr kdm_for_dkdm_recipient ( - boost::shared_ptr film, + std::shared_ptr film, boost::filesystem::path cpl, - boost::shared_ptr recipient, + std::shared_ptr recipient, boost::posix_time::ptime valid_from, boost::posix_time::ptime valid_to ); diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc index 23539bd94..66f67114d 100644 --- a/src/lib/dkdm_wrapper.cc +++ b/src/lib/dkdm_wrapper.cc @@ -29,8 +29,8 @@ DCPOMATIC_ENABLE_WARNINGS using std::string; using std::list; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; shared_ptr DKDMBase::read (cxml::ConstNodePtr node) diff --git a/src/lib/dkdm_wrapper.h b/src/lib/dkdm_wrapper.h index 09e9d25c4..261cdc767 100644 --- a/src/lib/dkdm_wrapper.h +++ b/src/lib/dkdm_wrapper.h @@ -20,7 +20,8 @@ #include #include -#include +#include + namespace xmlpp { class Element; @@ -28,25 +29,25 @@ namespace xmlpp { class DKDMGroup; -class DKDMBase : public boost::enable_shared_from_this +class DKDMBase : public std::enable_shared_from_this { public: virtual ~DKDMBase () {} virtual std::string name () const = 0; virtual void as_xml (xmlpp::Element *) const = 0; - static boost::shared_ptr read (cxml::ConstNodePtr node); + static std::shared_ptr read (cxml::ConstNodePtr node); - boost::shared_ptr parent () const { + std::shared_ptr parent () const { return _parent; } - void set_parent (boost::shared_ptr parent) { + void set_parent (std::shared_ptr parent) { _parent = parent; } private: - boost::shared_ptr _parent; + std::shared_ptr _parent; }; class DKDM : public DKDMBase @@ -80,14 +81,14 @@ public: void as_xml (xmlpp::Element *) const; - std::list > children () const { + std::list > children () const { return _children; } - void add (boost::shared_ptr child, boost::shared_ptr previous = boost::shared_ptr ()); - void remove (boost::shared_ptr child); + void add (std::shared_ptr child, std::shared_ptr previous = std::shared_ptr ()); + void remove (std::shared_ptr child); private: std::string _name; - std::list > _children; + std::list > _children; }; diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc index 6fe537eb1..b7cae7079 100644 --- a/src/lib/emailer.cc +++ b/src/lib/emailer.cc @@ -34,7 +34,7 @@ using std::min; using std::list; using std::cout; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; using dcp::ArrayData; Emailer::Emailer (string from, list to, string subject, string body) diff --git a/src/lib/empty.cc b/src/lib/empty.cc index c145c231b..00baaeb14 100644 --- a/src/lib/empty.cc +++ b/src/lib/empty.cc @@ -31,8 +31,8 @@ using std::cout; using std::list; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::function; using namespace dcpomatic; diff --git a/src/lib/empty.h b/src/lib/empty.h index 2368c4491..2a975562a 100644 --- a/src/lib/empty.h +++ b/src/lib/empty.h @@ -35,7 +35,7 @@ class Empty { public: Empty () {} - Empty (boost::shared_ptr film, boost::shared_ptr playlist, boost::function)> part, dcpomatic::DCPTime length); + Empty (std::shared_ptr film, std::shared_ptr playlist, boost::function)> part, dcpomatic::DCPTime length); dcpomatic::DCPTime position () const { return _position; diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc index 9e096fdfa..a14578a6b 100644 --- a/src/lib/encode_server.cc +++ b/src/lib/encode_server.cc @@ -60,7 +60,7 @@ using std::list; using std::cout; using std::cerr; using std::fixed; -using boost::shared_ptr; +using std::shared_ptr; using boost::thread; using boost::bind; using boost::scoped_array; diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h index a43cea7ef..d313a851d 100644 --- a/src/lib/encode_server.h +++ b/src/lib/encode_server.h @@ -48,14 +48,14 @@ public: void run (); private: - void handle (boost::shared_ptr); + void handle (std::shared_ptr); void worker_thread (); - int process (boost::shared_ptr socket, struct timeval &, struct timeval &); + int process (std::shared_ptr socket, struct timeval &, struct timeval &); void broadcast_thread (); void broadcast_received (); boost::thread_group _worker_threads; - std::list > _queue; + std::list > _queue; boost::condition _full_condition; boost::condition _empty_condition; bool _verbose; diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc index c823d868f..5a5a2bfb7 100644 --- a/src/lib/encode_server_finder.cc +++ b/src/lib/encode_server_finder.cc @@ -37,9 +37,9 @@ using std::string; using std::list; using std::vector; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using boost::scoped_array; -using boost::weak_ptr; +using std::weak_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/lib/encode_server_finder.h b/src/lib/encode_server_finder.h index 78b72fa9c..a58c75382 100644 --- a/src/lib/encode_server_finder.h +++ b/src/lib/encode_server_finder.h @@ -64,7 +64,7 @@ private: boost::optional::iterator> server_found (std::string); void start_accept (); - void handle_accept (boost::system::error_code ec, boost::shared_ptr socket); + void handle_accept (boost::system::error_code ec, std::shared_ptr socket); void config_changed (Config::Property what); @@ -79,7 +79,7 @@ private: mutable boost::mutex _servers_mutex; boost::asio::io_service _listen_io_service; - boost::shared_ptr _listen_acceptor; + std::shared_ptr _listen_acceptor; bool _stop; boost::condition _search_condition; diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 0a29989b1..fd826deb6 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -31,8 +31,8 @@ #include "i18n.h" -using boost::weak_ptr; -using boost::shared_ptr; +using std::weak_ptr; +using std::shared_ptr; /** Construct an encoder. * @param film Film that we are encoding. diff --git a/src/lib/encoder.h b/src/lib/encoder.h index 792029a91..78c1f9908 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -23,7 +23,6 @@ #include "types.h" #include "player_text.h" -#include #include class Film; @@ -37,7 +36,7 @@ class AudioBuffers; class Encoder : public boost::noncopyable { public: - Encoder (boost::shared_ptr film, boost::weak_ptr job); + Encoder (std::shared_ptr film, std::weak_ptr job); virtual ~Encoder () {} virtual void go () = 0; @@ -52,9 +51,9 @@ public: virtual bool finishing () const = 0; protected: - boost::shared_ptr _film; - boost::weak_ptr _job; - boost::shared_ptr _player; + std::shared_ptr _film; + std::weak_ptr _job; + std::shared_ptr _player; }; #endif diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc index 31279acfb..fd44100cd 100644 --- a/src/lib/environment_info.cc +++ b/src/lib/environment_info.cc @@ -38,7 +38,7 @@ extern "C" { using std::string; using std::list; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; /** @param v Version as used by FFmpeg. * @return A string representation of v. diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc index 3be38863d..fb9439155 100644 --- a/src/lib/examine_content_job.cc +++ b/src/lib/examine_content_job.cc @@ -29,7 +29,7 @@ using std::string; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; ExamineContentJob::ExamineContentJob (shared_ptr film, shared_ptr c) : Job (film) diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h index 0105035ff..00d27a342 100644 --- a/src/lib/examine_content_job.h +++ b/src/lib/examine_content_job.h @@ -19,24 +19,23 @@ */ #include "job.h" -#include class Content; class ExamineContentJob : public Job { public: - ExamineContentJob (boost::shared_ptr, boost::shared_ptr); + ExamineContentJob (std::shared_ptr, std::shared_ptr); ~ExamineContentJob (); std::string name () const; std::string json_name () const; void run (); - boost::shared_ptr content () const { + std::shared_ptr content () const { return _content; } private: - boost::shared_ptr _content; + std::shared_ptr _content; }; diff --git a/src/lib/examine_ffmpeg_subtitles_job.cc b/src/lib/examine_ffmpeg_subtitles_job.cc index b2bba11cd..90589eb28 100644 --- a/src/lib/examine_ffmpeg_subtitles_job.cc +++ b/src/lib/examine_ffmpeg_subtitles_job.cc @@ -33,7 +33,7 @@ extern "C" { using std::string; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; ExamineFFmpegSubtitlesJob::ExamineFFmpegSubtitlesJob (shared_ptr film, shared_ptr c) : Job (film) diff --git a/src/lib/examine_ffmpeg_subtitles_job.h b/src/lib/examine_ffmpeg_subtitles_job.h index 0a0101193..c9c0cabf4 100644 --- a/src/lib/examine_ffmpeg_subtitles_job.h +++ b/src/lib/examine_ffmpeg_subtitles_job.h @@ -20,14 +20,13 @@ #include "job.h" #include "ffmpeg.h" -#include class FFmpegContent; class ExamineFFmpegSubtitlesJob : public Job, public FFmpeg { public: - ExamineFFmpegSubtitlesJob (boost::shared_ptr, boost::shared_ptr); + ExamineFFmpegSubtitlesJob (std::shared_ptr, std::shared_ptr); ~ExamineFFmpegSubtitlesJob (); std::string name () const; @@ -35,5 +34,5 @@ public: void run (); private: - boost::shared_ptr _content; + std::shared_ptr _content; }; diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index f9c1ef063..11a332bdb 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -46,14 +46,14 @@ using std::string; using std::cout; using std::cerr; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using dcp::raw_convert; using namespace dcpomatic; boost::mutex FFmpeg::_mutex; -FFmpeg::FFmpeg (boost::shared_ptr c) +FFmpeg::FFmpeg (std::shared_ptr c) : _ffmpeg_content (c) , _avio_buffer (0) , _avio_buffer_size (4096) diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h index e6399c076..a9823007b 100644 --- a/src/lib/ffmpeg.h +++ b/src/lib/ffmpeg.h @@ -29,7 +29,6 @@ extern "C" { #include } DCPOMATIC_ENABLE_WARNINGS -#include #include struct AVFormatContext; @@ -43,10 +42,10 @@ class Log; class FFmpeg { public: - explicit FFmpeg (boost::shared_ptr); + explicit FFmpeg (std::shared_ptr); virtual ~FFmpeg (); - boost::shared_ptr ffmpeg_content () const { + std::shared_ptr ffmpeg_content () const { return _ffmpeg_content; } @@ -57,12 +56,12 @@ protected: AVCodecContext* video_codec_context () const; AVCodecContext* subtitle_codec_context () const; dcpomatic::ContentTime pts_offset ( - std::vector > audio_streams, boost::optional first_video, double video_frame_rate + std::vector > audio_streams, boost::optional first_video, double video_frame_rate ) const; static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const & sub); - boost::shared_ptr _ffmpeg_content; + std::shared_ptr _ffmpeg_content; uint8_t* _avio_buffer; int _avio_buffer_size; @@ -87,7 +86,7 @@ private: void setup_decoders (); static void ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl); - static boost::weak_ptr _ffmpeg_log; + static std::weak_ptr _ffmpeg_log; }; #endif diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index ac62ac7f4..6f3aceff8 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -53,8 +53,8 @@ using std::cout; using std::pair; using std::make_pair; using std::max; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::optional; using dcp::raw_convert; using namespace dcpomatic; diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index f933e4195..fccc7ad99 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -49,22 +49,22 @@ class FFmpegContent : public Content public: FFmpegContent (boost::filesystem::path); FFmpegContent (cxml::ConstNodePtr, int version, std::list &); - FFmpegContent (std::vector >); + FFmpegContent (std::vector >); - boost::shared_ptr shared_from_this () { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () { + return std::dynamic_pointer_cast (Content::shared_from_this ()); } - boost::shared_ptr shared_from_this () const { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () const { + return std::dynamic_pointer_cast (Content::shared_from_this ()); } - void examine (boost::shared_ptr film, boost::shared_ptr); - void take_settings_from (boost::shared_ptr c); + void examine (std::shared_ptr film, std::shared_ptr); + void take_settings_from (std::shared_ptr 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 film) const; + dcpomatic::DCPTime full_length (std::shared_ptr film) const; dcpomatic::DCPTime approximate_length () const; std::string identifier () const; @@ -73,24 +73,24 @@ public: void set_filters (std::vector const &); - std::vector > subtitle_streams () const { + std::vector > subtitle_streams () const { boost::mutex::scoped_lock lm (_mutex); return _subtitle_streams; } - boost::shared_ptr subtitle_stream () const { + std::shared_ptr subtitle_stream () const { boost::mutex::scoped_lock lm (_mutex); return _subtitle_stream; } - std::vector > ffmpeg_audio_streams () const; + std::vector > ffmpeg_audio_streams () const; std::vector filters () const { boost::mutex::scoped_lock lm (_mutex); return _filters; } - void set_subtitle_stream (boost::shared_ptr); + void set_subtitle_stream (std::shared_ptr); boost::optional first_video () const { boost::mutex::scoped_lock lm (_mutex); @@ -100,13 +100,13 @@ public: void signal_subtitle_stream_changed (); private: - void add_properties (boost::shared_ptr film, std::list &) const; + void add_properties (std::shared_ptr film, std::list &) const; friend struct ffmpeg_pts_offset_test; friend struct audio_sampling_rate_test; - std::vector > _subtitle_streams; - boost::shared_ptr _subtitle_stream; + std::vector > _subtitle_streams; + std::shared_ptr _subtitle_stream; boost::optional _first_video; /** Video filters that should be used when generating DCPs */ std::vector _filters; diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 0d6539061..ae4ab237f 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -68,11 +68,11 @@ using std::min; using std::pair; using std::max; using std::map; -using boost::shared_ptr; +using std::shared_ptr; using boost::is_any_of; using boost::split; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using dcp::Size; using namespace dcpomatic; diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 65f36a004..ca42e013e 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -28,7 +28,6 @@ extern "C" { #include } -#include #include #include @@ -45,7 +44,7 @@ struct ffmpeg_pts_offset_test; class FFmpegDecoder : public FFmpeg, public Decoder { public: - FFmpegDecoder (boost::shared_ptr film, boost::shared_ptr, bool fast); + FFmpegDecoder (std::shared_ptr film, std::shared_ptr, bool fast); bool pass (); void seek (dcpomatic::ContentTime time, bool); @@ -55,8 +54,8 @@ private: void flush (); - AVSampleFormat audio_sample_format (boost::shared_ptr stream) const; - int bytes_per_audio_sample (boost::shared_ptr stream) const; + AVSampleFormat audio_sample_format (std::shared_ptr stream) const; + int bytes_per_audio_sample (std::shared_ptr stream) const; bool decode_video_packet (); void decode_audio_packet (); @@ -66,9 +65,9 @@ private: void decode_ass_subtitle (std::string ass, dcpomatic::ContentTime from); void maybe_add_subtitle (); - boost::shared_ptr deinterleave_audio (boost::shared_ptr stream) const; + std::shared_ptr deinterleave_audio (std::shared_ptr stream) const; - std::list > _filter_graphs; + std::list > _filter_graphs; boost::mutex _filter_graphs_mutex; dcpomatic::ContentTime _pts_offset; @@ -76,7 +75,7 @@ private: /** true if we have a subtitle which has not had emit_stop called for it yet */ bool _have_current_subtitle; - boost::shared_ptr _black_image; + std::shared_ptr _black_image; std::vector > _next_time; }; diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 443e16939..4e1f0bcb5 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -38,9 +38,9 @@ using std::cout; using std::pair; using std::list; using std::map; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; -using boost::weak_ptr; +using std::weak_ptr; using boost::optional; using namespace dcpomatic; #if BOOST_VERSION >= 106100 @@ -279,7 +279,7 @@ FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const } } - map >::const_iterator i = _encoders.find (eyes); + map >::const_iterator i = _encoders.find (eyes); DCPOMATIC_ASSERT (i != _encoders.end()); return i->second; } @@ -287,7 +287,7 @@ FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const void FFmpegEncoder::FileEncoderSet::flush () { - for (map >::iterator i = _encoders.begin(); i != _encoders.end(); ++i) { + for (map >::iterator i = _encoders.begin(); i != _encoders.end(); ++i) { i->second->flush (); } } @@ -295,7 +295,7 @@ FFmpegEncoder::FileEncoderSet::flush () void FFmpegEncoder::FileEncoderSet::audio (shared_ptr a) { - for (map >::iterator i = _encoders.begin(); i != _encoders.end(); ++i) { + for (map >::iterator i = _encoders.begin(); i != _encoders.end(); ++i) { i->second->audio (a); } } diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h index c71f8fa63..710364b01 100644 --- a/src/lib/ffmpeg_encoder.h +++ b/src/lib/ffmpeg_encoder.h @@ -32,8 +32,8 @@ class FFmpegEncoder : public Encoder { public: FFmpegEncoder ( - boost::shared_ptr film, - boost::weak_ptr job, + std::shared_ptr film, + std::weak_ptr job, boost::filesystem::path output, ExportFormat format, bool mixdown_to_stereo, @@ -68,12 +68,12 @@ private: std::string extension ); - boost::shared_ptr get (Eyes eyes) const; + std::shared_ptr get (Eyes eyes) const; void flush (); - void audio (boost::shared_ptr); + void audio (std::shared_ptr); private: - std::map > _encoders; + std::map > _encoders; }; int _output_audio_channels; @@ -89,7 +89,7 @@ private: bool _audio_stream_per_channel; int _x264_crf; - boost::shared_ptr _butler; + std::shared_ptr _butler; }; #endif diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc index bfd7e7722..b75d6c514 100644 --- a/src/lib/ffmpeg_examiner.cc +++ b/src/lib/ffmpeg_examiner.cc @@ -45,7 +45,7 @@ using std::string; using std::cout; using std::max; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h index 3852f51a5..394e51409 100644 --- a/src/lib/ffmpeg_examiner.h +++ b/src/lib/ffmpeg_examiner.h @@ -31,7 +31,7 @@ class Job; class FFmpegExaminer : public FFmpeg, public VideoExaminer { public: - FFmpegExaminer (boost::shared_ptr, boost::shared_ptr job = boost::shared_ptr ()); + FFmpegExaminer (std::shared_ptr, std::shared_ptr job = std::shared_ptr ()); bool has_video () const; @@ -41,11 +41,11 @@ public: boost::optional sample_aspect_ratio () const; bool yuv () const; - std::vector > subtitle_streams () const { + std::vector > subtitle_streams () const { return _subtitle_streams; } - std::vector > audio_streams () const { + std::vector > audio_streams () const { return _audio_streams; } @@ -83,14 +83,14 @@ public: private: void video_packet (AVCodecContext *, std::string& temporal_reference); - void audio_packet (AVCodecContext *, boost::shared_ptr); + void audio_packet (AVCodecContext *, std::shared_ptr); std::string stream_name (AVStream* s) const; std::string subtitle_stream_name (AVStream* s) const; boost::optional frame_time (AVStream* s) const; - std::vector > _subtitle_streams; - std::vector > _audio_streams; + std::vector > _subtitle_streams; + std::vector > _audio_streams; boost::optional _first_video; /** Video length, either obtained from the header or derived by running * through the whole file. @@ -115,6 +115,6 @@ private: dcpomatic::ContentTime time; }; - typedef std::map, boost::optional > LastSubtitleMap; + typedef std::map, boost::optional > LastSubtitleMap; LastSubtitleMap _last_subtitle_start; }; diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc index e527b1820..99637564a 100644 --- a/src/lib/ffmpeg_file_encoder.cc +++ b/src/lib/ffmpeg_file_encoder.cc @@ -35,9 +35,9 @@ using std::string; using std::runtime_error; using std::cout; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; -using boost::weak_ptr; +using std::weak_ptr; using boost::optional; using namespace dcpomatic; #if BOOST_VERSION >= 106100 diff --git a/src/lib/ffmpeg_file_encoder.h b/src/lib/ffmpeg_file_encoder.h index 08fc4778b..d644a1939 100644 --- a/src/lib/ffmpeg_file_encoder.h +++ b/src/lib/ffmpeg_file_encoder.h @@ -51,8 +51,8 @@ public: ~FFmpegFileEncoder (); - void video (boost::shared_ptr, dcpomatic::DCPTime); - void audio (boost::shared_ptr); + void video (std::shared_ptr, dcpomatic::DCPTime); + void audio (std::shared_ptr); void subtitle (PlayerText, dcpomatic::DCPTimePeriod); void flush (); @@ -70,7 +70,7 @@ private: AVCodec* _video_codec; AVCodecContext* _video_codec_context; - std::vector > _audio_streams; + std::vector > _audio_streams; bool _audio_stream_per_channel; AVFormatContext* _format_context; AVStream* _video_stream; @@ -88,12 +88,12 @@ private: int64_t _audio_frames; - boost::shared_ptr _pending_audio; + std::shared_ptr _pending_audio; /** Store of shared_ptr to keep them alive whilst raw pointers into their data have been passed to FFmpeg. */ - std::map > _pending_images; + std::map > _pending_images; boost::mutex _pending_images_mutex; static int _video_stream_index; diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc index c978fc383..5b2280cfd 100644 --- a/src/lib/ffmpeg_image_proxy.cc +++ b/src/lib/ffmpeg_image_proxy.cc @@ -44,9 +44,9 @@ using std::cout; using std::pair; using std::min; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using dcp::raw_convert; FFmpegImageProxy::FFmpegImageProxy (boost::filesystem::path path, VideoRange video_range) diff --git a/src/lib/ffmpeg_image_proxy.h b/src/lib/ffmpeg_image_proxy.h index 4fca899f4..92689abe8 100644 --- a/src/lib/ffmpeg_image_proxy.h +++ b/src/lib/ffmpeg_image_proxy.h @@ -29,15 +29,15 @@ class FFmpegImageProxy : public ImageProxy public: explicit FFmpegImageProxy (boost::filesystem::path, VideoRange video_range); explicit FFmpegImageProxy (dcp::ArrayData, VideoRange video_range); - FFmpegImageProxy (boost::shared_ptr xml, boost::shared_ptr socket); + FFmpegImageProxy (std::shared_ptr xml, std::shared_ptr socket); Result image ( boost::optional size = boost::optional () ) const; void add_metadata (xmlpp::Node *) const; - void write_to_socket (boost::shared_ptr) const; - bool same (boost::shared_ptr other) const; + void write_to_socket (std::shared_ptr) const; + bool same (std::shared_ptr other) const; size_t memory_used () const; int avio_read (uint8_t* buffer, int const amount); @@ -51,6 +51,6 @@ private: failed-decode errors can give more detail. */ boost::optional _path; - mutable boost::shared_ptr _image; + mutable std::shared_ptr _image; mutable boost::mutex _mutex; }; diff --git a/src/lib/file_log.cc b/src/lib/file_log.cc index b9aa84c3d..481624c2a 100644 --- a/src/lib/file_log.cc +++ b/src/lib/file_log.cc @@ -28,7 +28,7 @@ using std::cout; using std::string; using std::max; -using boost::shared_ptr; +using std::shared_ptr; /** @param file Filename to write log to */ FileLog::FileLog (boost::filesystem::path file) diff --git a/src/lib/file_log.h b/src/lib/file_log.h index 613dd0939..64e6a2505 100644 --- a/src/lib/file_log.h +++ b/src/lib/file_log.h @@ -29,7 +29,7 @@ public: std::string head_and_tail (int amount = 1024) const; private: - void do_log (boost::shared_ptr entry); + void do_log (std::shared_ptr entry); /** filename to write to */ boost::filesystem::path _file; diff --git a/src/lib/film.cc b/src/lib/film.cc index 5b8acbae9..68e5c1c1f 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -97,9 +97,9 @@ using std::back_inserter; using std::map; using std::exception; using std::find; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::optional; using boost::is_any_of; #if BOOST_VERSION >= 106100 diff --git a/src/lib/film.h b/src/lib/film.h index 4c71c9e16..d79448689 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -95,19 +94,19 @@ private: * * The content of a Film is held in a Playlist (created and managed by the Film). */ -class Film : public boost::enable_shared_from_this, public Signaller, public boost::noncopyable +class Film : public std::enable_shared_from_this, public Signaller, public boost::noncopyable { public: explicit Film (boost::optional dir); ~Film (); - boost::shared_ptr info_file_handle (dcpomatic::DCPTimePeriod period, bool read) const; + std::shared_ptr info_file_handle (dcpomatic::DCPTimePeriod period, bool read) const; boost::filesystem::path j2c_path (int, Frame, Eyes, bool) const; boost::filesystem::path internal_video_asset_dir () const; boost::filesystem::path internal_video_asset_filename (dcpomatic::DCPTimePeriod p) const; - boost::filesystem::path audio_analysis_path (boost::shared_ptr) const; - boost::filesystem::path subtitle_analysis_path (boost::shared_ptr) const; + boost::filesystem::path audio_analysis_path (std::shared_ptr) const; + boost::filesystem::path subtitle_analysis_path (std::shared_ptr) const; void send_dcp_to_tms (); void make_dcp (bool gui = false, bool check = true); @@ -115,7 +114,7 @@ public: /** @return Logger. * It is safe to call this from any thread. */ - boost::shared_ptr log () const { + std::shared_ptr log () const { return _log; } @@ -127,9 +126,9 @@ public: void write_metadata () const; void write_metadata (boost::filesystem::path path) const; void write_template (boost::filesystem::path path) const; - boost::shared_ptr metadata (bool with_content_paths = true) const; + std::shared_ptr metadata (bool with_content_paths = true) const; - void copy_from (boost::shared_ptr film); + void copy_from (std::shared_ptr film); std::string isdcf_name (bool if_created_now) const; std::string dcp_name (bool if_created_now = false) const; @@ -179,7 +178,7 @@ public: void repeat_content (ContentList, int); - boost::shared_ptr playlist () const { + std::shared_ptr playlist () const { return _playlist; } @@ -386,12 +385,12 @@ public: void set_directory (boost::filesystem::path); void set_name (std::string); void set_use_isdcf_name (bool); - void examine_and_add_content (boost::shared_ptr content, bool disable_audio_analysis = false); - void add_content (boost::shared_ptr); - void remove_content (boost::shared_ptr); + void examine_and_add_content (std::shared_ptr content, bool disable_audio_analysis = false); + void add_content (std::shared_ptr); + void remove_content (std::shared_ptr); void remove_content (ContentList); - void move_content_earlier (boost::shared_ptr); - void move_content_later (boost::shared_ptr); + void move_content_earlier (std::shared_ptr); + void move_content_later (std::shared_ptr); void set_dcp_content_type (DCPContentType const *); void set_container (Ratio const *, bool user_explicit = true); void set_resolution (Resolution, bool user_explicit = true); @@ -432,7 +431,7 @@ public: mutable boost::signals2::signal Change; /** Emitted when some property of our content has changed */ - mutable boost::signals2::signal, int, bool)> ContentChange; + mutable boost::signals2::signal, int, bool)> ContentChange; /** Emitted when the film's length might have changed; this is not like a normal property as its value is derived from the playlist, so it has its own signal. @@ -459,9 +458,9 @@ private: std::string video_identifier () const; void playlist_change (ChangeType); void playlist_order_changed (); - void playlist_content_change (ChangeType type, boost::weak_ptr, int, bool frequent); + void playlist_content_change (ChangeType type, std::weak_ptr, int, bool frequent); void playlist_length_change (); - void maybe_add_content (boost::weak_ptr, boost::weak_ptr, bool disable_audio_analysis); + void maybe_add_content (std::weak_ptr, std::weak_ptr, bool disable_audio_analysis); void audio_analysis_finished (); void check_settings_consistency (); void maybe_set_container_and_resolution (); @@ -469,8 +468,8 @@ private: static std::string const metadata_file; /** Log to write to */ - boost::shared_ptr _log; - boost::shared_ptr _playlist; + std::shared_ptr _log; + std::shared_ptr _playlist; /** Complete path to directory containing the film metadata; * must not be relative. @@ -537,7 +536,7 @@ private: /** true if our state has changed since we last saved it */ mutable bool _dirty; /** film being used as a template, or 0 */ - boost::shared_ptr _template_film; + std::shared_ptr _template_film; /** Be tolerant of errors in content (currently applies to DCP only). Not saved as state. diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc index daceeaf2d..2a690eeb9 100644 --- a/src/lib/filter_graph.cc +++ b/src/lib/filter_graph.cc @@ -42,8 +42,8 @@ using std::pair; using std::make_pair; using std::cout; using std::vector; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using dcp::Size; /** Construct a FilterGraph for the settings in a piece of content */ diff --git a/src/lib/font_data.cc b/src/lib/font_data.cc index 83b6562f0..f6a61f24a 100644 --- a/src/lib/font_data.cc +++ b/src/lib/font_data.cc @@ -22,10 +22,9 @@ #include "font.h" #include "font_data.h" #include "dcpomatic_assert.h" -#include -using boost::shared_ptr; +using std::shared_ptr; dcpomatic::FontData::FontData (shared_ptr font) diff --git a/src/lib/font_data.h b/src/lib/font_data.h index 686fca7c9..895493ce2 100644 --- a/src/lib/font_data.h +++ b/src/lib/font_data.h @@ -38,7 +38,7 @@ class Font; class FontData { public: - FontData (boost::shared_ptr font); + FontData (std::shared_ptr font); FontData (std::string id_, dcp::ArrayData data_) : id(id_) diff --git a/src/lib/frame_rate_change.cc b/src/lib/frame_rate_change.cc index 8ad6de942..7b6d13892 100644 --- a/src/lib/frame_rate_change.cc +++ b/src/lib/frame_rate_change.cc @@ -28,7 +28,7 @@ #include "i18n.h" using std::string; -using boost::shared_ptr; +using std::shared_ptr; static bool about_equal (double a, double b) diff --git a/src/lib/frame_rate_change.h b/src/lib/frame_rate_change.h index acb75c0b5..d7fed6dd0 100644 --- a/src/lib/frame_rate_change.h +++ b/src/lib/frame_rate_change.h @@ -21,9 +21,11 @@ #ifndef DCPOMATIC_FRAME_RATE_CHANGE_H #define DCPOMATIC_FRAME_RATE_CHANGE_H -#include + +#include #include + class Film; class Content; @@ -32,8 +34,8 @@ class FrameRateChange public: FrameRateChange (); FrameRateChange (double, int); - FrameRateChange (boost::shared_ptr film, boost::shared_ptr content); - FrameRateChange (boost::shared_ptr film, Content const * content); + FrameRateChange (std::shared_ptr film, std::shared_ptr content); + FrameRateChange (std::shared_ptr film, Content const * content); /** @return factor by which to multiply a source frame rate to get the effective rate after any skip or repeat has happened. diff --git a/src/lib/hints.cc b/src/lib/hints.cc index 9781f24bb..e52e448cf 100644 --- a/src/lib/hints.cc +++ b/src/lib/hints.cc @@ -52,8 +52,8 @@ using std::pair; using std::min; using std::max; using std::cout; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::optional; using boost::bind; using namespace dcpomatic; diff --git a/src/lib/hints.h b/src/lib/hints.h index 9164e2106..d070dc201 100644 --- a/src/lib/hints.h +++ b/src/lib/hints.h @@ -24,7 +24,6 @@ #include "dcp_text_track.h" #include "dcpomatic_time.h" #include "weak_film.h" -#include #include #include #include @@ -38,7 +37,7 @@ class Writer; class Hints : public Signaller, public ExceptionStore, public WeakConstFilm { public: - explicit Hints (boost::weak_ptr film); + explicit Hints (std::weak_ptr film); ~Hints (); void start (); @@ -78,7 +77,7 @@ private: * our final DCP will have. This means we can see how big the files will be and warn if they * will be too big. */ - boost::shared_ptr _writer; + std::shared_ptr _writer; bool _long_ccap; bool _overlap_ccap; diff --git a/src/lib/image.cc b/src/lib/image.cc index fb9efdf89..a31874e18 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -52,7 +52,7 @@ using std::cout; using std::cerr; using std::list; using std::runtime_error; -using boost::shared_ptr; +using std::shared_ptr; using dcp::Size; @@ -952,7 +952,7 @@ Image::allocate () } Image::Image (Image const & other) - : boost::enable_shared_from_this(other) + : std::enable_shared_from_this(other) , _size (other._size) , _pixel_format (other._pixel_format) , _aligned (other._aligned) diff --git a/src/lib/image.h b/src/lib/image.h index 7dd633f61..a5823656c 100644 --- a/src/lib/image.h +++ b/src/lib/image.h @@ -33,19 +33,17 @@ extern "C" { } #include #include -#include -#include struct AVFrame; class Socket; -class Image : public boost::enable_shared_from_this +class Image : public std::enable_shared_from_this { public: Image (AVPixelFormat p, dcp::Size s, bool aligned); explicit Image (AVFrame *); explicit Image (Image const &); - Image (boost::shared_ptr, bool); + Image (std::shared_ptr, bool); Image& operator= (Image const &); ~Image (); @@ -63,9 +61,9 @@ public: dcp::Size sample_size (int) const; float bytes_per_pixel (int) const; - boost::shared_ptr convert_pixel_format (dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const; - boost::shared_ptr scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const; - boost::shared_ptr crop_scale_window ( + std::shared_ptr convert_pixel_format (dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const; + std::shared_ptr scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool aligned, bool fast) const; + std::shared_ptr crop_scale_window ( Crop crop, dcp::Size inter_size, dcp::Size out_size, @@ -79,13 +77,13 @@ public: void make_black (); void make_transparent (); - void alpha_blend (boost::shared_ptr image, Position pos); - void copy (boost::shared_ptr image, Position pos); + void alpha_blend (std::shared_ptr image, Position pos); + void copy (std::shared_ptr image, Position pos); void fade (float); void video_range_to_full_range (); - void read_from_socket (boost::shared_ptr); - void write_to_socket (boost::shared_ptr) const; + void read_from_socket (std::shared_ptr); + void write_to_socket (std::shared_ptr) const; AVPixelFormat pixel_format () const { return _pixel_format; @@ -97,7 +95,7 @@ public: void png_error (char const * message); - static boost::shared_ptr ensure_aligned (boost::shared_ptr image); + static std::shared_ptr ensure_aligned (std::shared_ptr image); private: friend struct pixel_formats_test; diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 8cf44bda1..20f32c05d 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -38,7 +38,7 @@ using std::string; using std::cout; using std::list; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; ImageContent::ImageContent (boost::filesystem::path p) diff --git a/src/lib/image_content.h b/src/lib/image_content.h index 970a68d66..81396c63b 100644 --- a/src/lib/image_content.h +++ b/src/lib/image_content.h @@ -29,19 +29,19 @@ public: ImageContent (boost::filesystem::path); ImageContent (cxml::ConstNodePtr, int); - boost::shared_ptr shared_from_this () { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () { + return std::dynamic_pointer_cast (Content::shared_from_this ()); }; - boost::shared_ptr shared_from_this () const { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () const { + return std::dynamic_pointer_cast (Content::shared_from_this ()); }; - void examine (boost::shared_ptr film, boost::shared_ptr); + void examine (std::shared_ptr film, std::shared_ptr); 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 film) const; + dcpomatic::DCPTime full_length (std::shared_ptr film) const; dcpomatic::DCPTime approximate_length () const; std::string identifier () const; @@ -51,7 +51,7 @@ public: bool still () const; private: - void add_properties (boost::shared_ptr film, std::list& p) const; + void add_properties (std::shared_ptr film, std::list& p) const; boost::optional _path_to_scan; }; diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc index 7757cc4aa..d35a0625f 100644 --- a/src/lib/image_decoder.cc +++ b/src/lib/image_decoder.cc @@ -34,7 +34,7 @@ #include "i18n.h" using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using dcp::Size; using namespace dcpomatic; diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h index eeec779ba..d575f9021 100644 --- a/src/lib/image_decoder.h +++ b/src/lib/image_decoder.h @@ -27,9 +27,9 @@ class ImageProxy; class ImageDecoder : public Decoder { public: - ImageDecoder (boost::shared_ptr film, boost::shared_ptr c); + ImageDecoder (std::shared_ptr film, std::shared_ptr c); - boost::shared_ptr content () { + std::shared_ptr content () { return _image_content; } @@ -38,7 +38,7 @@ public: private: - boost::shared_ptr _image_content; - boost::shared_ptr _image; + std::shared_ptr _image_content; + std::shared_ptr _image; Frame _frame_video_position; }; diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc index aa80d0daa..60dbd511b 100644 --- a/src/lib/image_examiner.cc +++ b/src/lib/image_examiner.cc @@ -38,7 +38,7 @@ using std::cout; using std::list; using std::sort; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; ImageExaminer::ImageExaminer (shared_ptr film, shared_ptr content, shared_ptr) diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h index ca8ecf9c8..839e390ed 100644 --- a/src/lib/image_examiner.h +++ b/src/lib/image_examiner.h @@ -25,7 +25,7 @@ class ImageContent; class ImageExaminer : public VideoExaminer { public: - ImageExaminer (boost::shared_ptr, boost::shared_ptr, boost::shared_ptr); + ImageExaminer (std::shared_ptr, std::shared_ptr, std::shared_ptr); bool has_video () const { return true; @@ -41,8 +41,8 @@ public: } private: - boost::weak_ptr _film; - boost::shared_ptr _image_content; + std::weak_ptr _film; + std::shared_ptr _image_content; boost::optional _video_size; Frame _video_length; }; diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index e16fab063..f6f6350d8 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -33,7 +33,7 @@ using std::cout; using std::string; -using boost::shared_ptr; +using std::shared_ptr; shared_ptr image_proxy_factory (shared_ptr xml, shared_ptr socket) diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h index 08516e718..b279e6344 100644 --- a/src/lib/image_proxy.h +++ b/src/lib/image_proxy.h @@ -29,7 +29,6 @@ extern "C" { #include } #include -#include #include #include @@ -61,20 +60,20 @@ public: virtual ~ImageProxy () {} struct Result { - Result (boost::shared_ptr image_, int log2_scaling_) + Result (std::shared_ptr image_, int log2_scaling_) : image (image_) , log2_scaling (log2_scaling_) , error (false) {} - Result (boost::shared_ptr image_, int log2_scaling_, bool error_) + Result (std::shared_ptr image_, int log2_scaling_, bool error_) : image (image_) , log2_scaling (log2_scaling_) , error (error_) {} /** Image (which will be aligned) */ - boost::shared_ptr image; + std::shared_ptr image; /** log2 of any scaling down that has already been applied to the image; * e.g. if the image is already half the size of the original, this value * will be 1. @@ -93,9 +92,9 @@ public: ) const = 0; virtual void add_metadata (xmlpp::Node *) const = 0; - virtual void write_to_socket (boost::shared_ptr) const = 0; + virtual void write_to_socket (std::shared_ptr) const = 0; /** @return true if our image is definitely the same as another, false if it is probably not */ - virtual bool same (boost::shared_ptr) const = 0; + virtual bool same (std::shared_ptr) const = 0; /** Do any useful work that would speed up a subsequent call to ::image(). * This method may be called in a different thread to image(). * @return log2 of any scaling down that will be applied to the image. @@ -104,6 +103,6 @@ public: virtual size_t memory_used () const = 0; }; -boost::shared_ptr image_proxy_factory (boost::shared_ptr xml, boost::shared_ptr socket); +std::shared_ptr image_proxy_factory (std::shared_ptr xml, std::shared_ptr socket); #endif diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc index e117dc284..368b6e3a5 100644 --- a/src/lib/isdcf_metadata.cc +++ b/src/lib/isdcf_metadata.cc @@ -30,7 +30,7 @@ DCPOMATIC_ENABLE_WARNINGS #include "i18n.h" using std::string; -using boost::shared_ptr; +using std::shared_ptr; using dcp::raw_convert; ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node) diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc index 796523b38..273bce8fb 100644 --- a/src/lib/j2k_encoder.cc +++ b/src/lib/j2k_encoder.cc @@ -45,8 +45,8 @@ using std::list; using std::cout; using std::exception; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::optional; using dcp::Data; using namespace dcpomatic; diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h index 818c75c99..afa010ace 100644 --- a/src/lib/j2k_encoder.h +++ b/src/lib/j2k_encoder.h @@ -29,13 +29,11 @@ #include "cross.h" #include "event_history.h" #include "exception_store.h" -#include #include #include #include #include #include -#include #include #include @@ -53,17 +51,17 @@ class PlayerVideo; * the work around threads and encoding servers. */ -class J2KEncoder : public boost::noncopyable, public ExceptionStore, public boost::enable_shared_from_this +class J2KEncoder : public boost::noncopyable, public ExceptionStore, public std::enable_shared_from_this { public: - J2KEncoder (boost::shared_ptr film, boost::shared_ptr writer); + J2KEncoder (std::shared_ptr film, std::shared_ptr writer); ~J2KEncoder (); /** Called to indicate that a processing run is about to begin */ void begin (); /** Called to pass a bit of video to be encoded as the next DCP frame */ - void encode (boost::shared_ptr pv, dcpomatic::DCPTime time); + void encode (std::shared_ptr pv, dcpomatic::DCPTime time); /** Called when a processing run has finished */ void end (); @@ -75,7 +73,7 @@ public: private: - static void call_servers_list_changed (boost::weak_ptr encoder); + static void call_servers_list_changed (std::weak_ptr encoder); void frame_done (); @@ -83,24 +81,24 @@ private: void terminate_threads (); /** Film that we are encoding */ - boost::shared_ptr _film; + std::shared_ptr _film; EventHistory _history; boost::mutex _threads_mutex; - boost::shared_ptr _threads; + std::shared_ptr _threads; mutable boost::mutex _queue_mutex; - std::list > _queue; + std::list > _queue; /** condition to manage thread wakeups when we have nothing to do */ boost::condition _empty_condition; /** condition to manage thread wakeups when we have too much to do */ boost::condition _full_condition; - boost::shared_ptr _writer; + std::shared_ptr _writer; Waker _waker; - boost::shared_ptr _last_player_video[EYES_COUNT]; + std::shared_ptr _last_player_video[EYES_COUNT]; boost::optional _last_player_video_time; boost::signals2::scoped_connection _server_found_connection; diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 21083504e..13305b7f3 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -43,9 +43,9 @@ using std::cout; using std::max; using std::pair; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using dcp::ArrayData; using dcp::raw_convert; diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h index 3eccc213d..91c90dba7 100644 --- a/src/lib/j2k_image_proxy.h +++ b/src/lib/j2k_image_proxy.h @@ -34,33 +34,33 @@ public: J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format); J2KImageProxy ( - boost::shared_ptr frame, + std::shared_ptr frame, dcp::Size, AVPixelFormat pixel_format, boost::optional forced_reduction ); J2KImageProxy ( - boost::shared_ptr frame, + std::shared_ptr frame, dcp::Size, dcp::Eye, AVPixelFormat pixel_format, boost::optional forced_reduction ); - J2KImageProxy (boost::shared_ptr xml, boost::shared_ptr socket); + J2KImageProxy (std::shared_ptr xml, std::shared_ptr socket); Result image ( boost::optional size = boost::optional () ) const; void add_metadata (xmlpp::Node *) const; - void write_to_socket (boost::shared_ptr) const; + void write_to_socket (std::shared_ptr) const; /** @return true if our image is definitely the same as another, false if it is probably not */ - bool same (boost::shared_ptr) const; + bool same (std::shared_ptr) const; int prepare (boost::optional = boost::optional()) const; - boost::shared_ptr j2k () const { + std::shared_ptr j2k () const { return _data; } @@ -76,10 +76,10 @@ private: /* For tests */ J2KImageProxy (dcp::ArrayData data, dcp::Size size, AVPixelFormat pixel_format); - boost::shared_ptr _data; + std::shared_ptr _data; dcp::Size _size; boost::optional _eye; - mutable boost::shared_ptr _image; + mutable std::shared_ptr _image; mutable boost::optional _target_size; mutable boost::optional _reduce; AVPixelFormat _pixel_format; diff --git a/src/lib/job.cc b/src/lib/job.cc index d960dfaee..525f86b2c 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -43,7 +43,7 @@ using std::string; using std::list; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using boost::function; using namespace dcpomatic; diff --git a/src/lib/job.h b/src/lib/job.h index a0e988fc8..d047913a0 100644 --- a/src/lib/job.h +++ b/src/lib/job.h @@ -27,7 +27,6 @@ #include "signaller.h" #include -#include #include #include #include @@ -37,10 +36,10 @@ class Film; /** @class Job * @brief A parent class to represent long-running tasks which are run in their own thread. */ -class Job : public boost::enable_shared_from_this, public Signaller, public boost::noncopyable +class Job : public std::enable_shared_from_this, public Signaller, public boost::noncopyable { public: - explicit Job (boost::shared_ptr film); + explicit Job (std::shared_ptr film); virtual ~Job (); /** @return user-readable name of this job */ @@ -80,7 +79,7 @@ public: void sub (std::string); boost::optional progress () const; - boost::shared_ptr film () const { + std::shared_ptr film () const { return _film; } @@ -114,7 +113,7 @@ protected: void check_for_interruption_or_pause (); void stop_thread (); - boost::shared_ptr _film; + std::shared_ptr _film; private: diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc index dbaf15cbc..358820c6a 100644 --- a/src/lib/job_manager.cc +++ b/src/lib/job_manager.cc @@ -35,10 +35,10 @@ using std::string; using std::list; using std::cout; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::function; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using boost::optional; using boost::bind; diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h index dd7a28db2..461688845 100644 --- a/src/lib/job_manager.h +++ b/src/lib/job_manager.h @@ -43,13 +43,13 @@ extern bool wait_for_jobs (); class JobManager : public Signaller, public boost::noncopyable { public: - boost::shared_ptr add (boost::shared_ptr); - boost::shared_ptr add_after (boost::shared_ptr after, boost::shared_ptr j); - std::list > get () const; + std::shared_ptr add (std::shared_ptr); + std::shared_ptr add_after (std::shared_ptr after, std::shared_ptr j); + std::list > get () const; bool work_to_do () const; bool errors () const; - void increase_priority (boost::shared_ptr); - void decrease_priority (boost::shared_ptr); + void increase_priority (std::shared_ptr); + void decrease_priority (std::shared_ptr); void pause (); void resume (); bool paused () const { @@ -58,21 +58,21 @@ public: } void analyse_audio ( - boost::shared_ptr film, - boost::shared_ptr playlist, + std::shared_ptr film, + std::shared_ptr playlist, bool from_zero, boost::signals2::connection& connection, boost::function ready ); void analyse_subtitles ( - boost::shared_ptr film, - boost::shared_ptr content, + std::shared_ptr film, + std::shared_ptr content, boost::signals2::connection& connection, boost::function ready ); - boost::signals2::signal)> JobAdded; + boost::signals2::signal)> JobAdded; boost::signals2::signal JobsReordered; boost::signals2::signal, boost::optional)> ActiveJobsChanged; @@ -94,11 +94,11 @@ private: mutable boost::mutex _mutex; boost::condition _empty_condition; /** List of jobs in the order that they will be executed */ - std::list > _jobs; + std::list > _jobs; std::list _connections; bool _terminate; bool _paused; - boost::shared_ptr _paused_job; + std::shared_ptr _paused_job; boost::optional _last_active_job; boost::thread _scheduler; diff --git a/src/lib/json_server.cc b/src/lib/json_server.cc index 211d0c846..9c1034a68 100644 --- a/src/lib/json_server.cc +++ b/src/lib/json_server.cc @@ -35,8 +35,8 @@ using std::cout; using std::map; using std::list; using boost::thread; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::asio::ip::tcp; using dcp::raw_convert; diff --git a/src/lib/json_server.h b/src/lib/json_server.h index f36e621f3..c97e496d1 100644 --- a/src/lib/json_server.h +++ b/src/lib/json_server.h @@ -27,6 +27,6 @@ public: private: void run (int port); - void handle (boost::shared_ptr socket); - void request (std::string url, boost::shared_ptr socket); + void handle (std::shared_ptr socket); + void request (std::string url, std::shared_ptr socket); }; diff --git a/src/lib/kdm_with_metadata.cc b/src/lib/kdm_with_metadata.cc index 0ef1b8f38..2747e4140 100644 --- a/src/lib/kdm_with_metadata.cc +++ b/src/lib/kdm_with_metadata.cc @@ -35,7 +35,7 @@ using std::string; using std::cout; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using boost::function; diff --git a/src/lib/kdm_with_metadata.h b/src/lib/kdm_with_metadata.h index 2e07334de..fc80a8743 100644 --- a/src/lib/kdm_with_metadata.h +++ b/src/lib/kdm_with_metadata.h @@ -23,7 +23,6 @@ #include #include -#include class Cinema; @@ -67,7 +66,7 @@ private: }; -typedef boost::shared_ptr KDMWithMetadataPtr; +typedef std::shared_ptr KDMWithMetadataPtr; int write_files ( diff --git a/src/lib/log.cc b/src/lib/log.cc index 7851c133f..e1716f1c6 100644 --- a/src/lib/log.cc +++ b/src/lib/log.cc @@ -33,7 +33,7 @@ using std::string; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; Log::Log () : _types (0) diff --git a/src/lib/log.h b/src/lib/log.h index 873d5f7a1..c71f8ab16 100644 --- a/src/lib/log.h +++ b/src/lib/log.h @@ -41,7 +41,7 @@ public: Log (); virtual ~Log () {} - void log (boost::shared_ptr entry); + void log (std::shared_ptr entry); void log (std::string message, int type); void dcp_log (dcp::NoteType type, std::string message); @@ -64,7 +64,7 @@ protected: mutable boost::mutex _mutex; private: - virtual void do_log (boost::shared_ptr entry) = 0; + virtual void do_log (std::shared_ptr entry) = 0; /** bit-field of log types which should be put into the log (others are ignored) */ int _types; diff --git a/src/lib/mid_side_decoder.cc b/src/lib/mid_side_decoder.cc index fd80937ed..eb87d245b 100644 --- a/src/lib/mid_side_decoder.cc +++ b/src/lib/mid_side_decoder.cc @@ -27,7 +27,7 @@ using std::string; using std::min; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; string MidSideDecoder::name () const diff --git a/src/lib/mid_side_decoder.h b/src/lib/mid_side_decoder.h index e5c1e0a05..8be5db67f 100644 --- a/src/lib/mid_side_decoder.h +++ b/src/lib/mid_side_decoder.h @@ -26,8 +26,8 @@ public: std::string name () const; std::string id () const; int out_channels () const; - boost::shared_ptr clone (int) const; - boost::shared_ptr run (boost::shared_ptr, int channels); + std::shared_ptr clone (int) const; + std::shared_ptr run (std::shared_ptr, int channels); void make_audio_mapping_default (AudioMapping& mapping) const; std::vector input_names () const; }; diff --git a/src/lib/null_log.h b/src/lib/null_log.h index 01bc324cb..ce6017ca2 100644 --- a/src/lib/null_log.h +++ b/src/lib/null_log.h @@ -23,5 +23,5 @@ class NullLog : public Log { private: - void do_log (boost::shared_ptr) {} + void do_log (std::shared_ptr) {} }; diff --git a/src/lib/overlaps.cc b/src/lib/overlaps.cc index 5ed7a9832..f5ccd48d0 100644 --- a/src/lib/overlaps.cc +++ b/src/lib/overlaps.cc @@ -23,7 +23,7 @@ #include "content.h" #include -using boost::shared_ptr; +using std::shared_ptr; using boost::function; using namespace dcpomatic; diff --git a/src/lib/overlaps.h b/src/lib/overlaps.h index 9bd867030..60c0cd537 100644 --- a/src/lib/overlaps.h +++ b/src/lib/overlaps.h @@ -29,5 +29,5 @@ class Film; * ContentList */ ContentList overlaps ( - boost::shared_ptr film, ContentList cl, boost::function)> part, dcpomatic::DCPTime from, dcpomatic::DCPTime to + std::shared_ptr film, ContentList cl, boost::function)> part, dcpomatic::DCPTime from, dcpomatic::DCPTime to ); diff --git a/src/lib/piece.h b/src/lib/piece.h index 440beecf4..a2e62d366 100644 --- a/src/lib/piece.h +++ b/src/lib/piece.h @@ -30,15 +30,15 @@ class Decoder; class Piece { public: - Piece (boost::shared_ptr c, boost::shared_ptr d, FrameRateChange f) + Piece (std::shared_ptr c, std::shared_ptr d, FrameRateChange f) : content (c) , decoder (d) , frc (f) , done (false) {} - boost::shared_ptr content; - boost::shared_ptr decoder; + std::shared_ptr content; + std::shared_ptr decoder; FrameRateChange frc; bool done; }; diff --git a/src/lib/player.cc b/src/lib/player.cc index dd11694ef..e6e8aca86 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -73,9 +73,9 @@ using std::pair; using std::map; using std::make_pair; using std::copy; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::optional; using boost::scoped_ptr; #if BOOST_VERSION >= 106100 @@ -384,7 +384,7 @@ Player::black_player_video_frame (Eyes eyes) const PART_WHOLE, PresetColourConversion::all().front().conversion, VIDEO_RANGE_FULL, - boost::weak_ptr(), + std::weak_ptr(), boost::optional(), false ) diff --git a/src/lib/player.h b/src/lib/player.h index c695e02cd..48ed568da 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -35,8 +35,6 @@ #include "audio_stream.h" #include "audio_merger.h" #include "empty.h" -#include -#include #include #include @@ -69,11 +67,11 @@ public: /** @class Player * @brief A class which can play a Playlist. */ -class Player : public boost::enable_shared_from_this, public boost::noncopyable +class Player : public std::enable_shared_from_this, public boost::noncopyable { public: - Player (boost::shared_ptr); - Player (boost::shared_ptr, boost::shared_ptr playlist); + Player (std::shared_ptr); + Player (std::shared_ptr, std::shared_ptr playlist); ~Player (); bool pass (); @@ -95,18 +93,18 @@ public: void set_play_referenced (); void set_dcp_decode_reduction (boost::optional reduction); - boost::optional content_time_to_dcp (boost::shared_ptr content, dcpomatic::ContentTime t); + boost::optional content_time_to_dcp (std::shared_ptr content, dcpomatic::ContentTime t); boost::signals2::signal Change; /** Emitted when a video frame is ready. These emissions happen in the correct order. */ - boost::signals2::signal, dcpomatic::DCPTime)> Video; - boost::signals2::signal, dcpomatic::DCPTime, int)> Audio; + boost::signals2::signal, dcpomatic::DCPTime)> Video; + boost::signals2::signal, dcpomatic::DCPTime, int)> Audio; /** Emitted when a text is ready. This signal may be emitted considerably * after the corresponding Video. */ boost::signals2::signal, dcpomatic::DCPTimePeriod)> Text; - boost::signals2::signal, dcpomatic::DCPTime, AtmosMetadata)> Atmos; + boost::signals2::signal, dcpomatic::DCPTime, AtmosMetadata)> Atmos; private: friend class PlayerWrapper; @@ -126,31 +124,31 @@ private: void film_change (ChangeType, Film::Property); void playlist_change (ChangeType); void playlist_content_change (ChangeType, int, bool); - Frame dcp_to_content_video (boost::shared_ptr piece, dcpomatic::DCPTime t) const; - dcpomatic::DCPTime content_video_to_dcp (boost::shared_ptr piece, Frame f) const; - Frame dcp_to_resampled_audio (boost::shared_ptr piece, dcpomatic::DCPTime t) const; - dcpomatic::DCPTime resampled_audio_to_dcp (boost::shared_ptr piece, Frame f) const; - dcpomatic::ContentTime dcp_to_content_time (boost::shared_ptr piece, dcpomatic::DCPTime t) const; - dcpomatic::DCPTime content_time_to_dcp (boost::shared_ptr piece, dcpomatic::ContentTime t) const; - boost::shared_ptr black_player_video_frame (Eyes eyes) const; - - void video (boost::weak_ptr, ContentVideo); - void audio (boost::weak_ptr, AudioStreamPtr, ContentAudio); - void bitmap_text_start (boost::weak_ptr, boost::weak_ptr, ContentBitmapText); - void plain_text_start (boost::weak_ptr, boost::weak_ptr, ContentStringText); - void subtitle_stop (boost::weak_ptr, boost::weak_ptr, dcpomatic::ContentTime); - void atmos (boost::weak_ptr, ContentAtmos); + Frame dcp_to_content_video (std::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime content_video_to_dcp (std::shared_ptr piece, Frame f) const; + Frame dcp_to_resampled_audio (std::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime resampled_audio_to_dcp (std::shared_ptr piece, Frame f) const; + dcpomatic::ContentTime dcp_to_content_time (std::shared_ptr piece, dcpomatic::DCPTime t) const; + dcpomatic::DCPTime content_time_to_dcp (std::shared_ptr piece, dcpomatic::ContentTime t) const; + std::shared_ptr black_player_video_frame (Eyes eyes) const; + + void video (std::weak_ptr, ContentVideo); + void audio (std::weak_ptr, AudioStreamPtr, ContentAudio); + void bitmap_text_start (std::weak_ptr, std::weak_ptr, ContentBitmapText); + void plain_text_start (std::weak_ptr, std::weak_ptr, ContentStringText); + void subtitle_stop (std::weak_ptr, std::weak_ptr, dcpomatic::ContentTime); + void atmos (std::weak_ptr, ContentAtmos); dcpomatic::DCPTime one_video_frame () const; void fill_audio (dcpomatic::DCPTimePeriod period); - std::pair, dcpomatic::DCPTime> discard_audio ( - boost::shared_ptr audio, dcpomatic::DCPTime time, dcpomatic::DCPTime discard_to + std::pair, dcpomatic::DCPTime> discard_audio ( + std::shared_ptr audio, dcpomatic::DCPTime time, dcpomatic::DCPTime discard_to ) const; boost::optional open_subtitles_for_frame (dcpomatic::DCPTime time) const; - void emit_video (boost::shared_ptr pv, dcpomatic::DCPTime time); - void do_emit_video (boost::shared_ptr pv, dcpomatic::DCPTime time); - void emit_audio (boost::shared_ptr data, dcpomatic::DCPTime time); - boost::shared_ptr playlist () const; + void emit_video (std::shared_ptr pv, dcpomatic::DCPTime time); + void do_emit_video (std::shared_ptr pv, dcpomatic::DCPTime time); + void emit_audio (std::shared_ptr data, dcpomatic::DCPTime time); + std::shared_ptr playlist () const; /** Mutex to protect the whole Player state. When it's used for the preview we have seek() and pass() called from the Butler thread and lots of other stuff called @@ -158,19 +156,19 @@ private: */ mutable boost::mutex _mutex; - boost::shared_ptr _film; + std::shared_ptr _film; /** Playlist, or 0 if we are using the one from the _film */ - boost::shared_ptr _playlist; + std::shared_ptr _playlist; /** > 0 if we are suspended (i.e. pass() and seek() do nothing) */ boost::atomic _suspended; - std::list > _pieces; + std::list > _pieces; /** Size of the image we are rendering to; this may be the DCP frame size, or * the size of preview in a window. */ dcp::Size _video_container_size; - boost::shared_ptr _black_image; + std::shared_ptr _black_image; /** true if the player should ignore all video; i.e. never produce any */ bool _ignore_video; @@ -193,24 +191,24 @@ private: boost::optional _dcp_decode_reduction; - typedef std::map, boost::shared_ptr > LastVideoMap; + typedef std::map, std::shared_ptr, std::owner_less>> LastVideoMap; LastVideoMap _last_video; AudioMerger _audio_merger; Shuffler* _shuffler; - std::list, dcpomatic::DCPTime> > _delay; + std::list, dcpomatic::DCPTime> > _delay; class StreamState { public: StreamState () {} - StreamState (boost::shared_ptr p, dcpomatic::DCPTime l) + StreamState (std::shared_ptr p, dcpomatic::DCPTime l) : piece(p) , last_push_end(l) {} - boost::shared_ptr piece; + std::shared_ptr piece; dcpomatic::DCPTime last_push_end; }; std::map _stream_states; @@ -219,7 +217,7 @@ private: Empty _silent; ActiveText _active_texts[TEXT_COUNT]; - boost::shared_ptr _audio_processor; + std::shared_ptr _audio_processor; dcpomatic::DCPTime _playback_length; diff --git a/src/lib/player_text.cc b/src/lib/player_text.cc index d31c7d024..d2448efa6 100644 --- a/src/lib/player_text.cc +++ b/src/lib/player_text.cc @@ -23,7 +23,7 @@ #include using std::list; -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; void diff --git a/src/lib/player_text.h b/src/lib/player_text.h index fb1d846d8..232ba6516 100644 --- a/src/lib/player_text.h +++ b/src/lib/player_text.h @@ -33,8 +33,8 @@ namespace dcpomatic { class PlayerText { public: - void add_fonts (std::list > fonts_); - std::list > fonts; + void add_fonts (std::list > fonts_); + std::list > fonts; /** BitmapTexts, with their rectangles transformed as specified by their content */ std::list bitmap; diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 4f8acd5e2..683fc27fc 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -36,9 +36,9 @@ extern "C" { using std::string; using std::cout; using std::pair; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::optional; using boost::function; using dcp::Data; diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 0952eafb9..faf5d6832 100644 --- a/src/lib/player_video.h +++ b/src/lib/player_video.h @@ -29,8 +29,6 @@ extern "C" { #include } -#include -#include #include #include @@ -47,7 +45,7 @@ class PlayerVideo : public boost::noncopyable { public: PlayerVideo ( - boost::shared_ptr, + std::shared_ptr, Crop, boost::optional, dcp::Size, @@ -56,30 +54,30 @@ public: Part, boost::optional, VideoRange video_range, - boost::weak_ptr, + std::weak_ptr, boost::optional, bool error ); - PlayerVideo (boost::shared_ptr, boost::shared_ptr); + PlayerVideo (std::shared_ptr, std::shared_ptr); - boost::shared_ptr shallow_copy () const; + std::shared_ptr shallow_copy () const; void set_text (PositionImage); void prepare (boost::function pixel_format, VideoRange video_range, bool aligned, bool fast); - boost::shared_ptr image (boost::function pixel_format, VideoRange video_range, bool aligned, bool fast) const; + std::shared_ptr image (boost::function pixel_format, VideoRange video_range, bool aligned, bool fast) const; static AVPixelFormat force (AVPixelFormat, AVPixelFormat); static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat); void add_metadata (xmlpp::Node* node) const; - void write_to_socket (boost::shared_ptr socket) const; + void write_to_socket (std::shared_ptr socket) const; - bool reset_metadata (boost::shared_ptr film, dcp::Size player_video_container_size); + bool reset_metadata (std::shared_ptr film, dcp::Size player_video_container_size); bool has_j2k () const; - boost::shared_ptr j2k () const; + std::shared_ptr j2k () const; Eyes eyes () const { return _eyes; @@ -101,11 +99,11 @@ public: return _inter_size; } - bool same (boost::shared_ptr other) const; + bool same (std::shared_ptr other) const; size_t memory_used () const; - boost::weak_ptr content () const { + std::weak_ptr content () const { return _content; } @@ -116,7 +114,7 @@ public: private: void make_image (boost::function pixel_format, VideoRange video_range, bool aligned, bool fast) const; - boost::shared_ptr _in; + std::shared_ptr _in; Crop _crop; boost::optional _fade; dcp::Size _inter_size; @@ -127,12 +125,12 @@ private: VideoRange _video_range; boost::optional _text; /** Content that we came from. This is so that reset_metadata() can work. */ - boost::weak_ptr _content; + std::weak_ptr _content; /** Video frame that we came from. Again, this is for reset_metadata() */ boost::optional _video_frame; mutable boost::mutex _mutex; - mutable boost::shared_ptr _image; + mutable std::shared_ptr _image; /** _crop that was used to make _image */ mutable Crop _image_crop; /** _inter_size that was used to make _image */ diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 89990a427..287f23fd4 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -35,7 +35,6 @@ #include #include #include -#include #include #include @@ -49,9 +48,9 @@ using std::max; using std::string; using std::pair; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using namespace dcpomatic; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/lib/playlist.h b/src/lib/playlist.h index 51c13e33f..b49baa430 100644 --- a/src/lib/playlist.h +++ b/src/lib/playlist.h @@ -24,7 +24,6 @@ #include "util.h" #include "frame_rate_change.h" #include -#include #include #include #include @@ -33,7 +32,7 @@ class Film; struct ContentSorter { - bool operator() (boost::shared_ptr a, boost::shared_ptr b); + bool operator() (std::shared_ptr a, std::shared_ptr b); }; /** @class Playlist @@ -47,33 +46,33 @@ public: ~Playlist (); void as_xml (xmlpp::Node *, bool with_content_paths); - void set_from_xml (boost::shared_ptr film, cxml::ConstNodePtr node, int version, std::list& notes); + void set_from_xml (std::shared_ptr film, cxml::ConstNodePtr node, int version, std::list& notes); - void add (boost::shared_ptr film, boost::shared_ptr); - void remove (boost::shared_ptr); + void add (std::shared_ptr film, std::shared_ptr); + void remove (std::shared_ptr); void remove (ContentList); - void move_earlier (boost::shared_ptr film, boost::shared_ptr); - void move_later (boost::shared_ptr film, boost::shared_ptr); + void move_earlier (std::shared_ptr film, std::shared_ptr); + void move_later (std::shared_ptr film, std::shared_ptr); ContentList content () const; std::string video_identifier () const; - dcpomatic::DCPTime length (boost::shared_ptr film) const; + dcpomatic::DCPTime length (std::shared_ptr film) const; boost::optional start () const; - int64_t required_disk_space (boost::shared_ptr film, int j2k_bandwidth, int audio_channels, int audio_frame_rate) const; + int64_t required_disk_space (std::shared_ptr film, int j2k_bandwidth, int audio_channels, int audio_frame_rate) const; int best_video_frame_rate () const; - dcpomatic::DCPTime video_end (boost::shared_ptr film) const; - dcpomatic::DCPTime text_end (boost::shared_ptr film) const; + dcpomatic::DCPTime video_end (std::shared_ptr film) const; + dcpomatic::DCPTime text_end (std::shared_ptr film) const; FrameRateChange active_frame_rate_change (dcpomatic::DCPTime, int dcp_frame_rate) const; - std::string content_summary (boost::shared_ptr film, dcpomatic::DCPTimePeriod period) const; + std::string content_summary (std::shared_ptr film, dcpomatic::DCPTimePeriod period) const; std::pair speed_up_range (int dcp_video_frame_rate) const; void set_sequence (bool); - void maybe_sequence (boost::shared_ptr film); + void maybe_sequence (std::shared_ptr film); - void repeat (boost::shared_ptr film, ContentList, int); + void repeat (std::shared_ptr film, ContentList, int); /** Emitted when content has been added to or removed from the playlist; implies OrderChanged */ mutable boost::signals2::signal Change; @@ -81,12 +80,12 @@ public: /** Emitted when the length might have changed; may sometimes be emitted when it has not */ mutable boost::signals2::signal LengthChange; - mutable boost::signals2::signal, int, bool)> ContentChange; + mutable boost::signals2::signal, int, bool)> ContentChange; private: - void content_change (boost::weak_ptr, ChangeType, boost::weak_ptr, int, bool); + void content_change (std::weak_ptr, ChangeType, std::weak_ptr, int, bool); void disconnect (); - void reconnect (boost::shared_ptr film); + void reconnect (std::shared_ptr film); mutable boost::mutex _mutex; /** List of content. Kept sorted in position order. */ diff --git a/src/lib/position_image.h b/src/lib/position_image.h index 3e6d833e7..b78effbd5 100644 --- a/src/lib/position_image.h +++ b/src/lib/position_image.h @@ -21,8 +21,10 @@ #ifndef DCPOMATIC_POSITION_IMAGE_H #define DCPOMATIC_POSITION_IMAGE_H + #include "position.h" -#include +#include + class Image; @@ -31,12 +33,12 @@ class PositionImage public: PositionImage () {} - PositionImage (boost::shared_ptr i, Position p) + PositionImage (std::shared_ptr i, Position p) : image (i) , position (p) {} - boost::shared_ptr image; + std::shared_ptr image; Position position; bool same (PositionImage const & other) const; diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc index 09902c3a2..667f25b06 100644 --- a/src/lib/raw_image_proxy.cc +++ b/src/lib/raw_image_proxy.cc @@ -36,8 +36,8 @@ DCPOMATIC_ENABLE_WARNINGS using std::string; using std::pair; using std::make_pair; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::optional; using dcp::raw_convert; diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h index 7971d4a10..7cd9491fa 100644 --- a/src/lib/raw_image_proxy.h +++ b/src/lib/raw_image_proxy.h @@ -26,20 +26,20 @@ class RawImageProxy : public ImageProxy { public: - explicit RawImageProxy (boost::shared_ptr); - RawImageProxy (boost::shared_ptr xml, boost::shared_ptr socket); + explicit RawImageProxy (std::shared_ptr); + RawImageProxy (std::shared_ptr xml, std::shared_ptr socket); Result image ( boost::optional size = boost::optional () ) const; void add_metadata (xmlpp::Node *) const; - void write_to_socket (boost::shared_ptr) const; - bool same (boost::shared_ptr) const; + void write_to_socket (std::shared_ptr) const; + bool same (std::shared_ptr) const; size_t memory_used () const; private: - boost::shared_ptr _image; + std::shared_ptr _image; }; #endif diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 009b2dc15..110102b70 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -62,13 +62,13 @@ using std::exception; using std::map; using std::set; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif -using boost::weak_ptr; +using std::weak_ptr; using dcp::ArrayData; using dcp::Data; using dcp::raw_convert; diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index 3d214878b..019917abc 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -27,8 +27,6 @@ #include "weak_film.h" #include #include -#include -#include namespace dcpomatic { class FontData; @@ -60,23 +58,23 @@ class ReelWriter : public WeakConstFilm { public: ReelWriter ( - boost::weak_ptr film, + std::weak_ptr film, dcpomatic::DCPTimePeriod period, - boost::shared_ptr job, + std::shared_ptr job, int reel_index, int reel_count, bool text_only ); - void write (boost::shared_ptr encoded, Frame frame, Eyes eyes); + void write (std::shared_ptr encoded, Frame frame, Eyes eyes); void fake_write (int size); void repeat_write (Frame frame, Eyes eyes); - void write (boost::shared_ptr audio); + void write (std::shared_ptr audio); void write (PlayerText text, TextType type, boost::optional track, dcpomatic::DCPTimePeriod period); - void write (boost::shared_ptr atmos, AtmosMetadata metadata); + void write (std::shared_ptr atmos, AtmosMetadata metadata); void finish (boost::filesystem::path output_dcp); - boost::shared_ptr create_reel ( + std::shared_ptr create_reel ( std::list const & refs, std::vector const & fonts, boost::filesystem::path output_dcp, @@ -95,7 +93,7 @@ public: return _first_nonexistant_frame; } - dcp::FrameInfo read_frame_info (boost::shared_ptr info, Frame frame, Eyes eyes) const; + dcp::FrameInfo read_frame_info (std::shared_ptr info, Frame frame, Eyes eyes) const; private: @@ -104,13 +102,13 @@ private: void write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const; long frame_info_position (Frame frame, Eyes eyes) const; Frame check_existing_picture_asset (boost::filesystem::path asset); - bool existing_picture_frame_ok (FILE* asset_file, boost::shared_ptr info_file, Frame frame) const; - boost::shared_ptr empty_text_asset (TextType type, boost::optional track) const; + bool existing_picture_frame_ok (FILE* asset_file, std::shared_ptr info_file, Frame frame) const; + std::shared_ptr empty_text_asset (TextType type, boost::optional track) const; - boost::shared_ptr create_reel_picture (boost::shared_ptr reel, std::list const & refs) const; - void create_reel_sound (boost::shared_ptr reel, std::list const & refs) const; + std::shared_ptr create_reel_picture (std::shared_ptr reel, std::list const & refs) const; + void create_reel_sound (std::shared_ptr reel, std::list const & refs) const; void create_reel_text ( - boost::shared_ptr reel, + std::shared_ptr reel, std::list const & refs, std::vector const& fonts, int64_t duration, @@ -118,32 +116,32 @@ private: bool ensure_subtitles, std::set ensure_closed_captions ) const; - void create_reel_markers (boost::shared_ptr reel) const; + void create_reel_markers (std::shared_ptr reel) const; dcpomatic::DCPTimePeriod _period; /** the first picture frame index that does not already exist in our MXF */ int _first_nonexistant_frame; /** the data of the last written frame, if there is one */ - boost::shared_ptr _last_written[EYES_COUNT]; + std::shared_ptr _last_written[EYES_COUNT]; /** index of this reel within the DCP (starting from 0) */ int _reel_index; /** number of reels in the DCP */ int _reel_count; boost::optional _content_summary; - boost::weak_ptr _job; + std::weak_ptr _job; bool _text_only; dcp::ArrayData _default_font; - boost::shared_ptr _picture_asset; + std::shared_ptr _picture_asset; /** picture asset writer, or 0 if we are not writing any picture because we already have one */ - boost::shared_ptr _picture_asset_writer; - boost::shared_ptr _sound_asset; - boost::shared_ptr _sound_asset_writer; - boost::shared_ptr _subtitle_asset; - std::map > _closed_caption_assets; - boost::shared_ptr _atmos_asset; - boost::shared_ptr _atmos_asset_writer; + std::shared_ptr _picture_asset_writer; + std::shared_ptr _sound_asset; + std::shared_ptr _sound_asset_writer; + std::shared_ptr _subtitle_asset; + std::map > _closed_caption_assets; + std::shared_ptr _atmos_asset; + std::shared_ptr _atmos_asset_writer; static int const _info_size; }; diff --git a/src/lib/referenced_reel_asset.h b/src/lib/referenced_reel_asset.h index 0d66155b5..813d32148 100644 --- a/src/lib/referenced_reel_asset.h +++ b/src/lib/referenced_reel_asset.h @@ -26,13 +26,13 @@ class ReferencedReelAsset { public: - ReferencedReelAsset (boost::shared_ptr asset_, dcpomatic::DCPTimePeriod period_) + ReferencedReelAsset (std::shared_ptr asset_, dcpomatic::DCPTimePeriod period_) : asset (asset_) , period (period_) {} /** The asset */ - boost::shared_ptr asset; + std::shared_ptr asset; /** Period that this asset covers in the DCP */ dcpomatic::DCPTimePeriod period; }; diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc index 93043ed06..3129c220f 100644 --- a/src/lib/render_text.cc +++ b/src/lib/render_text.cc @@ -48,7 +48,7 @@ using std::max; using std::pair; using std::cerr; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using boost::algorithm::replace_all; using namespace dcpomatic; diff --git a/src/lib/render_text.h b/src/lib/render_text.h index 7187ca30b..d1c8c7aee 100644 --- a/src/lib/render_text.h +++ b/src/lib/render_text.h @@ -29,5 +29,5 @@ namespace dcpomatic { std::string marked_up (std::list subtitles, int target_height, float fade_factor); std::list render_text ( - std::list, std::list > fonts, dcp::Size, dcpomatic::DCPTime, int + std::list, std::list > fonts, dcp::Size, dcpomatic::DCPTime, int ); diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc index 322c00c13..60eb7f505 100644 --- a/src/lib/resampler.cc +++ b/src/lib/resampler.cc @@ -33,7 +33,7 @@ using std::cout; using std::pair; using std::make_pair; using std::runtime_error; -using boost::shared_ptr; +using std::shared_ptr; /** @param in Input sampling rate (Hz) * @param out Output sampling rate (Hz) diff --git a/src/lib/resampler.h b/src/lib/resampler.h index 4b19dc511..1f8200c69 100644 --- a/src/lib/resampler.h +++ b/src/lib/resampler.h @@ -20,7 +20,6 @@ #include "types.h" #include -#include #include class AudioBuffers; @@ -31,8 +30,8 @@ public: Resampler (int, int, int); ~Resampler (); - boost::shared_ptr run (boost::shared_ptr); - boost::shared_ptr flush (); + std::shared_ptr run (std::shared_ptr); + std::shared_ptr flush (); void reset (); void set_fast (); diff --git a/src/lib/scp_uploader.cc b/src/lib/scp_uploader.cc index 9bb0f1e55..0926ffa9f 100644 --- a/src/lib/scp_uploader.cc +++ b/src/lib/scp_uploader.cc @@ -31,7 +31,7 @@ using std::string; using std::min; -using boost::shared_ptr; +using std::shared_ptr; using boost::function; SCPUploader::SCPUploader (function set_status, function set_progress) diff --git a/src/lib/screen.cc b/src/lib/screen.cc index 544bce9ef..dea513ab0 100644 --- a/src/lib/screen.cc +++ b/src/lib/screen.cc @@ -30,7 +30,7 @@ using std::string; using std::vector; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; diff --git a/src/lib/screen.h b/src/lib/screen.h index 013afff85..96b0ce764 100644 --- a/src/lib/screen.h +++ b/src/lib/screen.h @@ -54,7 +54,7 @@ public: void as_xml (xmlpp::Element *) const; std::vector trusted_device_thumbprints () const; - boost::shared_ptr cinema; + std::shared_ptr cinema; std::vector trusted_devices; }; @@ -62,9 +62,9 @@ public: KDMWithMetadataPtr kdm_for_screen ( - boost::shared_ptr film, + std::shared_ptr film, boost::filesystem::path cpl, - boost::shared_ptr screen, + std::shared_ptr screen, boost::posix_time::ptime valid_from, boost::posix_time::ptime valid_to, dcp::Formulation formulation, diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc index 55a171811..cea35e3c5 100644 --- a/src/lib/send_kdm_email_job.cc +++ b/src/lib/send_kdm_email_job.cc @@ -28,7 +28,7 @@ using std::string; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; SendKDMEmailJob::SendKDMEmailJob ( diff --git a/src/lib/send_notification_email_job.cc b/src/lib/send_notification_email_job.cc index 1c9d96338..41d215ba2 100644 --- a/src/lib/send_notification_email_job.cc +++ b/src/lib/send_notification_email_job.cc @@ -30,7 +30,7 @@ using std::string; using std::list; -using boost::shared_ptr; +using std::shared_ptr; /** @param body Email body */ SendNotificationEmailJob::SendNotificationEmailJob (string body) diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc index d27609f0b..143baaa1b 100644 --- a/src/lib/send_problem_report_job.cc +++ b/src/lib/send_problem_report_job.cc @@ -34,7 +34,7 @@ using std::string; using std::list; -using boost::shared_ptr; +using std::shared_ptr; /** @param film Film thta the problem is with, or 0. * @param from Email address to use for From: diff --git a/src/lib/send_problem_report_job.h b/src/lib/send_problem_report_job.h index af1a4b269..4e66cb58b 100644 --- a/src/lib/send_problem_report_job.h +++ b/src/lib/send_problem_report_job.h @@ -26,7 +26,7 @@ class SendProblemReportJob : public Job { public: SendProblemReportJob ( - boost::shared_ptr film, + std::shared_ptr film, std::string from, std::string summary ); diff --git a/src/lib/server.cc b/src/lib/server.cc index 9a633c861..acb8d08d8 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -23,7 +23,7 @@ #include "i18n.h" -using boost::shared_ptr; +using std::shared_ptr; Server::Server (int port, int timeout) : _terminate (false) diff --git a/src/lib/server.h b/src/lib/server.h index 6ef268831..fbcd7e870 100644 --- a/src/lib/server.h +++ b/src/lib/server.h @@ -43,10 +43,10 @@ protected: bool _terminate; private: - virtual void handle (boost::shared_ptr socket) = 0; + virtual void handle (std::shared_ptr socket) = 0; void start_accept (); - void handle_accept (boost::shared_ptr, boost::system::error_code const &); + void handle_accept (std::shared_ptr, boost::system::error_code const &); boost::asio::io_service _io_service; boost::asio::ip::tcp::acceptor _acceptor; diff --git a/src/lib/shuffler.cc b/src/lib/shuffler.cc index d913f48ef..2689fb837 100644 --- a/src/lib/shuffler.cc +++ b/src/lib/shuffler.cc @@ -28,8 +28,8 @@ using std::make_pair; using std::string; -using boost::weak_ptr; -using boost::shared_ptr; +using std::weak_ptr; +using std::shared_ptr; using boost::optional; int const Shuffler::_max_size = 64; diff --git a/src/lib/shuffler.h b/src/lib/shuffler.h index 80754a5e0..b0a416b80 100644 --- a/src/lib/shuffler.h +++ b/src/lib/shuffler.h @@ -31,11 +31,11 @@ class Shuffler public: void clear (); void flush (); - void video (boost::weak_ptr, ContentVideo video); + void video (std::weak_ptr, ContentVideo video); - boost::signals2::signal, ContentVideo)> Video; + boost::signals2::signal, ContentVideo)> Video; - typedef std::pair, ContentVideo> Store; + typedef std::pair, ContentVideo> Store; private: friend struct ::shuffler_test5; diff --git a/src/lib/spl.cc b/src/lib/spl.cc index 7692df0ca..512fe253c 100644 --- a/src/lib/spl.cc +++ b/src/lib/spl.cc @@ -31,7 +31,7 @@ DCPOMATIC_ENABLE_WARNINGS using std::cout; using std::string; -using boost::shared_ptr; +using std::shared_ptr; using dcp::raw_convert; void diff --git a/src/lib/spl_entry.cc b/src/lib/spl_entry.cc index 3cb1a9a36..083ce0296 100644 --- a/src/lib/spl_entry.cc +++ b/src/lib/spl_entry.cc @@ -26,8 +26,8 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; SPLEntry::SPLEntry (shared_ptr content) { diff --git a/src/lib/spl_entry.h b/src/lib/spl_entry.h index 740082eaf..2650371c4 100644 --- a/src/lib/spl_entry.h +++ b/src/lib/spl_entry.h @@ -23,7 +23,6 @@ #include #include -#include namespace xmlpp { class Element; @@ -34,11 +33,11 @@ class Content; class SPLEntry { public: - SPLEntry (boost::shared_ptr content); + SPLEntry (std::shared_ptr content); void as_xml (xmlpp::Element* e); - boost::shared_ptr content; + std::shared_ptr content; std::string name; /** Digest of this content */ std::string digest; @@ -48,7 +47,7 @@ public: bool encrypted; private: - void construct (boost::shared_ptr content); + void construct (std::shared_ptr content); }; #endif diff --git a/src/lib/stdout_log.cc b/src/lib/stdout_log.cc index ba4578770..f4942a7b4 100644 --- a/src/lib/stdout_log.cc +++ b/src/lib/stdout_log.cc @@ -24,7 +24,7 @@ using std::cout; using std::string; -using boost::shared_ptr; +using std::shared_ptr; StdoutLog::StdoutLog () { diff --git a/src/lib/stdout_log.h b/src/lib/stdout_log.h index ec3ba7e57..f4335e8e5 100644 --- a/src/lib/stdout_log.h +++ b/src/lib/stdout_log.h @@ -27,5 +27,5 @@ public: explicit StdoutLog (int types); private: - void do_log (boost::shared_ptr entry); + void do_log (std::shared_ptr entry); }; diff --git a/src/lib/string_text_file.cc b/src/lib/string_text_file.cc index 793619003..78c119df6 100644 --- a/src/lib/string_text_file.cc +++ b/src/lib/string_text_file.cc @@ -35,7 +35,7 @@ using std::vector; using std::cout; using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::scoped_array; using boost::optional; using dcp::ArrayData; diff --git a/src/lib/string_text_file.h b/src/lib/string_text_file.h index 5ade4a9ec..c6fdac1e8 100644 --- a/src/lib/string_text_file.h +++ b/src/lib/string_text_file.h @@ -23,7 +23,6 @@ #include "dcpomatic_time.h" #include -#include #include class StringTextFileContent; @@ -41,7 +40,7 @@ class plain_text_parse_test; class StringTextFile { public: - explicit StringTextFile (boost::shared_ptr); + explicit StringTextFile (std::shared_ptr); boost::optional first () const; dcpomatic::ContentTime length () const; diff --git a/src/lib/string_text_file_content.cc b/src/lib/string_text_file_content.cc index 9a25ef06f..2bf416110 100644 --- a/src/lib/string_text_file_content.cc +++ b/src/lib/string_text_file_content.cc @@ -32,7 +32,7 @@ using std::string; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using dcp::raw_convert; using namespace dcpomatic; diff --git a/src/lib/string_text_file_content.h b/src/lib/string_text_file_content.h index 959190d32..cf71f8780 100644 --- a/src/lib/string_text_file_content.h +++ b/src/lib/string_text_file_content.h @@ -31,19 +31,19 @@ public: StringTextFileContent (boost::filesystem::path); StringTextFileContent (cxml::ConstNodePtr, int); - boost::shared_ptr shared_from_this () { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () { + return std::dynamic_pointer_cast (Content::shared_from_this ()); } - boost::shared_ptr shared_from_this () const { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () const { + return std::dynamic_pointer_cast (Content::shared_from_this ()); } - void examine (boost::shared_ptr film, boost::shared_ptr); + void examine (std::shared_ptr film, std::shared_ptr); 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 film) const; + dcpomatic::DCPTime full_length (std::shared_ptr film) const; dcpomatic::DCPTime approximate_length () const; std::string identifier () const; diff --git a/src/lib/string_text_file_decoder.cc b/src/lib/string_text_file_decoder.cc index 691734d7b..415851aef 100644 --- a/src/lib/string_text_file_decoder.cc +++ b/src/lib/string_text_file_decoder.cc @@ -31,9 +31,9 @@ using std::vector; using std::string; using std::cout; using std::max; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using namespace dcpomatic; StringTextFileDecoder::StringTextFileDecoder (shared_ptr film, shared_ptr content) diff --git a/src/lib/string_text_file_decoder.h b/src/lib/string_text_file_decoder.h index c57f40d24..aa8c80e6e 100644 --- a/src/lib/string_text_file_decoder.h +++ b/src/lib/string_text_file_decoder.h @@ -29,7 +29,7 @@ class StringTextFileContent; class StringTextFileDecoder : public Decoder, public StringTextFile { public: - StringTextFileDecoder (boost::shared_ptr film, boost::shared_ptr); + StringTextFileDecoder (std::shared_ptr film, std::shared_ptr); void seek (dcpomatic::ContentTime time, bool accurate); bool pass (); diff --git a/src/lib/subtitle_analysis.cc b/src/lib/subtitle_analysis.cc index 28eedac0d..49041151f 100644 --- a/src/lib/subtitle_analysis.cc +++ b/src/lib/subtitle_analysis.cc @@ -29,7 +29,7 @@ DCPOMATIC_ENABLE_WARNINGS using std::string; using dcp::raw_convert; -using boost::shared_ptr; +using std::shared_ptr; int const SubtitleAnalysis::_current_state_version = 1; diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_encoder.cc index 473d0698b..1a83c5c67 100644 --- a/src/lib/subtitle_encoder.cc +++ b/src/lib/subtitle_encoder.cc @@ -26,7 +26,6 @@ #include #include #include -#include #include #include @@ -36,7 +35,7 @@ using std::string; using std::make_pair; using std::pair; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/lib/subtitle_encoder.h b/src/lib/subtitle_encoder.h index 70b924564..165d5fcb6 100644 --- a/src/lib/subtitle_encoder.h +++ b/src/lib/subtitle_encoder.h @@ -23,7 +23,6 @@ #include "dcp_text_track.h" #include "encoder.h" #include "dcpomatic_time.h" -#include namespace dcp { class SubtitleAsset; @@ -37,7 +36,7 @@ class Film; class SubtitleEncoder : public Encoder { public: - SubtitleEncoder (boost::shared_ptr film, boost::shared_ptr job, boost::filesystem::path output, std::string intial_name, bool split_reels, bool include_font); + SubtitleEncoder (std::shared_ptr film, std::shared_ptr job, boost::filesystem::path output, std::string intial_name, bool split_reels, bool include_font); void go (); @@ -51,7 +50,7 @@ public: private: void text (PlayerText subs, TextType type, boost::optional track, dcpomatic::DCPTimePeriod period); - std::vector, boost::filesystem::path> > _assets; + std::vector, boost::filesystem::path> > _assets; std::vector _reels; bool _split_reels; bool _include_font; diff --git a/src/lib/text_content.cc b/src/lib/text_content.cc index ecd28d1a0..656aec7eb 100644 --- a/src/lib/text_content.cc +++ b/src/lib/text_content.cc @@ -35,8 +35,8 @@ using std::string; using std::vector; using std::cout; using std::list; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::optional; using dcp::raw_convert; using namespace dcpomatic; diff --git a/src/lib/text_content.h b/src/lib/text_content.h index 1c7eef19a..21d09ad12 100644 --- a/src/lib/text_content.h +++ b/src/lib/text_content.h @@ -62,13 +62,13 @@ class TextContent : public ContentPart { public: TextContent (Content* parent, TextType type, TextType original_type); - TextContent (Content* parent, std::vector >); + TextContent (Content* parent, std::vector >); void as_xml (xmlpp::Node *) const; std::string identifier () const; - void take_settings_from (boost::shared_ptr c); + void take_settings_from (std::shared_ptr c); - void add_font (boost::shared_ptr font); + void add_font (std::shared_ptr font); void set_use (bool); void set_burn (bool); @@ -122,7 +122,7 @@ public: return _y_scale; } - std::list > fonts () const { + std::list > fonts () const { boost::mutex::scoped_lock lm (_mutex); return _fonts; } @@ -177,7 +177,7 @@ public: return _dcp_track; } - static std::list > from_xml (Content* parent, cxml::ConstNodePtr, int version); + static std::list > from_xml (Content* parent, cxml::ConstNodePtr, int version); private: friend struct ffmpeg_pts_offset_test; @@ -202,7 +202,7 @@ private: double _x_scale; /** y scale factor to apply to subtitles */ double _y_scale; - std::list > _fonts; + std::list > _fonts; boost::optional _colour; boost::optional _effect; boost::optional _effect_colour; diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index 8146d33aa..3f6afd710 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -24,7 +24,6 @@ #include "log.h" #include "compose.hpp" #include -#include #include #include #include @@ -34,7 +33,7 @@ using std::cout; using std::string; using std::min; using std::max; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using boost::function; using namespace dcpomatic; diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h index fba9b5947..3fb27b653 100644 --- a/src/lib/text_decoder.h +++ b/src/lib/text_decoder.h @@ -40,16 +40,16 @@ class TextDecoder : public DecoderPart public: TextDecoder ( Decoder* parent, - boost::shared_ptr, + std::shared_ptr, dcpomatic::ContentTime first ); - boost::optional position (boost::shared_ptr) const { + boost::optional position (std::shared_ptr) const { return _position; } - void emit_bitmap_start (dcpomatic::ContentTime from, boost::shared_ptr image, dcpomatic::Rect rect); - void emit_bitmap (dcpomatic::ContentTimePeriod period, boost::shared_ptr image, dcpomatic::Rect rect); + void emit_bitmap_start (dcpomatic::ContentTime from, std::shared_ptr image, dcpomatic::Rect rect); + void emit_bitmap (dcpomatic::ContentTimePeriod period, std::shared_ptr image, dcpomatic::Rect rect); void emit_plain_start (dcpomatic::ContentTime from, std::list s); void emit_plain_start (dcpomatic::ContentTime from, sub::Subtitle const & subtitle); void emit_plain (dcpomatic::ContentTimePeriod period, std::list s); @@ -58,7 +58,7 @@ public: void seek (); - boost::shared_ptr content () const { + std::shared_ptr content () const { return _content; } @@ -67,7 +67,7 @@ public: boost::signals2::signal Stop; private: - boost::shared_ptr _content; + std::shared_ptr _content; boost::optional _position; }; diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 6d73a3673..48a2c8114 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -42,9 +42,9 @@ using std::string; using std::fixed; using std::setprecision; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; /** @param film Film to use */ TranscodeJob::TranscodeJob (shared_ptr film) diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h index 8240977b9..88f41d655 100644 --- a/src/lib/transcode_job.h +++ b/src/lib/transcode_job.h @@ -23,7 +23,6 @@ */ #include "job.h" -#include class Encoder; @@ -33,7 +32,7 @@ class Encoder; class TranscodeJob : public Job { public: - explicit TranscodeJob (boost::shared_ptr film); + explicit TranscodeJob (std::shared_ptr film); ~TranscodeJob (); std::string name () const; @@ -41,10 +40,10 @@ public: void run (); std::string status () const; - void set_encoder (boost::shared_ptr t); + void set_encoder (std::shared_ptr t); private: int remaining_time () const; - boost::shared_ptr _encoder; + std::shared_ptr _encoder; }; diff --git a/src/lib/types.cc b/src/lib/types.cc index 5687a5d48..6729628cd 100644 --- a/src/lib/types.cc +++ b/src/lib/types.cc @@ -39,7 +39,7 @@ using std::max; using std::min; using std::string; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using dcp::raw_convert; bool operator== (Crop const & a, Crop const & b) diff --git a/src/lib/types.h b/src/lib/types.h index a10b26a63..87b3fc753 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -24,7 +24,6 @@ #include "position.h" #include "rect.h" #include -#include #include #include @@ -86,8 +85,8 @@ namespace xmlpp { /** Port on which player listens for play requests */ #define PLAYER_PLAY_PORT (Config::instance()->server_port_base()+5) -typedef std::vector > ContentList; -typedef std::vector > FFmpegContentList; +typedef std::vector > ContentList; +typedef std::vector > FFmpegContentList; typedef int64_t Frame; @@ -190,7 +189,7 @@ struct Crop { Crop () : left (0), right (0), top (0), bottom (0) {} Crop (int l, int r, int t, int b) : left (l), right (r), top (t), bottom (b) {} - explicit Crop (boost::shared_ptr); + explicit Crop (std::shared_ptr); /** Number of pixels to remove from the left-hand side */ int left; diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc index c07e0c3d4..67a046251 100644 --- a/src/lib/upload_job.cc +++ b/src/lib/upload_job.cc @@ -36,7 +36,7 @@ using std::string; using std::min; -using boost::shared_ptr; +using std::shared_ptr; using boost::scoped_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/lib/upload_job.h b/src/lib/upload_job.h index 3a613fd72..ef9b6b451 100644 --- a/src/lib/upload_job.h +++ b/src/lib/upload_job.h @@ -27,7 +27,7 @@ class UploadJob : public Job { public: - explicit UploadJob (boost::shared_ptr); + explicit UploadJob (std::shared_ptr); ~UploadJob (); std::string name () const; diff --git a/src/lib/uploader.cc b/src/lib/uploader.cc index bfee5ecbb..9618e5beb 100644 --- a/src/lib/uploader.cc +++ b/src/lib/uploader.cc @@ -25,7 +25,7 @@ #include "i18n.h" using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::function; Uploader::Uploader (function set_status, function set_progress) diff --git a/src/lib/uploader.h b/src/lib/uploader.h index 65dc9bf0d..f57ed8c4f 100644 --- a/src/lib/uploader.h +++ b/src/lib/uploader.h @@ -21,7 +21,6 @@ #ifndef DCPOMATIC_UPLOADER_H #define DCPOMATIC_UPLOADER_H -#include #include #include diff --git a/src/lib/upmixer_a.cc b/src/lib/upmixer_a.cc index fc92b081d..d8cfb4fff 100644 --- a/src/lib/upmixer_a.cc +++ b/src/lib/upmixer_a.cc @@ -27,7 +27,7 @@ using std::string; using std::min; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; UpmixerA::UpmixerA (int sampling_rate) : _left (0.02, 1900.0 / sampling_rate, 4800.0 / sampling_rate) diff --git a/src/lib/upmixer_a.h b/src/lib/upmixer_a.h index 18569dcfa..984b08095 100644 --- a/src/lib/upmixer_a.h +++ b/src/lib/upmixer_a.h @@ -36,8 +36,8 @@ public: std::string name () const; std::string id () const; int out_channels () const; - boost::shared_ptr clone (int) const; - boost::shared_ptr run (boost::shared_ptr, int channels); + std::shared_ptr clone (int) const; + std::shared_ptr run (std::shared_ptr, int channels); void flush (); void make_audio_mapping_default (AudioMapping& mapping) const; std::vector input_names () const; diff --git a/src/lib/upmixer_b.cc b/src/lib/upmixer_b.cc index dfc9d67d5..317108f41 100644 --- a/src/lib/upmixer_b.cc +++ b/src/lib/upmixer_b.cc @@ -27,7 +27,7 @@ using std::string; using std::min; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; UpmixerB::UpmixerB (int sampling_rate) : _lfe (0.01, 150.0 / sampling_rate) diff --git a/src/lib/upmixer_b.h b/src/lib/upmixer_b.h index 221be1615..c4c4fd1ac 100644 --- a/src/lib/upmixer_b.h +++ b/src/lib/upmixer_b.h @@ -34,8 +34,8 @@ public: std::string name () const; std::string id () const; int out_channels () const; - boost::shared_ptr clone (int) const; - boost::shared_ptr run (boost::shared_ptr, int channels); + std::shared_ptr clone (int) const; + std::shared_ptr run (std::shared_ptr, int channels); void flush (); void make_audio_mapping_default (AudioMapping& mapping) const; std::vector input_names () const; diff --git a/src/lib/util.cc b/src/lib/util.cc index 5310e55c9..45b517c7f 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -103,7 +103,7 @@ using std::cout; using std::bad_alloc; using std::set_terminate; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::thread; using boost::optional; using boost::lexical_cast; diff --git a/src/lib/util.h b/src/lib/util.h index e23eff07c..564e376ad 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -105,19 +104,19 @@ extern int stride_round_up (int, int const *, int); extern void* wrapped_av_malloc (size_t); extern void set_backtrace_file (boost::filesystem::path); extern std::map split_get_request (std::string url); -extern std::string video_asset_filename (boost::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); -extern std::string audio_asset_filename (boost::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); -extern std::string atmos_asset_filename (boost::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); +extern std::string video_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); +extern std::string audio_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); +extern std::string atmos_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); extern float relaxed_string_to_float (std::string); extern std::string careful_string_filter (std::string); extern std::pair audio_channel_types (std::list mapped, int channels); -extern boost::shared_ptr remap (boost::shared_ptr input, int output_channels, AudioMapping map); +extern std::shared_ptr remap (std::shared_ptr input, int output_channels, AudioMapping map); extern Eyes increment_eyes (Eyes e); extern void checked_fread (void* ptr, size_t size, FILE* stream, boost::filesystem::path path); extern void checked_fwrite (void const * ptr, size_t size, FILE* stream, boost::filesystem::path path); extern size_t utf8_strlen (std::string s); extern std::string day_of_week_to_string (boost::gregorian::greg_weekday d); -extern void emit_subtitle_image (dcpomatic::ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, boost::shared_ptr decoder); +extern void emit_subtitle_image (dcpomatic::ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, std::shared_ptr decoder); extern bool show_jobs_on_console (bool progress); extern void copy_in_bits (boost::filesystem::path from, boost::filesystem::path to, boost::function); extern dcp::Size scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_container); diff --git a/src/lib/verify_dcp_job.cc b/src/lib/verify_dcp_job.cc index f6dc10063..88e44c4f9 100644 --- a/src/lib/verify_dcp_job.cc +++ b/src/lib/verify_dcp_job.cc @@ -26,7 +26,7 @@ using std::string; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/lib/verify_dcp_job.h b/src/lib/verify_dcp_job.h index 2cff5ab6c..ab33b4f55 100644 --- a/src/lib/verify_dcp_job.h +++ b/src/lib/verify_dcp_job.h @@ -20,7 +20,6 @@ #include "job.h" #include -#include class Content; diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 631abc417..4933de71b 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -61,9 +61,9 @@ using std::fixed; using std::setprecision; using std::list; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using dcp::raw_convert; using namespace dcpomatic; diff --git a/src/lib/video_content.h b/src/lib/video_content.h index b478666bb..e5bbb5bab 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -27,8 +27,6 @@ #include "types.h" #include "content_part.h" #include -#include -#include class VideoExaminer; class Ratio; @@ -51,16 +49,16 @@ public: static int const CUSTOM_SIZE; }; -class VideoContent : public ContentPart, public boost::enable_shared_from_this +class VideoContent : public ContentPart, public std::enable_shared_from_this { public: explicit VideoContent (Content* parent); - VideoContent (Content* parent, std::vector >); + VideoContent (Content* parent, std::vector >); void as_xml (xmlpp::Node *) const; std::string technical_summary () const; std::string identifier () const; - void take_settings_from (boost::shared_ptr c); + void take_settings_from (std::shared_ptr c); Frame length () const { boost::mutex::scoped_lock lm (_mutex); @@ -183,19 +181,19 @@ public: dcp::Size size_after_crop () const; dcp::Size scaled_size (dcp::Size container_size); - boost::optional fade (boost::shared_ptr film, Frame) const; + boost::optional fade (std::shared_ptr film, Frame) const; - std::string processing_description (boost::shared_ptr film); + std::string processing_description (std::shared_ptr film); void set_length (Frame); - void take_from_examiner (boost::shared_ptr); + void take_from_examiner (std::shared_ptr); void add_properties (std::list &) const; - void modify_position (boost::shared_ptr film, dcpomatic::DCPTime& pos) const; + void modify_position (std::shared_ptr film, dcpomatic::DCPTime& pos) const; void modify_trim_start (dcpomatic::ContentTime& pos) const; - static boost::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr, int); + static std::shared_ptr from_xml (Content* parent, cxml::ConstNodePtr, int); private: diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index 2850b5aa0..5bf067283 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -34,7 +34,7 @@ using std::cout; using std::list; using std::max; using std::back_inserter; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h index dca8eef11..5d9a6b8a0 100644 --- a/src/lib/video_decoder.h +++ b/src/lib/video_decoder.h @@ -31,7 +31,6 @@ #include "content_video.h" #include "decoder_part.h" #include -#include class VideoContent; class ImageProxy; @@ -45,24 +44,24 @@ class FrameIntervalChecker; class VideoDecoder : public DecoderPart { public: - VideoDecoder (Decoder* parent, boost::shared_ptr c); + VideoDecoder (Decoder* parent, std::shared_ptr c); friend struct video_decoder_fill_test1; friend struct video_decoder_fill_test2; friend struct ffmpeg_pts_offset_test; friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length); - boost::optional position (boost::shared_ptr) const { + boost::optional position (std::shared_ptr) const { return _position; } void seek (); - void emit (boost::shared_ptr film, boost::shared_ptr, Frame frame); + void emit (std::shared_ptr film, std::shared_ptr, Frame frame); boost::signals2::signal Data; private: - boost::shared_ptr _content; + std::shared_ptr _content; /** Frame of last thing to be emitted; only used for 3D */ boost::optional _last_emitted_frame; boost::optional _last_emitted_eyes; diff --git a/src/lib/video_filter_graph.cc b/src/lib/video_filter_graph.cc index 9b297c87b..b35fc14c1 100644 --- a/src/lib/video_filter_graph.cc +++ b/src/lib/video_filter_graph.cc @@ -34,7 +34,7 @@ using std::pair; using std::vector; using std::string; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; VideoFilterGraph::VideoFilterGraph (dcp::Size s, AVPixelFormat p, dcp::Fraction r) : _size (s) diff --git a/src/lib/video_filter_graph.h b/src/lib/video_filter_graph.h index 19cb24e36..ba0284fb8 100644 --- a/src/lib/video_filter_graph.h +++ b/src/lib/video_filter_graph.h @@ -26,7 +26,7 @@ public: VideoFilterGraph (dcp::Size s, AVPixelFormat p, dcp::Fraction r); bool can_process (dcp::Size s, AVPixelFormat p) const; - std::list, int64_t> > process (AVFrame * frame); + std::list, int64_t> > process (AVFrame * frame); protected: std::string src_parameters () const; diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc index 0c905a624..a8a301f22 100644 --- a/src/lib/video_mxf_content.cc +++ b/src/lib/video_mxf_content.cc @@ -34,7 +34,7 @@ using std::list; using std::string; -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; VideoMXFContent::VideoMXFContent (boost::filesystem::path path) diff --git a/src/lib/video_mxf_content.h b/src/lib/video_mxf_content.h index dd470335c..6ec2c0e84 100644 --- a/src/lib/video_mxf_content.h +++ b/src/lib/video_mxf_content.h @@ -26,22 +26,22 @@ public: VideoMXFContent (boost::filesystem::path path); VideoMXFContent (cxml::ConstNodePtr node, int version); - boost::shared_ptr shared_from_this () { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () { + return std::dynamic_pointer_cast (Content::shared_from_this ()); } - boost::shared_ptr shared_from_this () const { - return boost::dynamic_pointer_cast (Content::shared_from_this ()); + std::shared_ptr shared_from_this () const { + return std::dynamic_pointer_cast (Content::shared_from_this ()); } - void examine (boost::shared_ptr film, boost::shared_ptr job); + void examine (std::shared_ptr film, std::shared_ptr job); std::string summary () const; std::string technical_summary () const; std::string identifier () const; void as_xml (xmlpp::Node* node, bool with_paths) const; - dcpomatic::DCPTime full_length (boost::shared_ptr film) const; + dcpomatic::DCPTime full_length (std::shared_ptr film) const; dcpomatic::DCPTime approximate_length () const; - void add_properties (boost::shared_ptr film, std::list& p) const; + void add_properties (std::shared_ptr film, std::list& p) const; static bool valid_mxf (boost::filesystem::path path); }; diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc index 488f83778..d2b057972 100644 --- a/src/lib/video_mxf_decoder.cc +++ b/src/lib/video_mxf_decoder.cc @@ -29,7 +29,7 @@ #include #include -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; diff --git a/src/lib/video_mxf_decoder.h b/src/lib/video_mxf_decoder.h index 78313df0f..ae5d2fb78 100644 --- a/src/lib/video_mxf_decoder.h +++ b/src/lib/video_mxf_decoder.h @@ -28,18 +28,18 @@ class Log; class VideoMXFDecoder : public Decoder { public: - VideoMXFDecoder (boost::shared_ptr film, boost::shared_ptr); + VideoMXFDecoder (std::shared_ptr film, std::shared_ptr); bool pass (); void seek (dcpomatic::ContentTime t, bool accurate); private: - boost::shared_ptr _content; + std::shared_ptr _content; /** Time of next thing to return from pass */ dcpomatic::ContentTime _next; - boost::shared_ptr _mono_reader; - boost::shared_ptr _stereo_reader; + std::shared_ptr _mono_reader; + std::shared_ptr _stereo_reader; dcp::Size _size; }; diff --git a/src/lib/video_mxf_examiner.cc b/src/lib/video_mxf_examiner.cc index 652dc6941..8c7029ea8 100644 --- a/src/lib/video_mxf_examiner.cc +++ b/src/lib/video_mxf_examiner.cc @@ -24,7 +24,7 @@ #include #include -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; VideoMXFExaminer::VideoMXFExaminer (shared_ptr content) diff --git a/src/lib/video_mxf_examiner.h b/src/lib/video_mxf_examiner.h index ec2933c27..c66774876 100644 --- a/src/lib/video_mxf_examiner.h +++ b/src/lib/video_mxf_examiner.h @@ -29,7 +29,7 @@ namespace dcp { class VideoMXFExaminer : public VideoExaminer { public: - explicit VideoMXFExaminer (boost::shared_ptr); + explicit VideoMXFExaminer (std::shared_ptr); bool has_video () const { return true; @@ -44,5 +44,5 @@ public: } private: - boost::shared_ptr _asset; + std::shared_ptr _asset; }; diff --git a/src/lib/video_ring_buffers.cc b/src/lib/video_ring_buffers.cc index 24d904e7e..1c08d44b3 100644 --- a/src/lib/video_ring_buffers.cc +++ b/src/lib/video_ring_buffers.cc @@ -30,7 +30,7 @@ using std::make_pair; using std::cout; using std::pair; using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; diff --git a/src/lib/video_ring_buffers.h b/src/lib/video_ring_buffers.h index c7f789cb5..832837d94 100644 --- a/src/lib/video_ring_buffers.h +++ b/src/lib/video_ring_buffers.h @@ -23,7 +23,6 @@ #include "types.h" #include #include -#include #include @@ -34,18 +33,18 @@ class PlayerVideo; class VideoRingBuffers : public boost::noncopyable { public: - void put (boost::shared_ptr frame, dcpomatic::DCPTime time); - std::pair, dcpomatic::DCPTime> get (); + void put (std::shared_ptr frame, dcpomatic::DCPTime time); + std::pair, dcpomatic::DCPTime> get (); void clear (); Frame size () const; bool empty () const; - void reset_metadata (boost::shared_ptr film, dcp::Size player_video_container_size); + void reset_metadata (std::shared_ptr film, dcp::Size player_video_container_size); std::pair memory_used () const; private: mutable boost::mutex _mutex; - std::list, dcpomatic::DCPTime> > _data; + std::list, dcpomatic::DCPTime> > _data; }; diff --git a/src/lib/weak_film.h b/src/lib/weak_film.h index 731101474..7d090bd17 100644 --- a/src/lib/weak_film.h +++ b/src/lib/weak_film.h @@ -24,8 +24,6 @@ #include "dcpomatic_assert.h" -#include -#include class Film; @@ -35,15 +33,15 @@ template class WeakFilmTemplate { public: - WeakFilmTemplate (boost::weak_ptr f) + WeakFilmTemplate (std::weak_ptr f) : _film(f) {} protected: - boost::weak_ptr _film; + std::weak_ptr _film; - boost::shared_ptr film () const { - boost::shared_ptr f = _film.lock(); + std::shared_ptr film () const { + std::shared_ptr f = _film.lock(); DCPOMATIC_ASSERT (f); return f; } diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 77a6bb589..ff2adeb00 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -59,9 +59,9 @@ using std::map; using std::min; using std::max; using std::vector; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/lib/writer.h b/src/lib/writer.h index b924337dd..c8a007f78 100644 --- a/src/lib/writer.h +++ b/src/lib/writer.h @@ -29,8 +29,6 @@ #include "dcp_text_track.h" #include "weak_film.h" #include -#include -#include #include #include #include @@ -71,7 +69,7 @@ public: } type; /** encoded data for FULL */ - boost::shared_ptr encoded; + std::shared_ptr encoded; /** size of data for FAKE */ int size; /** reel index */ @@ -99,22 +97,22 @@ bool operator== (QueueItem const & a, QueueItem const & b); class Writer : public ExceptionStore, public boost::noncopyable, public WeakConstFilm { public: - Writer (boost::weak_ptr, boost::weak_ptr, bool text_only = false); + Writer (std::weak_ptr, std::weak_ptr, bool text_only = false); ~Writer (); void start (); bool can_fake_write (Frame) const; - void write (boost::shared_ptr, Frame, Eyes); + void write (std::shared_ptr, Frame, Eyes); void fake_write (Frame, Eyes); bool can_repeat (Frame) const; void repeat (Frame, Eyes); - void write (boost::shared_ptr, dcpomatic::DCPTime time); + void write (std::shared_ptr, dcpomatic::DCPTime time); void write (PlayerText text, TextType type, boost::optional, dcpomatic::DCPTimePeriod period); void write (std::vector fonts); void write (ReferencedReelAsset asset); - void write (boost::shared_ptr atmos, dcpomatic::DCPTime time, AtmosMetadata metadata); + void write (std::shared_ptr atmos, dcpomatic::DCPTime time, AtmosMetadata metadata); void finish (boost::filesystem::path output_dcp); void set_encoder_threads (int threads); @@ -128,7 +126,7 @@ private: void write_cover_sheet (boost::filesystem::path output_dcp); void calculate_referenced_digests (boost::function set_progress); - boost::weak_ptr _job; + std::weak_ptr _job; std::vector _reels; std::vector::iterator _audio_reel; std::vector::iterator _subtitle_reel; diff --git a/src/lib/zipper.cc b/src/lib/zipper.cc index d43b18ef0..005e15248 100644 --- a/src/lib/zipper.cc +++ b/src/lib/zipper.cc @@ -27,7 +27,7 @@ using std::string; using std::runtime_error; -using boost::shared_ptr; +using std::shared_ptr; Zipper::Zipper (boost::filesystem::path file) diff --git a/src/lib/zipper.h b/src/lib/zipper.h index a981a22b7..c2b40556c 100644 --- a/src/lib/zipper.h +++ b/src/lib/zipper.h @@ -20,7 +20,6 @@ #include #include -#include #include class Zipper : public boost::noncopyable @@ -34,6 +33,6 @@ public: private: struct zip* _zip; - std::vector > _store; + std::vector > _store; }; diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index d66993388..386e40cb2 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -124,8 +124,8 @@ using std::map; using std::make_pair; using std::list; using std::exception; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::optional; using boost::function; using boost::is_any_of; @@ -1509,7 +1509,7 @@ private: } FilmEditor* _film_editor; - boost::shared_ptr _film_viewer; + std::shared_ptr _film_viewer; StandardControls* _controls; VideoWaveformDialog* _video_waveform_dialog; SystemInformationDialog* _system_information_dialog; diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 3517de9fe..46c66d2c9 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -49,10 +49,10 @@ using std::string; using std::cout; using std::list; using std::set; -using boost::shared_ptr; +using std::shared_ptr; using boost::thread; using boost::scoped_array; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index edf4808a0..2d70fb578 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -47,9 +47,9 @@ using std::vector; using std::pair; using std::setw; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; static void help (string n) diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc index 19103fc33..886c1c613 100644 --- a/src/tools/dcpomatic_combiner.cc +++ b/src/tools/dcpomatic_combiner.cc @@ -40,9 +40,9 @@ DCPOMATIC_ENABLE_WARNINGS using std::exception; using std::string; using std::vector; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using boost::optional; -using boost::shared_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 90025c5bc..568dfa56c 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -50,8 +50,8 @@ using std::cout; using std::cerr; using std::list; using std::exception; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::optional; class SimpleSignalManager : public SignalManager diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc index d3a28cdc4..ac0bb68df 100644 --- a/src/tools/dcpomatic_disk.cc +++ b/src/tools/dcpomatic_disk.cc @@ -51,7 +51,7 @@ using std::string; using std::exception; using std::cout; using std::cerr; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 1d72af4d5..874573ce2 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -71,11 +71,11 @@ using std::string; using std::vector; using std::pair; using std::map; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; using boost::optional; using boost::ref; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif @@ -308,7 +308,7 @@ private: list kdms; string title; - shared_ptr dkdm = boost::dynamic_pointer_cast (dkdm_base); + shared_ptr dkdm = std::dynamic_pointer_cast (dkdm_base); if (dkdm) { /* Decrypt the DKDM */ @@ -596,7 +596,7 @@ private: ScreensPanel* _screens; KDMTimingPanel* _timing; wxTreeCtrl* _dkdm; - typedef std::map > DKDMMap; + typedef std::map > DKDMMap; DKDMMap _dkdm_id; wxButton* _add_dkdm; wxButton* _add_dkdm_folder; diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index 4da0393b0..fef5dea04 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -42,10 +42,10 @@ using std::cerr; using std::list; using std::vector; using std::runtime_error; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using boost::bind; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif @@ -533,8 +533,8 @@ int main (int argc, char* argv[]) } if (list_cinemas) { - list > cinemas = Config::instance()->cinemas (); - for (list >::const_iterator i = cinemas.begin(); i != cinemas.end(); ++i) { + list > cinemas = Config::instance()->cinemas (); + for (list >::const_iterator i = cinemas.begin(); i != cinemas.end(); ++i) { cout << (*i)->name << " (" << Emailer::address_list ((*i)->emails) << ")\n"; } exit (EXIT_SUCCESS); diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index f37f77c22..5b2c9a56a 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -84,11 +84,11 @@ using std::cout; using std::list; using std::exception; using std::vector; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::scoped_array; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using boost::thread; using boost::bind; #if BOOST_VERSION >= 106100 @@ -604,7 +604,7 @@ private: if (r == wxID_OK) { DCPOMATIC_ASSERT (_film); - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + shared_ptr dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); dcp->add_ov (wx_to_std(c->GetPath())); JobManager::instance()->add(shared_ptr(new ExamineContentJob (_film, dcp))); @@ -633,7 +633,7 @@ private: if (d->ShowModal() == wxID_OK) { DCPOMATIC_ASSERT (_film); - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + shared_ptr dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); try { if (dcp) { @@ -690,7 +690,7 @@ private: void view_cpl (wxCommandEvent& ev) { - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + shared_ptr dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); DCPExaminer ex (dcp, true); int id = ev.GetId() - ID_view_cpl; @@ -785,7 +785,7 @@ private: void tools_verify () { - shared_ptr dcp = boost::dynamic_pointer_cast(_film->content().front()); + shared_ptr dcp = std::dynamic_pointer_cast(_film->content().front()); DCPOMATIC_ASSERT (dcp); shared_ptr job (new VerifyDCPJob(dcp->directories())); @@ -994,7 +994,7 @@ private: shared_ptr _viewer; Controls* _controls; SystemInformationDialog* _system_information_dialog; - boost::shared_ptr _film; + std::shared_ptr _film; boost::signals2::scoped_connection _config_changed_connection; boost::signals2::scoped_connection _examine_job_connection; wxMenuItem* _file_add_ov; diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc index 9027e7e30..261f08972 100644 --- a/src/tools/dcpomatic_playlist.cc +++ b/src/tools/dcpomatic_playlist.cc @@ -45,10 +45,10 @@ using std::map; using std::make_pair; using std::vector; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::bind; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index b51f29c15..c59fefe8f 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -46,11 +46,11 @@ using std::exception; using std::list; using std::fixed; using std::setprecision; -using boost::shared_ptr; +using std::shared_ptr; using boost::thread; using boost::bind; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif @@ -206,7 +206,7 @@ private: wxTextCtrl* _text; wxStaticText* _fps; - boost::shared_ptr _timer; + std::shared_ptr _timer; }; class TaskBarIcon : public wxTaskBarIcon diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc index d1bee2dcc..6d7f6aba7 100644 --- a/src/tools/dcpomatic_server_cli.cc +++ b/src/tools/dcpomatic_server_cli.cc @@ -46,7 +46,7 @@ using std::cerr; using std::string; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; static void help (string n) diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index b64970f62..e3375b988 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -40,7 +40,7 @@ using std::cout; using std::cerr; using std::string; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using boost::bind; #if BOOST_VERSION >= 106100 diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index 748bd72d0..1cb167c95 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -37,12 +37,12 @@ using std::cout; using std::list; using std::vector; using std::pair; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::bind; using boost::optional; using boost::const_pointer_cast; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using namespace dcpomatic; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h index 8f7151b1b..a94e98e32 100644 --- a/src/wx/audio_dialog.h +++ b/src/wx/audio_dialog.h @@ -25,7 +25,6 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include #include class AudioPlot; @@ -35,7 +34,7 @@ class Film; class AudioDialog : public wxDialog { public: - AudioDialog (wxWindow* parent, boost::shared_ptr film, boost::weak_ptr viewer, boost::shared_ptr content = boost::shared_ptr()); + AudioDialog (wxWindow* parent, std::shared_ptr film, std::weak_ptr viewer, std::shared_ptr content = std::shared_ptr()); bool Show (bool show = true); @@ -52,13 +51,13 @@ private: void setup_statistics (); void show_or_hide_channel_checkboxes (); - boost::shared_ptr _analysis; - boost::weak_ptr _film; - boost::weak_ptr _viewer; + std::shared_ptr _analysis; + std::weak_ptr _film; + std::weak_ptr _viewer; /** content to analyse, or 0 to analyse all the film's content */ - boost::weak_ptr _content; + std::weak_ptr _content; int _channels; - boost::shared_ptr _playlist; + std::shared_ptr _playlist; wxStaticText* _cursor; AudioPlot* _plot; wxStaticText* _sample_peak; diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 01cd7738b..04a468416 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -47,7 +47,7 @@ using std::max; using std::vector; using std::pair; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index 2809ce44a..bf73798da 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -43,8 +43,8 @@ using std::cout; using std::string; using std::list; using std::pair; -using boost::dynamic_pointer_cast; -using boost::shared_ptr; +using std::dynamic_pointer_cast; +using std::shared_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h index f7161f10a..aee352a55 100644 --- a/src/wx/audio_panel.h +++ b/src/wx/audio_panel.h @@ -38,7 +38,7 @@ public: void film_changed (Film::Property); void film_content_changed (int); void content_selection_changed (); - void set_film (boost::shared_ptr); + void set_film (std::shared_ptr); private: void show_clicked (); diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 74c10348e..682abe432 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -37,8 +37,8 @@ using std::min; using std::map; using boost::bind; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h index 989f15edc..27d76b6db 100644 --- a/src/wx/audio_plot.h +++ b/src/wx/audio_plot.h @@ -24,7 +24,6 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include #include #include @@ -34,9 +33,9 @@ class FilmViewer; class AudioPlot : public wxPanel { public: - explicit AudioPlot (wxWindow *, boost::weak_ptr viewer); + explicit AudioPlot (wxWindow *, std::weak_ptr viewer); - void set_analysis (boost::shared_ptr); + void set_analysis (std::shared_ptr); void set_channel_visible (int c, bool v); void set_type_visible (int t, bool v); void set_smoothing (int); @@ -79,8 +78,8 @@ private: void mouse_leave (wxMouseEvent& ev); void search (std::map const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) const; - boost::weak_ptr _viewer; - boost::shared_ptr _analysis; + std::weak_ptr _viewer; + std::shared_ptr _analysis; bool _channel_visible[MAX_DCP_AUDIO_CHANNELS]; bool _type_visible[AudioPoint::COUNT]; int _smoothing; diff --git a/src/wx/batch_job_view.cc b/src/wx/batch_job_view.cc index 038e8b228..07e330c4c 100644 --- a/src/wx/batch_job_view.cc +++ b/src/wx/batch_job_view.cc @@ -25,7 +25,7 @@ #include using std::list; -using boost::shared_ptr; +using std::shared_ptr; BatchJobView::BatchJobView (shared_ptr job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table) : JobView (job, parent, container, table) diff --git a/src/wx/batch_job_view.h b/src/wx/batch_job_view.h index 40dceff31..688e6c374 100644 --- a/src/wx/batch_job_view.h +++ b/src/wx/batch_job_view.h @@ -23,7 +23,7 @@ class BatchJobView : public JobView { public: - BatchJobView (boost::shared_ptr job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table); + BatchJobView (std::shared_ptr job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table); private: int insert_position () const; diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc index 7411fa153..71fc15272 100644 --- a/src/wx/closed_captions_dialog.cc +++ b/src/wx/closed_captions_dialog.cc @@ -32,8 +32,8 @@ using std::max; using std::cout; using std::pair; using std::make_pair; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h index 4117de263..1f0e450ff 100644 --- a/src/wx/closed_captions_dialog.h +++ b/src/wx/closed_captions_dialog.h @@ -35,8 +35,8 @@ public: explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer); void clear (); - void update_tracks (boost::shared_ptr film); - void set_butler (boost::weak_ptr); + void update_tracks (std::shared_ptr film); + void set_butler (std::weak_ptr); private: void shown (wxShowEvent); @@ -51,6 +51,6 @@ private: bool _current_in_lines; std::vector _lines; std::vector _tracks; - boost::weak_ptr _butler; + std::weak_ptr _butler; wxTimer _timer; }; diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc index 3c59dbeed..46bf77a8e 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -34,8 +34,8 @@ using std::string; using std::cout; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::bind; using dcp::locale_convert; diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 2319754f0..0d341ba73 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -34,7 +34,7 @@ using std::make_pair; using std::map; using boost::bind; using boost::optional; -using boost::shared_ptr; +using std::shared_ptr; using boost::function; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h index a698b252a..b2ebbe605 100644 --- a/src/wx/config_dialog.h +++ b/src/wx/config_dialog.h @@ -114,8 +114,8 @@ public: wxWindow* parent, wxString title, int border, - boost::function)> set, - boost::function (void)> get, + boost::function)> set, + boost::function (void)> get, boost::function nag_alter ); @@ -145,8 +145,8 @@ private: wxStaticText* _private_key_bad; wxSizer* _sizer; wxBoxSizer* _button_sizer; - boost::function)> _set; - boost::function (void)> _get; + boost::function)> _set; + boost::function (void)> _get; boost::function _nag_alter; }; diff --git a/src/wx/content_advanced_dialog.cc b/src/wx/content_advanced_dialog.cc index d170032a4..a33ffed90 100644 --- a/src/wx/content_advanced_dialog.cc +++ b/src/wx/content_advanced_dialog.cc @@ -42,9 +42,9 @@ DCPOMATIC_ENABLE_WARNINGS using std::string; using std::vector; using boost::bind; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using boost::optional; -using boost::shared_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/content_advanced_dialog.h b/src/wx/content_advanced_dialog.h index b01669bac..6eaaa2e2d 100644 --- a/src/wx/content_advanced_dialog.h +++ b/src/wx/content_advanced_dialog.h @@ -23,7 +23,7 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include +#include #include @@ -34,7 +34,7 @@ class Filter; class ContentAdvancedDialog : public wxDialog { public: - ContentAdvancedDialog (wxWindow* parent, boost::shared_ptr content); + ContentAdvancedDialog (wxWindow* parent, std::shared_ptr content); private: void ignore_video_changed (wxCommandEvent& ev); @@ -44,7 +44,7 @@ private: void set_video_frame_rate (); void video_frame_rate_changed (); - boost::shared_ptr _content; + std::shared_ptr _content; wxStaticText* _filters; wxButton* _filters_button; diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 3c3b1ed3a..57c6afeb3 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -50,9 +50,9 @@ using std::cout; using std::vector; using std::exception; using std::list; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; @@ -357,9 +357,9 @@ ContentMenu::find_missing () bind ( &ContentMenu::maybe_found_missing, this, - boost::weak_ptr (j), - boost::weak_ptr (_content.front ()), - boost::weak_ptr (i) + std::weak_ptr (j), + std::weak_ptr (_content.front ()), + std::weak_ptr (i) ) ); diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index 756c1675a..7743d0712 100644 --- a/src/wx/content_menu.h +++ b/src/wx/content_menu.h @@ -24,8 +24,7 @@ #include "timeline_content_view.h" #include "lib/types.h" #include -#include -#include +#include class Film; class Job; @@ -36,7 +35,7 @@ class ContentMenu : public boost::noncopyable public: explicit ContentMenu (wxWindow* p); - void popup (boost::weak_ptr, ContentList, TimelineContentViewList, wxPoint); + void popup (std::weak_ptr, ContentList, TimelineContentViewList, wxPoint); private: void repeat (); @@ -49,13 +48,13 @@ private: void ov (); void set_dcp_settings (); void remove (); - void maybe_found_missing (boost::weak_ptr, boost::weak_ptr, boost::weak_ptr); + void maybe_found_missing (std::weak_ptr, std::weak_ptr, std::weak_ptr); void cpl_selected (wxCommandEvent& ev); wxMenu* _menu; wxMenu* _cpl_menu; /** Film that we are working with; set up by popup() */ - boost::weak_ptr _film; + std::weak_ptr _film; wxWindow* _parent; bool _pop_up_open; ContentList _content; diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 1a15d241d..7114e8337 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -57,9 +57,9 @@ using std::cout; using std::vector; using std::max; using std::exception; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::optional; using namespace dcpomatic; #if BOOST_VERSION >= 106100 diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h index df5c58ebd..6a9ef3f4a 100644 --- a/src/wx/content_panel.h +++ b/src/wx/content_panel.h @@ -22,7 +22,6 @@ #include "lib/types.h" #include "lib/film.h" #include -#include #include class wxNotebook; @@ -66,15 +65,15 @@ private: class ContentPanel : public boost::noncopyable { public: - ContentPanel (wxNotebook *, boost::shared_ptr, boost::weak_ptr viewer); + ContentPanel (wxNotebook *, std::shared_ptr, std::weak_ptr viewer); - boost::shared_ptr film () const { + std::shared_ptr film () const { return _film; } - void set_film (boost::shared_ptr); + void set_film (std::shared_ptr); void set_general_sensitivity (bool s); - void set_selection (boost::weak_ptr); + void set_selection (std::weak_ptr); void set_selection (ContentList cl); void film_changed (Film::Property p); @@ -100,7 +99,7 @@ public: bool remove_clicked (bool hotkey); void timeline_clicked (); - boost::weak_ptr film_viewer () const { + std::weak_ptr film_viewer () const { return _film_viewer; } @@ -144,8 +143,8 @@ private: wxNotebook* _parent; wxWindow* _last_selected_tab; - boost::shared_ptr _film; - boost::weak_ptr _film_viewer; + std::shared_ptr _film; + std::weak_ptr _film_viewer; bool _generally_sensitive; bool _ignore_deselect; bool _no_check_selection; diff --git a/src/wx/content_properties_dialog.cc b/src/wx/content_properties_dialog.cc index 7dcc6f8f1..bf1f67ace 100644 --- a/src/wx/content_properties_dialog.cc +++ b/src/wx/content_properties_dialog.cc @@ -31,8 +31,8 @@ using std::string; using std::list; using std::pair; using std::map; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr film, shared_ptr content) : TableDialog (parent, _("Content Properties"), 2, 1, false) diff --git a/src/wx/content_properties_dialog.h b/src/wx/content_properties_dialog.h index 5d0cd4630..9faccb4b7 100644 --- a/src/wx/content_properties_dialog.h +++ b/src/wx/content_properties_dialog.h @@ -20,7 +20,6 @@ #include "table_dialog.h" #include "lib/user_property.h" -#include #include #include @@ -31,7 +30,7 @@ class UserProperty; class ContentPropertiesDialog : public TableDialog { public: - ContentPropertiesDialog (wxWindow* parent, boost::shared_ptr film, boost::shared_ptr content); + ContentPropertiesDialog (wxWindow* parent, std::shared_ptr film, std::shared_ptr content); private: void maybe_add_group (std::map > const & groups, UserProperty::Category category); diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc index 1a92c0dcd..b4ba55175 100644 --- a/src/wx/content_sub_panel.cc +++ b/src/wx/content_sub_panel.cc @@ -29,7 +29,7 @@ using std::list; using std::string; -using boost::shared_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/content_sub_panel.h b/src/wx/content_sub_panel.h index cb59f38dd..08c61c25f 100644 --- a/src/wx/content_sub_panel.h +++ b/src/wx/content_sub_panel.h @@ -26,7 +26,6 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include class ContentPanel; class Content; @@ -50,7 +49,7 @@ public: protected: - void setup_refer_button (wxCheckBox* button, wxStaticText* note, boost::shared_ptr dcp, bool can_reference, wxString cannot) const; + void setup_refer_button (wxCheckBox* button, wxStaticText* note, std::shared_ptr dcp, bool can_reference, wxString cannot) const; virtual void add_to_grid () = 0; ContentPanel* _parent; diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc index da3ca6b6b..67a9a3fa5 100644 --- a/src/wx/content_view.cc +++ b/src/wx/content_view.cc @@ -35,10 +35,10 @@ using std::string; using std::cout; using std::list; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using namespace dcpomatic; ContentView::ContentView (wxWindow* parent) diff --git a/src/wx/content_view.h b/src/wx/content_view.h index 3f4a65ab1..0bbfffaa7 100644 --- a/src/wx/content_view.h +++ b/src/wx/content_view.h @@ -23,8 +23,6 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include -#include #include class Content; @@ -35,14 +33,14 @@ class ContentView : public wxListCtrl, public ContentStore public: ContentView (wxWindow* parent); - boost::shared_ptr selected () const; + std::shared_ptr selected () const; void update (); - boost::shared_ptr get (std::string digest) const; + std::shared_ptr get (std::string digest) const; private: - void add (boost::shared_ptr content); + void add (std::shared_ptr content); - boost::weak_ptr _film; - std::vector > _content; + std::weak_ptr _film; + std::vector > _content; }; diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h index 6505d08da..d38609cb4 100644 --- a/src/wx/content_widget.h +++ b/src/wx/content_widget.h @@ -60,7 +60,7 @@ public: wxWindow* parent, T* wrapped, int property, - boost::function (Content*)> part, + boost::function (Content*)> part, boost::function model_getter, boost::function model_setter, boost::function view_changed, @@ -90,7 +90,7 @@ public: return _wrapped; } - typedef std::vector > List; + typedef std::vector > List; /** Set the content that this control is working on (i.e. the selected content) */ void set_content (List content) @@ -214,7 +214,7 @@ private: wxButton* _button; List _content; int _property; - boost::function (Content *)> _part; + boost::function (Content *)> _part; boost::function _model_getter; boost::function _model_setter; boost::function _view_changed; @@ -238,7 +238,7 @@ public: wxWindow* parent, wxSpinCtrl* wrapped, int property, - boost::function (Content *)> part, + boost::function (Content *)> part, boost::function getter, boost::function setter, boost::function view_changed = boost::function() @@ -266,7 +266,7 @@ public: wxWindow* parent, wxSpinCtrlDouble* wrapped, int property, - boost::function (Content *)> part, + boost::function (Content *)> part, boost::function getter, boost::function setter, boost::function view_changed = boost::function() @@ -294,7 +294,7 @@ public: wxWindow* parent, wxChoice* wrapped, int property, - boost::function (Content *)> part, + boost::function (Content *)> part, boost::function getter, boost::function setter, boost::function view_to_model, diff --git a/src/wx/controls.cc b/src/wx/controls.cc index 1a03ba568..5364e1614 100644 --- a/src/wx/controls.cc +++ b/src/wx/controls.cc @@ -49,9 +49,9 @@ using std::cout; using std::make_pair; using std::exception; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/controls.h b/src/wx/controls.h index 1d6273af6..a2c80b809 100644 --- a/src/wx/controls.h +++ b/src/wx/controls.h @@ -28,7 +28,6 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include #include class FilmViewer; @@ -49,18 +48,18 @@ class Controls : public wxPanel public: Controls ( wxWindow* parent, - boost::shared_ptr, + std::shared_ptr, bool editor_controls = true ); virtual void log (wxString) {} - virtual void set_film (boost::shared_ptr film); + virtual void set_film (std::shared_ptr film); virtual void play () {}; virtual void stop () {}; void seek (int slider); - boost::shared_ptr film () const; + std::shared_ptr film () const; void back_frame (); void forward_frame (); @@ -72,9 +71,9 @@ protected: wxSizer* _v_sizer; wxBoxSizer* _button_sizer; - boost::shared_ptr _film; + std::shared_ptr _film; wxSlider* _slider; - boost::shared_ptr _viewer; + std::shared_ptr _viewer; boost::optional _active_job; private: @@ -91,13 +90,13 @@ private: void timecode_clicked (); void active_jobs_changed (boost::optional); dcpomatic::DCPTime nudge_amount (wxKeyboardState& ev); - void image_changed (boost::weak_ptr); + void image_changed (std::weak_ptr); void outline_content_changed (); void eye_changed (); void update_position (); void film_change (ChangeType, Film::Property); - typedef std::pair, boost::filesystem::path> CPL; + typedef std::pair, boost::filesystem::path> CPL; bool _slider_being_moved; diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 1687704ec..972b30bac 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -58,8 +58,8 @@ using std::pair; using std::max; using std::make_pair; using boost::lexical_cast; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h index 465104c74..cce97a2dc 100644 --- a/src/wx/dcp_panel.h +++ b/src/wx/dcp_panel.h @@ -19,7 +19,6 @@ */ #include "lib/config.h" -#include #include class wxNotebook; @@ -45,9 +44,9 @@ class Ratio; class DCPPanel : public boost::noncopyable { public: - DCPPanel (wxNotebook *, boost::shared_ptr, boost::weak_ptr viewer); + DCPPanel (wxNotebook *, std::shared_ptr, std::weak_ptr viewer); - void set_film (boost::shared_ptr); + void set_film (std::shared_ptr); void set_general_sensitivity (bool); void film_changed (int); @@ -152,7 +151,7 @@ private: InteropMetadataDialog* _interop_metadata_dialog; SMPTEMetadataDialog* _smpte_metadata_dialog; - boost::shared_ptr _film; - boost::weak_ptr _viewer; + std::shared_ptr _film; + std::weak_ptr _viewer; bool _generally_sensitive; }; diff --git a/src/wx/dkdm_dialog.cc b/src/wx/dkdm_dialog.cc index 5b89d28fa..fe97cf642 100644 --- a/src/wx/dkdm_dialog.cc +++ b/src/wx/dkdm_dialog.cc @@ -46,7 +46,7 @@ using std::cout; using std::vector; using std::make_pair; using std::runtime_error; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; using boost::optional; #if BOOST_VERSION >= 106100 diff --git a/src/wx/dkdm_dialog.h b/src/wx/dkdm_dialog.h index f6f29f852..4235de511 100644 --- a/src/wx/dkdm_dialog.h +++ b/src/wx/dkdm_dialog.h @@ -20,7 +20,6 @@ #include "wx_util.h" #include -#include #include class Film; @@ -34,14 +33,14 @@ struct CPLSummary; class DKDMDialog : public wxDialog { public: - DKDMDialog (wxWindow *, boost::shared_ptr film); + DKDMDialog (wxWindow *, std::shared_ptr film); private: void setup_sensitivity (); void make_clicked (); bool confirm_overwrite (boost::filesystem::path path); - boost::weak_ptr _film; + std::weak_ptr _film; RecipientsPanel* _recipients; KDMTimingPanel* _timing; KDMCPLPanel* _cpl; diff --git a/src/wx/dkdm_output_panel.cc b/src/wx/dkdm_output_panel.cc index d8645ff97..762ed7b7e 100644 --- a/src/wx/dkdm_output_panel.cc +++ b/src/wx/dkdm_output_panel.cc @@ -44,7 +44,7 @@ using std::string; using std::list; using std::exception; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::function; diff --git a/src/wx/dkdm_output_panel.h b/src/wx/dkdm_output_panel.h index 4f0ad12b6..57a941818 100644 --- a/src/wx/dkdm_output_panel.h +++ b/src/wx/dkdm_output_panel.h @@ -41,7 +41,7 @@ public: boost::filesystem::path directory () const; - std::pair, int> make ( + std::pair, int> make ( std::list kdms, std::string name, boost::function confirm_overwrite diff --git a/src/wx/email_dialog.cc b/src/wx/email_dialog.cc index 854a130c6..4d3ae4fe1 100644 --- a/src/wx/email_dialog.cc +++ b/src/wx/email_dialog.cc @@ -22,7 +22,7 @@ #include "wx_util.h" using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; EmailDialog::EmailDialog (wxWindow* parent) diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index c0d383821..ce91c3cc4 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -38,8 +38,8 @@ using std::cout; using std::string; using std::list; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h index 0382ef9d4..a5232d2e5 100644 --- a/src/wx/film_editor.h +++ b/src/wx/film_editor.h @@ -41,9 +41,9 @@ class FilmViewer; class FilmEditor : public wxPanel { public: - FilmEditor (wxWindow *, boost::weak_ptr viewer); + FilmEditor (wxWindow *, std::weak_ptr viewer); - void set_film (boost::shared_ptr); + void set_film (std::shared_ptr); void first_shown (); boost::signals2::signal FileChanged; @@ -55,7 +55,7 @@ public: return _content_panel; } - boost::shared_ptr film () const { + std::shared_ptr film () const { return _film; } @@ -73,5 +73,5 @@ private: DCPPanel* _dcp_panel; /** The film we are editing */ - boost::shared_ptr _film; + std::shared_ptr _film; }; diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 920ca3a10..cc25ccdd5 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -65,9 +65,9 @@ using std::list; using std::bad_alloc; using std::make_pair; using std::exception; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; -using boost::weak_ptr; +using std::shared_ptr; +using std::dynamic_pointer_cast; +using std::weak_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index 15d6bfaf5..909bf0ac7 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -63,13 +63,13 @@ public: void show_closed_captions (); - void set_film (boost::shared_ptr); - boost::shared_ptr film () const { + void set_film (std::shared_ptr); + std::shared_ptr film () const { return _film; } void seek (dcpomatic::DCPTime t, bool accurate); - void seek (boost::shared_ptr content, dcpomatic::ContentTime p, bool accurate); + void seek (std::shared_ptr content, dcpomatic::ContentTime p, bool accurate); void seek_by (dcpomatic::DCPTime by, bool accurate); /** @return our `playhead' position; this may not lie exactly on a frame boundary */ dcpomatic::DCPTime position () const { @@ -122,20 +122,20 @@ public: bool pad_black () const { return _pad_black; } - boost::shared_ptr butler () const { + std::shared_ptr butler () const { return _butler; } ClosedCaptionsDialog* closed_captions_dialog () const { return _closed_captions_dialog; } void finished (); - void image_changed (boost::shared_ptr video); + void image_changed (std::shared_ptr video); bool pending_idle_get () const { return _idle_get; } - boost::signals2::signal)> ImageChanged; + boost::signals2::signal)> ImageChanged; boost::signals2::signal Started; boost::signals2::signal Stopped; /** While playing back we reached the end of the film (emitted from GUI thread) */ @@ -162,8 +162,8 @@ private: bool quick_refresh (); - boost::shared_ptr _film; - boost::shared_ptr _player; + std::shared_ptr _film; + std::shared_ptr _player; VideoView* _video_view; bool _coalesce_player_changes; @@ -177,7 +177,7 @@ private: unsigned int _audio_block_size; bool _playing; int _suspended; - boost::shared_ptr _butler; + std::shared_ptr _butler; std::list _latency_history; /** Mutex to protect _latency_history */ diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc index 66f8ab0e4..8ff6cf13e 100644 --- a/src/wx/fonts_dialog.cc +++ b/src/wx/fonts_dialog.cc @@ -32,7 +32,7 @@ using std::list; using std::string; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; FontsDialog::FontsDialog (wxWindow* parent, shared_ptr content, shared_ptr caption) diff --git a/src/wx/fonts_dialog.h b/src/wx/fonts_dialog.h index 260e74c3d..0ef3658cf 100644 --- a/src/wx/fonts_dialog.h +++ b/src/wx/fonts_dialog.h @@ -23,8 +23,6 @@ DCPOMATIC_DISABLE_WARNINGS #include #include DCPOMATIC_ENABLE_WARNINGS -#include -#include #include class Content; @@ -33,7 +31,7 @@ class TextContent; class FontsDialog : public wxDialog { public: - FontsDialog (wxWindow* parent, boost::shared_ptr, boost::shared_ptr caption); + FontsDialog (wxWindow* parent, std::shared_ptr, std::shared_ptr caption); private: void setup (); @@ -41,8 +39,8 @@ private: void selection_changed (); void edit_clicked (); - boost::weak_ptr _content; - boost::weak_ptr _caption; + std::weak_ptr _content; + std::weak_ptr _caption; wxListCtrl* _fonts; wxButton* _edit; }; diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index c41236096..f376d9682 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -68,7 +68,7 @@ using std::pair; using std::make_pair; using std::map; using boost::bind; -using boost::shared_ptr; +using std::shared_ptr; using boost::function; using boost::optional; #if BOOST_VERSION >= 106100 diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc index 0d79a7562..969264c27 100644 --- a/src/wx/gl_video_view.cc +++ b/src/wx/gl_video_view.cc @@ -49,7 +49,7 @@ #endif using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h index 675b324fc..d8ee65da6 100644 --- a/src/wx/gl_video_view.h +++ b/src/wx/gl_video_view.h @@ -28,7 +28,6 @@ DCPOMATIC_DISABLE_WARNINGS DCPOMATIC_ENABLE_WARNINGS #include #include -#include #include #include #undef None @@ -55,7 +54,7 @@ public: } private: - void set_image (boost::shared_ptr image); + void set_image (std::shared_ptr image); void set_image_and_draw (); void draw (Position inter_position, dcp::Size inter_size); void thread (); @@ -81,5 +80,5 @@ private: boost::atomic _playing; boost::atomic _one_shot; - boost::shared_ptr _timer; + std::shared_ptr _timer; }; diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc index 9ceefda4a..78aa237e1 100644 --- a/src/wx/hints_dialog.cc +++ b/src/wx/hints_dialog.cc @@ -35,15 +35,15 @@ using std::max; using std::vector; using std::string; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using boost::bind; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif -HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr film, bool ok) +HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr film, bool ok) : wxDialog (parent, wxID_ANY, _("Hints")) , _film (film) , _hints (0) @@ -82,7 +82,7 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr film, bool ok) _text->GetCaret()->Hide (); - boost::shared_ptr locked_film = _film.lock (); + std::shared_ptr locked_film = _film.lock (); if (locked_film) { _film_change_connection = locked_film->Change.connect (boost::bind (&HintsDialog::film_change, this, _1)); _film_content_change_connection = locked_film->ContentChange.connect (boost::bind (&HintsDialog::film_content_change, this, _1)); @@ -101,7 +101,7 @@ HintsDialog::film_change (ChangeType type) _text->Clear (); _current.clear (); - boost::shared_ptr film = _film.lock (); + std::shared_ptr film = _film.lock (); if (!film) { return; } diff --git a/src/wx/hints_dialog.h b/src/wx/hints_dialog.h index 87dcf1953..4c4449a26 100644 --- a/src/wx/hints_dialog.h +++ b/src/wx/hints_dialog.h @@ -23,7 +23,6 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include #include class wxRichTextCtrl; @@ -33,7 +32,7 @@ class Hints; class HintsDialog : public wxDialog { public: - HintsDialog (wxWindow* parent, boost::weak_ptr, bool ok); + HintsDialog (wxWindow* parent, std::weak_ptr, bool ok); private: void film_change (ChangeType); @@ -45,7 +44,7 @@ private: void finished (); void progress (std::string m); - boost::weak_ptr _film; + std::weak_ptr _film; wxGauge* _gauge; wxStaticText* _gauge_message; wxRichTextCtrl* _text; diff --git a/src/wx/interop_metadata_dialog.cc b/src/wx/interop_metadata_dialog.cc index bfc177a58..7976e6d44 100644 --- a/src/wx/interop_metadata_dialog.cc +++ b/src/wx/interop_metadata_dialog.cc @@ -28,8 +28,8 @@ using std::string; using std::vector; -using boost::weak_ptr; -using boost::shared_ptr; +using std::weak_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/interop_metadata_dialog.h b/src/wx/interop_metadata_dialog.h index 189e28e2b..6e4eea40e 100644 --- a/src/wx/interop_metadata_dialog.h +++ b/src/wx/interop_metadata_dialog.h @@ -22,8 +22,6 @@ #include #include #include -#include -#include #include class Film; @@ -34,7 +32,7 @@ class RatingDialog; class InteropMetadataDialog : public wxDialog { public: - InteropMetadataDialog (wxWindow* parent, boost::weak_ptr film); + InteropMetadataDialog (wxWindow* parent, std::weak_ptr film); private: std::vector ratings () const; @@ -43,7 +41,7 @@ private: void setup_sensitivity (); void subtitle_language_changed (dcp::LanguageTag tag); - boost::weak_ptr _film; + std::weak_ptr _film; wxCheckBox* _enable_subtitle_language; LanguageTagWidget* _subtitle_language; EditableList* _ratings; diff --git a/src/wx/isdcf_metadata_dialog.cc b/src/wx/isdcf_metadata_dialog.cc index 652b85d47..2dcd85d3a 100644 --- a/src/wx/isdcf_metadata_dialog.cc +++ b/src/wx/isdcf_metadata_dialog.cc @@ -26,7 +26,7 @@ #include #include -using boost::shared_ptr; +using std::shared_ptr; /** @param parent Parent window. * @param dm Initial ISDCF metadata. diff --git a/src/wx/isdcf_metadata_dialog.h b/src/wx/isdcf_metadata_dialog.h index b1ecb5a36..986449247 100644 --- a/src/wx/isdcf_metadata_dialog.h +++ b/src/wx/isdcf_metadata_dialog.h @@ -21,7 +21,6 @@ #include "table_dialog.h" #include "lib/isdcf_metadata.h" #include -#include class wxSpinCtrl; class Film; diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index a0430ca81..3c0f44675 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -39,8 +39,8 @@ using std::list; using std::map; using std::min; using std::cout; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::bind; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h index 2e471532f..392d7504c 100644 --- a/src/wx/job_manager_view.h +++ b/src/wx/job_manager_view.h @@ -22,16 +22,19 @@ * @brief Class which is a wxPanel for showing the progress of jobs. */ + #include "lib/warnings.h" DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include #include +#include + class Job; class JobView; + /** @class JobManagerView * @brief Class which is a wxPanel for showing the progress of jobs. */ @@ -41,15 +44,15 @@ public: JobManagerView (wxWindow *, bool batch); private: - void job_added (boost::weak_ptr); + void job_added (std::weak_ptr); void periodic (); void replace (); void job_list_changed (); wxPanel* _panel; wxFlexGridSizer* _table; - boost::shared_ptr _timer; + std::shared_ptr _timer; bool _batch; - std::list > _job_records; + std::list > _job_records; }; diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc index 4f925873d..52c975bee 100644 --- a/src/wx/job_view.cc +++ b/src/wx/job_view.cc @@ -36,9 +36,9 @@ using std::string; using std::min; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; JobView::JobView (shared_ptr job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table) : _job (job) diff --git a/src/wx/job_view.h b/src/wx/job_view.h index d58a90831..19f746b01 100644 --- a/src/wx/job_view.h +++ b/src/wx/job_view.h @@ -22,7 +22,6 @@ #define DCPOMATIC_JOB_VIEW_H #include -#include #include class Job; @@ -40,7 +39,7 @@ class wxCheckBox; class JobView : public boost::noncopyable { public: - JobView (boost::shared_ptr job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table); + JobView (std::shared_ptr job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table); virtual ~JobView () {} virtual int insert_position () const = 0; @@ -51,14 +50,14 @@ public: void insert (int pos); void detach (); - boost::shared_ptr job () const { + std::shared_ptr job () const { return _job; } protected: virtual void finished (); - boost::shared_ptr _job; + std::shared_ptr _job; wxFlexGridSizer* _table; /** sizer for buttons (cancel, details, pause etc.) */ wxBoxSizer* _buttons; diff --git a/src/wx/job_view_dialog.cc b/src/wx/job_view_dialog.cc index a49818cc8..455998c5c 100644 --- a/src/wx/job_view_dialog.cc +++ b/src/wx/job_view_dialog.cc @@ -22,7 +22,7 @@ #include "normal_job_view.h" #include "lib/job.h" -using boost::shared_ptr; +using std::shared_ptr; JobViewDialog::JobViewDialog (wxWindow* parent, wxString title, shared_ptr job) : TableDialog (parent, title, 4, 0, false) diff --git a/src/wx/job_view_dialog.h b/src/wx/job_view_dialog.h index 54a6c1636..b72ad298d 100644 --- a/src/wx/job_view_dialog.h +++ b/src/wx/job_view_dialog.h @@ -18,9 +18,10 @@ */ + #include "table_dialog.h" -#include -#include +#include + class JobView; class Job; @@ -28,13 +29,13 @@ class Job; class JobViewDialog : public TableDialog { public: - JobViewDialog (wxWindow* parent, wxString title, boost::shared_ptr job); + JobViewDialog (wxWindow* parent, wxString title, std::shared_ptr job); ~JobViewDialog (); private: void periodic (); JobView* _view; - boost::weak_ptr _job; - boost::shared_ptr _timer; + std::weak_ptr _job; + std::shared_ptr _timer; }; diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 9ff290822..666701168 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -48,7 +48,7 @@ using std::cout; using std::vector; using std::make_pair; using std::runtime_error; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; using boost::optional; #if BOOST_VERSION >= 106100 diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h index a240ec1b6..ea504f842 100644 --- a/src/wx/kdm_dialog.h +++ b/src/wx/kdm_dialog.h @@ -21,7 +21,6 @@ #include "wx_util.h" #include #include -#include #include #include @@ -40,14 +39,14 @@ struct CPLSummary; class KDMDialog : public wxDialog { public: - KDMDialog (wxWindow *, boost::shared_ptr film); + KDMDialog (wxWindow *, std::shared_ptr film); private: void setup_sensitivity (); void make_clicked (); bool confirm_overwrite (boost::filesystem::path path); - boost::weak_ptr _film; + std::weak_ptr _film; ScreensPanel* _screens; KDMTimingPanel* _timing; KDMCPLPanel* _cpl; diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 961a27fc2..c08a76732 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -48,7 +48,7 @@ using std::string; using std::list; using std::exception; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::function; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h index 0281b26d0..cc4453d02 100644 --- a/src/wx/kdm_output_panel.h +++ b/src/wx/kdm_output_panel.h @@ -51,7 +51,7 @@ public: return _forensic_mark_audio_up_to; } - std::pair, int> make ( + std::pair, int> make ( std::list screen_kdms, std::string name, boost::function confirm_overwrite diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc index 245dee2db..2d2fc81f6 100644 --- a/src/wx/language_tag_dialog.cc +++ b/src/wx/language_tag_dialog.cc @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -42,8 +41,8 @@ using std::pair; using std::string; using std::vector; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc index c8529f108..31789af2c 100644 --- a/src/wx/markers_dialog.cc +++ b/src/wx/markers_dialog.cc @@ -33,8 +33,8 @@ using std::cout; using boost::bind; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::optional; using dcpomatic::DCPTime; diff --git a/src/wx/markers_dialog.h b/src/wx/markers_dialog.h index e2c261873..a3f3532e5 100644 --- a/src/wx/markers_dialog.h +++ b/src/wx/markers_dialog.h @@ -18,13 +18,14 @@ */ + #include "lib/warnings.h" DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include -#include #include +#include + class Marker; class Film; @@ -33,9 +34,9 @@ class FilmViewer; class MarkersDialog : public wxDialog { public: - MarkersDialog (wxWindow* parent, boost::weak_ptr film, boost::weak_ptr viewer); + MarkersDialog (wxWindow* parent, std::weak_ptr film, std::weak_ptr viewer); private: - std::list > _markers; - boost::weak_ptr _film; + std::list > _markers; + std::weak_ptr _film; }; diff --git a/src/wx/monitor_dialog.cc b/src/wx/monitor_dialog.cc index db6b71b48..933f2f42a 100644 --- a/src/wx/monitor_dialog.cc +++ b/src/wx/monitor_dialog.cc @@ -25,7 +25,7 @@ using std::string; using dcp::locale_convert; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; MonitorDialog::MonitorDialog (wxWindow* parent) diff --git a/src/wx/move_to_dialog.cc b/src/wx/move_to_dialog.cc index 266f44264..b4b6e3ae3 100644 --- a/src/wx/move_to_dialog.cc +++ b/src/wx/move_to_dialog.cc @@ -24,7 +24,7 @@ #include using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; diff --git a/src/wx/move_to_dialog.h b/src/wx/move_to_dialog.h index 3c6f3d064..61520a71f 100644 --- a/src/wx/move_to_dialog.h +++ b/src/wx/move_to_dialog.h @@ -20,7 +20,6 @@ #include "table_dialog.h" #include "lib/dcpomatic_time.h" -#include #include class Film; @@ -29,11 +28,11 @@ class wxSpinCtrl; class MoveToDialog : public TableDialog { public: - MoveToDialog (wxWindow* parent, boost::optional position, boost::shared_ptr film); + MoveToDialog (wxWindow* parent, boost::optional position, std::shared_ptr film); dcpomatic::DCPTime position () const; private: - boost::weak_ptr _film; + std::weak_ptr _film; wxSpinCtrl* _reel; }; diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc index a4c881039..5b989bdb5 100644 --- a/src/wx/nag_dialog.cc +++ b/src/wx/nag_dialog.cc @@ -24,7 +24,7 @@ #include "check_box.h" #include -using boost::shared_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/normal_job_view.cc b/src/wx/normal_job_view.cc index ada0596c8..6c9c08fa7 100644 --- a/src/wx/normal_job_view.cc +++ b/src/wx/normal_job_view.cc @@ -23,7 +23,7 @@ #include "lib/job.h" #include -using boost::shared_ptr; +using std::shared_ptr; NormalJobView::NormalJobView (shared_ptr job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table) : JobView (job, parent, container, table) diff --git a/src/wx/normal_job_view.h b/src/wx/normal_job_view.h index b9d6327a0..ea1a014f4 100644 --- a/src/wx/normal_job_view.h +++ b/src/wx/normal_job_view.h @@ -25,7 +25,7 @@ class wxSizer; class NormalJobView : public JobView { public: - NormalJobView (boost::shared_ptr job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table); + NormalJobView (std::shared_ptr job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table); void setup (); diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc index 7af429326..3158b279c 100644 --- a/src/wx/player_config_dialog.cc +++ b/src/wx/player_config_dialog.cc @@ -65,7 +65,7 @@ using std::pair; using std::make_pair; using std::map; using boost::bind; -using boost::shared_ptr; +using std::shared_ptr; using boost::function; using boost::optional; #if BOOST_VERSION >= 106100 diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc index 9a569c00c..f0eaa59bb 100644 --- a/src/wx/player_information.cc +++ b/src/wx/player_information.cc @@ -30,9 +30,9 @@ using std::cout; using std::string; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::optional; /* This should be even */ diff --git a/src/wx/player_information.h b/src/wx/player_information.h index ae3e13429..0dd6c4ad0 100644 --- a/src/wx/player_information.h +++ b/src/wx/player_information.h @@ -23,14 +23,13 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS #include -#include class FilmViewer; class PlayerInformation : public wxPanel { public: - PlayerInformation (wxWindow* parent, boost::weak_ptr viewer); + PlayerInformation (wxWindow* parent, std::weak_ptr viewer); void triggered_update (); @@ -38,7 +37,7 @@ private: void periodic_update (); - boost::weak_ptr _viewer; + std::weak_ptr _viewer; wxSizer* _sizer; wxStaticText** _dcp; wxStaticText* _dropped; diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc index 72ec7ad1f..56ff5f40d 100644 --- a/src/wx/playlist_controls.cc +++ b/src/wx/playlist_controls.cc @@ -40,8 +40,8 @@ using std::string; using std::cout; using std::exception; using std::sort; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::optional; using namespace dcpomatic; diff --git a/src/wx/playlist_controls.h b/src/wx/playlist_controls.h index 4f144834a..b0d04f4cb 100644 --- a/src/wx/playlist_controls.h +++ b/src/wx/playlist_controls.h @@ -26,16 +26,16 @@ class DCPContent; class PlaylistControls : public Controls { public: - PlaylistControls (wxWindow* parent, boost::shared_ptr viewer); + PlaylistControls (wxWindow* parent, std::shared_ptr viewer); void log (wxString s); - void set_film (boost::shared_ptr film); + void set_film (std::shared_ptr film); /** This is so that we can tell our parent player to reset the film when we have created one from a SPL. We could call a method in the player's DOMFrame but we don't have that in a header. */ - boost::signals2::signal)> ResetFilm; + boost::signals2::signal)> ResetFilm; void play (); void stop (); @@ -62,7 +62,7 @@ private: bool can_do_next (); void deselect_playlist (); - boost::optional get_kdm_from_directory (boost::shared_ptr dcp); + boost::optional get_kdm_from_directory (std::shared_ptr dcp); wxButton* _play_button; wxButton* _pause_button; diff --git a/src/wx/recipient_dialog.h b/src/wx/recipient_dialog.h index 3f0946b22..39ba5915e 100644 --- a/src/wx/recipient_dialog.h +++ b/src/wx/recipient_dialog.h @@ -24,7 +24,6 @@ #include "lib/screen.h" #include #include -#include #include class Progress; diff --git a/src/wx/recipients_panel.cc b/src/wx/recipients_panel.cc index 8bb78750e..086eac3e4 100644 --- a/src/wx/recipients_panel.cc +++ b/src/wx/recipients_panel.cc @@ -33,7 +33,7 @@ using std::cout; using std::map; using std::string; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; diff --git a/src/wx/recipients_panel.h b/src/wx/recipients_panel.h index b33b7ebc8..d224eed1b 100644 --- a/src/wx/recipients_panel.h +++ b/src/wx/recipients_panel.h @@ -25,7 +25,6 @@ DCPOMATIC_DISABLE_WARNINGS #include #include DCPOMATIC_ENABLE_WARNINGS -#include #include #include #include @@ -40,12 +39,12 @@ public: void setup_sensitivity (); - std::list > recipients () const; + std::list > recipients () const; boost::signals2::signal RecipientsChanged; private: void add_recipients (); - void add_recipient (boost::shared_ptr); + void add_recipient (std::shared_ptr); void add_recipient_clicked (); void edit_recipient_clicked (); void remove_recipient_clicked (); @@ -60,7 +59,7 @@ private: wxButton* _remove_recipient; wxTreeItemId _root; - typedef std::map > RecipientMap; + typedef std::map > RecipientMap; RecipientMap _recipients; RecipientMap _selected; diff --git a/src/wx/report_problem_dialog.cc b/src/wx/report_problem_dialog.cc index 981d13f31..8ec275b4e 100644 --- a/src/wx/report_problem_dialog.cc +++ b/src/wx/report_problem_dialog.cc @@ -28,7 +28,7 @@ #include using std::string; -using boost::shared_ptr; +using std::shared_ptr; /** @param parent Parent window. * @param film Film that we are working on, or 0. diff --git a/src/wx/report_problem_dialog.h b/src/wx/report_problem_dialog.h index 651087907..b12bece61 100644 --- a/src/wx/report_problem_dialog.h +++ b/src/wx/report_problem_dialog.h @@ -18,11 +18,13 @@ */ + #include "lib/warnings.h" DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include +#include + class wxTextCtrl; class wxFlexGridSizer; @@ -32,12 +34,12 @@ class Film; class ReportProblemDialog : public wxDialog { public: - ReportProblemDialog (wxWindow* parent, boost::shared_ptr film = boost::shared_ptr()); + ReportProblemDialog (wxWindow* parent, std::shared_ptr film = std::shared_ptr()); void report (); private: - boost::shared_ptr _film; + std::shared_ptr _film; wxSizer* _overall_sizer; wxFlexGridSizer* _table; diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h index 913480d76..6665ef398 100644 --- a/src/wx/screen_dialog.h +++ b/src/wx/screen_dialog.h @@ -22,7 +22,6 @@ #include "lib/screen.h" #include #include -#include #include class Progress; diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index d39b6688d..ee88d0178 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -34,7 +34,7 @@ using std::cout; using std::map; using std::string; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h index 69d74b13b..35d935bea 100644 --- a/src/wx/screens_panel.h +++ b/src/wx/screens_panel.h @@ -24,7 +24,6 @@ DCPOMATIC_DISABLE_WARNINGS DCPOMATIC_ENABLE_WARNINGS #include #include -#include #include #include #include @@ -41,15 +40,15 @@ public: explicit ScreensPanel (wxWindow* parent); ~ScreensPanel (); - std::list > screens () const; + std::list > screens () const; void setup_sensitivity (); boost::signals2::signal ScreensChanged; private: void add_cinemas (); - boost::optional add_cinema (boost::shared_ptr); - boost::optional add_screen (boost::shared_ptr, boost::shared_ptr); + boost::optional add_cinema (std::shared_ptr); + boost::optional add_screen (std::shared_ptr, std::shared_ptr); void add_cinema_clicked (); void edit_cinema_clicked (); void remove_cinema_clicked (); @@ -70,8 +69,8 @@ private: wxButton* _remove_screen; wxTreeItemId _root; - typedef std::map > CinemaMap; - typedef std::map > ScreenMap; + typedef std::map > CinemaMap; + typedef std::map > ScreenMap; CinemaMap _cinemas; ScreenMap _screens; diff --git a/src/wx/self_dkdm_dialog.cc b/src/wx/self_dkdm_dialog.cc index 4c10c8f6b..ceaeff289 100644 --- a/src/wx/self_dkdm_dialog.cc +++ b/src/wx/self_dkdm_dialog.cc @@ -49,10 +49,10 @@ using std::pair; using std::cout; using std::vector; using std::make_pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; -SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, boost::shared_ptr film) +SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, std::shared_ptr film) : wxDialog (parent, wxID_ANY, _("Make DKDM for DCP-o-matic")) { /* Main sizer */ diff --git a/src/wx/self_dkdm_dialog.h b/src/wx/self_dkdm_dialog.h index f49749a69..20c138c41 100644 --- a/src/wx/self_dkdm_dialog.h +++ b/src/wx/self_dkdm_dialog.h @@ -24,7 +24,6 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include #include #include @@ -36,7 +35,7 @@ class DirPickerCtrl; class SelfDKDMDialog : public wxDialog { public: - SelfDKDMDialog (wxWindow *, boost::shared_ptr); + SelfDKDMDialog (wxWindow *, std::shared_ptr); boost::filesystem::path cpl () const; diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc index 51fe4302c..5761222c6 100644 --- a/src/wx/server_dialog.cc +++ b/src/wx/server_dialog.cc @@ -23,7 +23,7 @@ #include "wx_util.h" using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; ServerDialog::ServerDialog (wxWindow* parent) diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index 2b86ea688..342829471 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -32,7 +32,7 @@ using std::max; using std::string; using boost::optional; -using boost::shared_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h index 93b9c6e3d..31756b5d8 100644 --- a/src/wx/simple_video_view.h +++ b/src/wx/simple_video_view.h @@ -42,7 +42,7 @@ public: NextFrameResult display_next_frame (bool non_blocking); private: - void set_image (boost::shared_ptr image) { + void set_image (std::shared_ptr image) { _image = image; } @@ -51,7 +51,7 @@ private: void timer (); wxPanel* _panel; - boost::shared_ptr _image; + std::shared_ptr _image; wxTimer _timer; Position _inter_position; dcp::Size _inter_size; diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc index 87be156f5..c44e38146 100644 --- a/src/wx/smpte_metadata_dialog.cc +++ b/src/wx/smpte_metadata_dialog.cc @@ -32,8 +32,8 @@ using std::string; using std::vector; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h index 0f9c436b9..171507acf 100644 --- a/src/wx/smpte_metadata_dialog.h +++ b/src/wx/smpte_metadata_dialog.h @@ -25,8 +25,6 @@ #include #include #include -#include -#include #include @@ -39,7 +37,7 @@ class LanguageTagWidget; class SMPTEMetadataDialog : public wxDialog, public WeakFilm { public: - SMPTEMetadataDialog (wxWindow* parent, boost::weak_ptr film); + SMPTEMetadataDialog (wxWindow* parent, std::weak_ptr film); private: std::vector ratings () const; diff --git a/src/wx/standard_controls.cc b/src/wx/standard_controls.cc index e73e2f6f6..c78844ca1 100644 --- a/src/wx/standard_controls.cc +++ b/src/wx/standard_controls.cc @@ -23,7 +23,7 @@ #include #include -using boost::shared_ptr; +using std::shared_ptr; StandardControls::StandardControls (wxWindow* parent, shared_ptr viewer, bool editor_controls) : Controls (parent, viewer, editor_controls) diff --git a/src/wx/standard_controls.h b/src/wx/standard_controls.h index 143624126..eac47726b 100644 --- a/src/wx/standard_controls.h +++ b/src/wx/standard_controls.h @@ -23,7 +23,7 @@ class StandardControls : public Controls { public: - StandardControls (wxWindow* parent, boost::shared_ptr viewer, bool editor_controls); + StandardControls (wxWindow* parent, std::shared_ptr viewer, bool editor_controls); void play (); void stop (); diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc index 46edacd97..69ee61966 100644 --- a/src/wx/subtitle_appearance_dialog.cc +++ b/src/wx/subtitle_appearance_dialog.cc @@ -39,9 +39,9 @@ DCPOMATIC_ENABLE_WARNINGS using std::map; using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using boost::optional; using namespace dcpomatic; #if BOOST_VERSION >= 106100 diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h index b0dd8d307..299b3c70a 100644 --- a/src/wx/subtitle_appearance_dialog.h +++ b/src/wx/subtitle_appearance_dialog.h @@ -24,7 +24,6 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include #include class wxRadioButton; @@ -41,7 +40,7 @@ class Job; class SubtitleAppearanceDialog : public wxDialog { public: - SubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr film, boost::shared_ptr content, boost::shared_ptr caption); + SubtitleAppearanceDialog (wxWindow* parent, std::shared_ptr film, std::shared_ptr content, std::shared_ptr caption); void apply (); @@ -53,7 +52,7 @@ private: void active_jobs_changed (boost::optional last); void add_colours (); - boost::weak_ptr _film; + std::weak_ptr _film; wxCheckBox* _force_colour; wxColourPickerCtrl* _colour; wxCheckBox* _force_effect; @@ -73,14 +72,14 @@ private: wxStaticText* _finding; wxFlexGridSizer* _colour_table; - boost::shared_ptr _content; - boost::shared_ptr _caption; - boost::shared_ptr _stream; + std::shared_ptr _content; + std::shared_ptr _caption; + std::shared_ptr _stream; boost::signals2::scoped_connection _content_connection; boost::signals2::scoped_connection _job_manager_connection; - boost::weak_ptr _job; + std::weak_ptr _job; static int const NONE; static int const OUTLINE; diff --git a/src/wx/system_information_dialog.cc b/src/wx/system_information_dialog.cc index 2d9044f6b..968cd5740 100644 --- a/src/wx/system_information_dialog.cc +++ b/src/wx/system_information_dialog.cc @@ -32,8 +32,8 @@ #endif using std::string; -using boost::weak_ptr; -using boost::shared_ptr; +using std::weak_ptr; +using std::shared_ptr; SystemInformationDialog::SystemInformationDialog (wxWindow* parent, weak_ptr weak_viewer) : TableDialog (parent, _("System information"), 2, 1, false) diff --git a/src/wx/system_information_dialog.h b/src/wx/system_information_dialog.h index 63c70fba5..5b9efa234 100644 --- a/src/wx/system_information_dialog.h +++ b/src/wx/system_information_dialog.h @@ -18,14 +18,16 @@ */ + #include "table_dialog.h" -#include +#include + class FilmViewer; class SystemInformationDialog : public TableDialog { public: - SystemInformationDialog (wxWindow* parent, boost::weak_ptr viewer); + SystemInformationDialog (wxWindow* parent, std::weak_ptr viewer); }; diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc index b21d33ce5..5b54fa35b 100644 --- a/src/wx/text_panel.cc +++ b/src/wx/text_panel.cc @@ -49,9 +49,9 @@ using std::vector; using std::string; using std::list; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using boost::bind; /** @param t Original text type of the content, if known */ @@ -512,10 +512,10 @@ TextPanel::setup_sensitivity () ContentList sel = _parent->selected_text (); BOOST_FOREACH (shared_ptr i, sel) { /* These are the content types that could include subtitles */ - shared_ptr fc = boost::dynamic_pointer_cast (i); - shared_ptr sc = boost::dynamic_pointer_cast (i); - shared_ptr dc = boost::dynamic_pointer_cast (i); - shared_ptr dsc = boost::dynamic_pointer_cast (i); + shared_ptr fc = std::dynamic_pointer_cast (i); + shared_ptr sc = std::dynamic_pointer_cast (i); + shared_ptr dc = std::dynamic_pointer_cast (i); + shared_ptr dsc = std::dynamic_pointer_cast (i); if (fc) { if (!fc->text.empty()) { ++ffmpeg_subs; diff --git a/src/wx/text_panel.h b/src/wx/text_panel.h index cd0890e3d..f35f39cbe 100644 --- a/src/wx/text_panel.h +++ b/src/wx/text_panel.h @@ -101,8 +101,8 @@ private: int _outline_subtitles_row; int _ccap_track_row; - boost::weak_ptr _analysis_content; + std::weak_ptr _analysis_content; boost::signals2::scoped_connection _analysis_finished_connection; - boost::shared_ptr _analysis; + std::shared_ptr _analysis; bool _loading_analysis; }; diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc index 491df7b3b..b4b2baae2 100644 --- a/src/wx/text_view.cc +++ b/src/wx/text_view.cc @@ -31,10 +31,10 @@ #include "lib/text_decoder.h" using std::list; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::bind; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using namespace dcpomatic; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/text_view.h b/src/wx/text_view.h index d360838a8..b44742b63 100644 --- a/src/wx/text_view.h +++ b/src/wx/text_view.h @@ -24,8 +24,6 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS #include -#include -#include class Decoder; class FilmViewer; @@ -36,11 +34,11 @@ class TextView : public wxDialog public: TextView ( wxWindow *, - boost::shared_ptr, - boost::shared_ptr content, - boost::shared_ptr caption, - boost::shared_ptr, - boost::weak_ptr viewer + std::shared_ptr, + std::shared_ptr content, + std::shared_ptr caption, + std::shared_ptr, + std::weak_ptr viewer ); private: @@ -53,6 +51,6 @@ private: boost::optional _frc; boost::optional _last_count; std::vector _start_times; - boost::weak_ptr _content; - boost::weak_ptr _film_viewer; + std::weak_ptr _content; + std::weak_ptr _film_viewer; }; diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 7b9758feb..054eac734 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -39,7 +39,6 @@ #include "lib/video_content.h" #include "lib/atmos_mxf_content.h" #include -#include #include #include #include @@ -50,9 +49,9 @@ using std::cout; using std::min; using std::max; using std::abs; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::bind; using boost::optional; using namespace dcpomatic; diff --git a/src/wx/timeline.h b/src/wx/timeline.h index 44a897371..b532e74e3 100644 --- a/src/wx/timeline.h +++ b/src/wx/timeline.h @@ -24,8 +24,6 @@ #include "lib/rect.h" #include "lib/film.h" #include -#include -#include #include class Film; @@ -39,9 +37,9 @@ class FilmViewer; class Timeline : public wxPanel { public: - Timeline (wxWindow *, ContentPanel *, boost::shared_ptr, boost::weak_ptr viewer); + Timeline (wxWindow *, ContentPanel *, std::shared_ptr, std::weak_ptr viewer); - boost::shared_ptr film () const; + std::shared_ptr film () const; void force_redraw (dcpomatic::Rect const &); @@ -106,7 +104,7 @@ private: void zoom_all (); void update_playhead (); - boost::shared_ptr event_to_view (wxMouseEvent &); + std::shared_ptr event_to_view (wxMouseEvent &); TimelineContentViewList selected_views () const; ContentList selected_content () const; void maybe_snap (dcpomatic::DCPTime a, dcpomatic::DCPTime b, boost::optional& nearest_distance) const; @@ -114,18 +112,18 @@ private: wxScrolledCanvas* _labels_canvas; wxScrolledCanvas* _main_canvas; ContentPanel* _content_panel; - boost::weak_ptr _film; - boost::weak_ptr _viewer; + std::weak_ptr _film; + std::weak_ptr _viewer; TimelineViewList _views; - boost::shared_ptr _time_axis_view; - boost::shared_ptr _reels_view; - boost::shared_ptr _labels_view; + std::shared_ptr _time_axis_view; + std::shared_ptr _reels_view; + std::shared_ptr _labels_view; int _tracks; boost::optional _pixels_per_second; bool _left_down; wxPoint _down_point; boost::optional _zoom_point; - boost::shared_ptr _down_view; + std::shared_ptr _down_view; dcpomatic::DCPTime _down_view_position; bool _first_move; ContentMenu _menu; diff --git a/src/wx/timeline_atmos_content_view.cc b/src/wx/timeline_atmos_content_view.cc index 45a8fccd0..f982921ed 100644 --- a/src/wx/timeline_atmos_content_view.cc +++ b/src/wx/timeline_atmos_content_view.cc @@ -20,7 +20,7 @@ #include "timeline_atmos_content_view.h" -using boost::shared_ptr; +using std::shared_ptr; /** @class TimelineAtmosContentView * @brief Timeline view for AtmosContent. diff --git a/src/wx/timeline_atmos_content_view.h b/src/wx/timeline_atmos_content_view.h index 1e33c5fb2..05f4352eb 100644 --- a/src/wx/timeline_atmos_content_view.h +++ b/src/wx/timeline_atmos_content_view.h @@ -26,7 +26,7 @@ class TimelineAtmosContentView : public TimelineContentView { public: - TimelineAtmosContentView (Timeline& tl, boost::shared_ptr c); + TimelineAtmosContentView (Timeline& tl, std::shared_ptr c); private: bool active () const { diff --git a/src/wx/timeline_audio_content_view.cc b/src/wx/timeline_audio_content_view.cc index 3ae0fdb45..d26c40252 100644 --- a/src/wx/timeline_audio_content_view.cc +++ b/src/wx/timeline_audio_content_view.cc @@ -24,8 +24,8 @@ #include "lib/util.h" using std::list; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; /** @class TimelineAudioContentView * @brief Timeline view for AudioContent. diff --git a/src/wx/timeline_audio_content_view.h b/src/wx/timeline_audio_content_view.h index bede1dcda..d5a966ad5 100644 --- a/src/wx/timeline_audio_content_view.h +++ b/src/wx/timeline_audio_content_view.h @@ -26,7 +26,7 @@ class TimelineAudioContentView : public TimelineContentView { public: - TimelineAudioContentView (Timeline& tl, boost::shared_ptr c); + TimelineAudioContentView (Timeline& tl, std::shared_ptr c); private: bool active () const { diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc index 2af1c28ac..2f2b7e3ed 100644 --- a/src/wx/timeline_content_view.cc +++ b/src/wx/timeline_content_view.cc @@ -26,7 +26,7 @@ #include using std::list; -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h index 2573e3cb3..fcc068064 100644 --- a/src/wx/timeline_content_view.h +++ b/src/wx/timeline_content_view.h @@ -37,13 +37,13 @@ class Content; class TimelineContentView : public TimelineView { public: - TimelineContentView (Timeline& tl, boost::shared_ptr c); + TimelineContentView (Timeline& tl, std::shared_ptr c); dcpomatic::Rect bbox () const; void set_selected (bool s); bool selected () const; - boost::shared_ptr content () const; + std::shared_ptr content () const; void set_track (int t); void unset_track (); boost::optional track () const; @@ -55,7 +55,7 @@ public: protected: - boost::weak_ptr _content; + std::weak_ptr _content; private: @@ -69,6 +69,6 @@ private: boost::signals2::scoped_connection _content_connection; }; -typedef std::vector > TimelineContentViewList; +typedef std::vector > TimelineContentViewList; #endif diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index 261177e36..563c31f70 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -32,8 +32,8 @@ using std::list; using std::cout; using std::string; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h index 77dfede50..97ddca964 100644 --- a/src/wx/timeline_dialog.h +++ b/src/wx/timeline_dialog.h @@ -18,8 +18,6 @@ */ -#include -#include #include #include "timeline.h" @@ -28,7 +26,7 @@ class Playlist; class TimelineDialog : public wxDialog { public: - TimelineDialog (ContentPanel *, boost::shared_ptr, boost::weak_ptr viewer); + TimelineDialog (ContentPanel *, std::shared_ptr, std::weak_ptr viewer); void set_selection (ContentList selection); @@ -36,7 +34,7 @@ private: void film_change (ChangeType type, Film::Property); void tool_clicked (wxCommandEvent& id); - boost::weak_ptr _film; + std::weak_ptr _film; Timeline _timeline; wxToolBar* _toolbar; boost::signals2::scoped_connection _film_changed_connection; diff --git a/src/wx/timeline_text_content_view.cc b/src/wx/timeline_text_content_view.cc index 1345ea5e4..722a9f30a 100644 --- a/src/wx/timeline_text_content_view.cc +++ b/src/wx/timeline_text_content_view.cc @@ -22,7 +22,7 @@ #include "lib/text_content.h" #include "lib/content.h" -using boost::shared_ptr; +using std::shared_ptr; TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr c, shared_ptr caption) : TimelineContentView (tl, c) diff --git a/src/wx/timeline_text_content_view.h b/src/wx/timeline_text_content_view.h index 055c84143..98aea6316 100644 --- a/src/wx/timeline_text_content_view.h +++ b/src/wx/timeline_text_content_view.h @@ -29,12 +29,12 @@ class TextContent; class TimelineTextContentView : public TimelineContentView { public: - TimelineTextContentView (Timeline& tl, boost::shared_ptr, boost::shared_ptr); + TimelineTextContentView (Timeline& tl, std::shared_ptr, std::shared_ptr); private: bool active () const; wxColour background_colour () const; wxColour foreground_colour () const; - boost::shared_ptr _caption; + std::shared_ptr _caption; }; diff --git a/src/wx/timeline_video_content_view.cc b/src/wx/timeline_video_content_view.cc index db1520190..b0f4b4f5d 100644 --- a/src/wx/timeline_video_content_view.cc +++ b/src/wx/timeline_video_content_view.cc @@ -22,8 +22,8 @@ #include "lib/video_content.h" #include "timeline_video_content_view.h" -using boost::dynamic_pointer_cast; -using boost::shared_ptr; +using std::dynamic_pointer_cast; +using std::shared_ptr; TimelineVideoContentView::TimelineVideoContentView (Timeline& tl, shared_ptr c) : TimelineContentView (tl, c) diff --git a/src/wx/timeline_video_content_view.h b/src/wx/timeline_video_content_view.h index c32424d59..2269a2930 100644 --- a/src/wx/timeline_video_content_view.h +++ b/src/wx/timeline_video_content_view.h @@ -26,7 +26,7 @@ class TimelineVideoContentView : public TimelineContentView { public: - TimelineVideoContentView (Timeline& tl, boost::shared_ptr c); + TimelineVideoContentView (Timeline& tl, std::shared_ptr c); private: bool active () const; diff --git a/src/wx/timeline_view.h b/src/wx/timeline_view.h index d94e10124..bfd1de8b7 100644 --- a/src/wx/timeline_view.h +++ b/src/wx/timeline_view.h @@ -53,6 +53,6 @@ private: dcpomatic::Rect _last_paint_bbox; }; -typedef std::vector > TimelineViewList; +typedef std::vector > TimelineViewList; #endif diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 195887a29..82aaadedd 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -50,9 +50,9 @@ DCPOMATIC_ENABLE_WARNINGS using std::cout; using std::string; using std::set; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::weak_ptr; +using std::dynamic_pointer_cast; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/src/wx/timing_panel.h b/src/wx/timing_panel.h index d413361d4..251acc9b5 100644 --- a/src/wx/timing_panel.h +++ b/src/wx/timing_panel.h @@ -27,7 +27,7 @@ class FilmViewer; class TimingPanel : public ContentSubPanel { public: - TimingPanel (ContentPanel *, boost::weak_ptr viewer); + TimingPanel (ContentPanel *, std::weak_ptr viewer); void film_changed (Film::Property); void film_content_changed (int); @@ -47,7 +47,7 @@ private: void setup_sensitivity (); void add_to_grid (); - boost::weak_ptr _viewer; + std::weak_ptr _viewer; wxStaticText* _h_label; wxStaticText* _m_label; diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc index 6432d21c7..bf78113d9 100644 --- a/src/wx/verify_dcp_dialog.cc +++ b/src/wx/verify_dcp_dialog.cc @@ -29,7 +29,7 @@ DCPOMATIC_ENABLE_WARNINGS #include using std::list; -using boost::shared_ptr; +using std::shared_ptr; VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr job) : wxDialog (parent, wxID_ANY, _("DCP verification")) diff --git a/src/wx/verify_dcp_dialog.h b/src/wx/verify_dcp_dialog.h index b67c1dfc7..2d3bac24f 100644 --- a/src/wx/verify_dcp_dialog.h +++ b/src/wx/verify_dcp_dialog.h @@ -31,7 +31,7 @@ class VerifyDCPJob; class VerifyDCPDialog : public wxDialog { public: - VerifyDCPDialog (wxWindow* parent, boost::shared_ptr job); + VerifyDCPDialog (wxWindow* parent, std::shared_ptr job); private: wxRichTextCtrl* _text; diff --git a/src/wx/verify_dcp_progress_dialog.cc b/src/wx/verify_dcp_progress_dialog.cc index dfe496e58..030a9810d 100644 --- a/src/wx/verify_dcp_progress_dialog.cc +++ b/src/wx/verify_dcp_progress_dialog.cc @@ -25,13 +25,12 @@ #include "lib/job.h" #include "lib/job_manager.h" #include -#include #include using std::string; using boost::optional; -using boost::shared_ptr; +using std::shared_ptr; static int const max_file_name_length = 80; diff --git a/src/wx/verify_dcp_progress_dialog.h b/src/wx/verify_dcp_progress_dialog.h index 7dd0c7495..0f1526afe 100644 --- a/src/wx/verify_dcp_progress_dialog.h +++ b/src/wx/verify_dcp_progress_dialog.h @@ -18,11 +18,12 @@ */ + #include "lib/warnings.h" DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include +#include class Job; @@ -37,7 +38,7 @@ class VerifyDCPProgressDialog : public wxDialog public: VerifyDCPProgressDialog (wxWindow* parent, wxString title); - bool run (boost::shared_ptr job); + bool run (std::shared_ptr job); private: void cancel (); diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 8841005fa..5fcd527b8 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -51,8 +51,8 @@ using std::pair; using std::cout; using std::list; using std::set; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::bind; using boost::optional; using namespace dcpomatic; diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc index 7805a1fb3..42a7fe58b 100644 --- a/src/wx/video_view.cc +++ b/src/wx/video_view.cc @@ -26,7 +26,7 @@ #include using std::pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; VideoView::VideoView (FilmViewer* viewer) diff --git a/src/wx/video_view.h b/src/wx/video_view.h index e5fbb671d..3b596197e 100644 --- a/src/wx/video_view.h +++ b/src/wx/video_view.h @@ -25,7 +25,6 @@ #include "lib/timer.h" #include "lib/types.h" #include "lib/exception_store.h" -#include #include #include #include @@ -61,7 +60,7 @@ public: virtual NextFrameResult display_next_frame (bool) = 0; void clear (); - bool reset_metadata (boost::shared_ptr film, dcp::Size player_video_container_size); + bool reset_metadata (std::shared_ptr film, dcp::Size player_video_container_size); /** Emitted from the GUI thread when our display changes in size */ boost::signals2::signal Sized; @@ -133,7 +132,7 @@ protected: return _length; } - std::pair, dcpomatic::DCPTime> player_video () const { + std::pair, dcpomatic::DCPTime> player_video () const { boost::mutex::scoped_lock lm (_mutex); return _player_video; } @@ -156,7 +155,7 @@ private: /** Mutex protecting all the state in this class */ mutable boost::mutex _mutex; - std::pair, dcpomatic::DCPTime> _player_video; + std::pair, dcpomatic::DCPTime> _player_video; int _video_frame_rate; /** length of the film we are playing, or 0 if there is none */ dcpomatic::DCPTime _length; diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc index e61043cc1..bc68fa6c2 100644 --- a/src/wx/video_waveform_dialog.cc +++ b/src/wx/video_waveform_dialog.cc @@ -28,8 +28,8 @@ using std::cout; using boost::bind; -using boost::weak_ptr; -using boost::shared_ptr; +using std::weak_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/video_waveform_dialog.h b/src/wx/video_waveform_dialog.h index 252720f60..25bd462ae 100644 --- a/src/wx/video_waveform_dialog.h +++ b/src/wx/video_waveform_dialog.h @@ -18,11 +18,13 @@ */ + #include "lib/warnings.h" DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include +#include + class VideoWaveformPlot; class FilmViewer; @@ -31,7 +33,7 @@ class Film; class VideoWaveformDialog : public wxDialog { public: - VideoWaveformDialog (wxWindow* parent, boost::weak_ptr film, boost::weak_ptr viewer); + VideoWaveformDialog (wxWindow* parent, std::weak_ptr film, std::weak_ptr viewer); private: void shown (wxShowEvent &); @@ -39,7 +41,7 @@ private: void contrast_changed (); void mouse_moved (int x1, int x2, int y1, int y2); - boost::weak_ptr _viewer; + std::weak_ptr _viewer; VideoWaveformPlot* _plot; wxChoice* _component; wxSlider* _contrast; diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc index edec4d6eb..cf07a2ea7 100644 --- a/src/wx/video_waveform_plot.cc +++ b/src/wx/video_waveform_plot.cc @@ -36,8 +36,8 @@ using std::cout; using std::min; using std::max; using std::string; -using boost::weak_ptr; -using boost::shared_ptr; +using std::weak_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h index f107f0399..037ff0cbf 100644 --- a/src/wx/video_waveform_plot.h +++ b/src/wx/video_waveform_plot.h @@ -22,8 +22,6 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include -#include #include namespace dcp { @@ -38,7 +36,7 @@ class FilmViewer; class VideoWaveformPlot : public wxPanel { public: - VideoWaveformPlot (wxWindow* parent, boost::weak_ptr film, boost::weak_ptr viewer); + VideoWaveformPlot (wxWindow* parent, std::weak_ptr film, std::weak_ptr viewer); void set_enabled (bool e); void set_component (int c); @@ -55,12 +53,12 @@ private: void paint (); void sized (wxSizeEvent &); void create_waveform (); - void set_image (boost::shared_ptr); + void set_image (std::shared_ptr); void mouse_moved (wxMouseEvent &); - boost::weak_ptr _film; - boost::shared_ptr _image; - boost::shared_ptr _waveform; + std::weak_ptr _film; + std::shared_ptr _image; + std::shared_ptr _waveform; bool _dirty; bool _enabled; int _component; diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 7948dd13c..5d02d27bf 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -44,7 +44,7 @@ DCPOMATIC_ENABLE_WARNINGS using std::string; using std::vector; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using dcp::locale_convert; using namespace dcpomatic; diff --git a/test/4k_test.cc b/test/4k_test.cc index cbbede0a9..e09aeeb5c 100644 --- a/test/4k_test.cc +++ b/test/4k_test.cc @@ -36,7 +36,7 @@ #include "lib/dcpomatic_log.h" #include "test.h" -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (fourk_test) { diff --git a/test/atmos_test.cc b/test/atmos_test.cc index fe64ed6a9..95c43ce34 100644 --- a/test/atmos_test.cc +++ b/test/atmos_test.cc @@ -32,7 +32,7 @@ using std::string; using std::vector; using boost::optional; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (atmos_passthrough_test) diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc index c3a83186e..9da286746 100644 --- a/test/audio_analysis_test.cc +++ b/test/audio_analysis_test.cc @@ -41,7 +41,7 @@ #include using std::vector; -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; static float diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc index 2645cf517..f229446f0 100644 --- a/test/audio_delay_test.cc +++ b/test/audio_delay_test.cc @@ -45,7 +45,7 @@ using std::string; using std::cout; using boost::lexical_cast; -using boost::shared_ptr; +using std::shared_ptr; static void test_audio_delay (int delay_in_ms) diff --git a/test/audio_filter_test.cc b/test/audio_filter_test.cc index b0bb1449c..13b098910 100644 --- a/test/audio_filter_test.cc +++ b/test/audio_filter_test.cc @@ -27,7 +27,7 @@ #include "lib/audio_filter.h" #include "lib/audio_buffers.h" -using boost::shared_ptr; +using std::shared_ptr; static void audio_filter_impulse_test_one (AudioFilter& f, int block_size, int num_blocks) diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc index db8b33a9b..d8e5b0e26 100644 --- a/test/audio_merger_test.cc +++ b/test/audio_merger_test.cc @@ -39,7 +39,7 @@ using std::pair; using std::list; using std::cout; using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; using namespace dcpomatic; diff --git a/test/audio_processor_delay_test.cc b/test/audio_processor_delay_test.cc index bb0538661..6fd644a7e 100644 --- a/test/audio_processor_delay_test.cc +++ b/test/audio_processor_delay_test.cc @@ -31,7 +31,7 @@ using std::cerr; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; #define CHECK_SAMPLE(c,f,r) \ if (fabs(out->data(c)[f] - (r)) > 0.1) { \ diff --git a/test/audio_processor_test.cc b/test/audio_processor_test.cc index d814ab421..fcb81e104 100644 --- a/test/audio_processor_test.cc +++ b/test/audio_processor_test.cc @@ -32,7 +32,7 @@ #include "test.h" #include -using boost::shared_ptr; +using std::shared_ptr; /** Test the mid-side decoder for analysis and DCP-making */ BOOST_AUTO_TEST_CASE (audio_processor_test) diff --git a/test/audio_ring_buffers_test.cc b/test/audio_ring_buffers_test.cc index 782451a7d..95927537f 100644 --- a/test/audio_ring_buffers_test.cc +++ b/test/audio_ring_buffers_test.cc @@ -23,7 +23,7 @@ #include using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; #define CANARY 9999 diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc index 2a1360c78..4a056dbf7 100644 --- a/test/burnt_subtitle_test.cc +++ b/test/burnt_subtitle_test.cc @@ -49,8 +49,8 @@ using std::cout; using std::map; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using namespace dcpomatic; /** Build a small DCP with no picture and a single subtitle overlaid onto it from a SubRip file */ diff --git a/test/butler_test.cc b/test/butler_test.cc index 9340ebe75..8a588dcc9 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -28,7 +28,7 @@ #include "test.h" #include -using boost::shared_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/test/client_server_test.cc b/test/client_server_test.cc index e7ab5ec7a..675d1eb24 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -42,10 +42,10 @@ #include using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::thread; using boost::optional; -using boost::weak_ptr; +using std::weak_ptr; using dcp::ArrayData; void diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc index 86666a44c..4c59be72b 100644 --- a/test/closed_caption_test.cc +++ b/test/closed_caption_test.cc @@ -29,7 +29,7 @@ #include using std::list; -using boost::shared_ptr; +using std::shared_ptr; /** Basic test that Interop closed captions are written */ BOOST_AUTO_TEST_CASE (closed_caption_test1) diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc index 94284f879..f277edd9a 100644 --- a/test/colour_conversion_test.cc +++ b/test/colour_conversion_test.cc @@ -32,7 +32,7 @@ #include using std::cout; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (colour_conversion_test1) { diff --git a/test/content_test.cc b/test/content_test.cc index de9ca7774..0815e16c2 100644 --- a/test/content_test.cc +++ b/test/content_test.cc @@ -32,7 +32,7 @@ #include "test.h" #include -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; /** There has been garbled audio with this piece of content */ diff --git a/test/cpl_hash_test.cc b/test/cpl_hash_test.cc index 28a9420da..5b15c6ee0 100644 --- a/test/cpl_hash_test.cc +++ b/test/cpl_hash_test.cc @@ -34,7 +34,7 @@ using std::string; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (hash_added_to_imported_dcp_test) diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc index 231a99da2..0cd972249 100644 --- a/test/dcp_decoder_test.cc +++ b/test/dcp_decoder_test.cc @@ -39,7 +39,7 @@ using std::list; using std::string; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; /* Check that DCPDecoder reuses old data when it should */ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) @@ -91,12 +91,12 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) BOOST_REQUIRE (!wait_for_jobs()); shared_ptr player (new Player(test)); - shared_ptr decoder = boost::dynamic_pointer_cast(player->_pieces.front()->decoder); + shared_ptr decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); list > reels = decoder->reels(); ov_content->set_position (test, dcpomatic::DCPTime(96000)); - decoder = boost::dynamic_pointer_cast(player->_pieces.front()->decoder); + decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); BOOST_REQUIRE (reels == decoder->reels()); @@ -109,14 +109,14 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) BOOST_REQUIRE (!wait_for_jobs()); player.reset (new Player(test)); - decoder = boost::dynamic_pointer_cast(player->_pieces.front()->decoder); + decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); reels = decoder->reels(); vf_content->add_ov (ov->dir(ov->dcp_name(false))); JobManager::instance()->add (shared_ptr(new ExamineContentJob(test, vf_content))); BOOST_REQUIRE (!wait_for_jobs()); - decoder = boost::dynamic_pointer_cast(player->_pieces.front()->decoder); + decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); BOOST_REQUIRE (reels != decoder->reels()); @@ -127,14 +127,14 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test) BOOST_REQUIRE (!wait_for_jobs()); player.reset (new Player(test)); - decoder = boost::dynamic_pointer_cast(player->_pieces.front()->decoder); + decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); reels = decoder->reels(); encrypted_content->add_kdm (kdm); JobManager::instance()->add (shared_ptr(new ExamineContentJob(test, encrypted_content))); BOOST_REQUIRE (!wait_for_jobs()); - decoder = boost::dynamic_pointer_cast(player->_pieces.front()->decoder); + decoder = std::dynamic_pointer_cast(player->_pieces.front()->decoder); BOOST_REQUIRE (decoder); BOOST_REQUIRE (reels != decoder->reels()); } diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 05554f4ed..fd4c939bd 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -26,7 +26,7 @@ #include using std::pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index f7e7fe795..a3ef673fe 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -40,7 +40,7 @@ using std::cout; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/test/digest_test.cc b/test/digest_test.cc index b1effc906..5145ee7e3 100644 --- a/test/digest_test.cc +++ b/test/digest_test.cc @@ -36,7 +36,7 @@ using std::list; using std::string; -using boost::shared_ptr; +using std::shared_ptr; static string openssl_hash (boost::filesystem::path file) diff --git a/test/empty_test.cc b/test/empty_test.cc index 9a1f98ed2..9f55499da 100644 --- a/test/empty_test.cc +++ b/test/empty_test.cc @@ -35,7 +35,7 @@ #include using std::list; -using boost::shared_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc index 5e2c130a5..020c2cc13 100644 --- a/test/ffmpeg_audio_only_test.cc +++ b/test/ffmpeg_audio_only_test.cc @@ -40,14 +40,14 @@ using std::min; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif -using boost::shared_ptr; +using std::shared_ptr; static SNDFILE* ref = 0; static int ref_buffer_size = 0; static float* ref_buffer = 0; static void -audio (boost::shared_ptr audio, int channels) +audio (std::shared_ptr audio, int channels) { /* Check that we have a big enough buffer */ BOOST_CHECK (audio->frames() * audio->channels() < ref_buffer_size); diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc index a54ffa081..fc315ec2d 100644 --- a/test/ffmpeg_audio_test.cc +++ b/test/ffmpeg_audio_test.cc @@ -42,7 +42,7 @@ #include using std::string; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (ffmpeg_audio_test) { diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc index 8de8feeba..ea3b8d4f9 100644 --- a/test/ffmpeg_dcp_test.cc +++ b/test/ffmpeg_dcp_test.cc @@ -35,7 +35,7 @@ #include "lib/video_content.h" #include "test.h" -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test) { diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc index 33b407a97..01eec0110 100644 --- a/test/ffmpeg_decoder_seek_test.cc +++ b/test/ffmpeg_decoder_seek_test.cc @@ -42,7 +42,7 @@ using std::cerr; using std::vector; using std::list; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc index bf6668586..f81ebda9c 100644 --- a/test/ffmpeg_decoder_sequential_test.cc +++ b/test/ffmpeg_decoder_sequential_test.cc @@ -39,7 +39,7 @@ using std::cout; using std::cerr; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using boost::bind; #if BOOST_VERSION >= 106100 diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc index 505bca766..684a67cf5 100644 --- a/test/ffmpeg_encoder_test.cc +++ b/test/ffmpeg_encoder_test.cc @@ -35,7 +35,7 @@ #include using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using namespace dcpomatic; diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc index fbc3e51f0..9c3311719 100644 --- a/test/ffmpeg_examiner_test.cc +++ b/test/ffmpeg_examiner_test.cc @@ -29,7 +29,7 @@ #include "lib/ffmpeg_audio_stream.h" #include "test.h" -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; /** Check that the FFmpegExaminer can extract the first video and audio time diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc index 35996f01a..134881c0d 100644 --- a/test/ffmpeg_pts_offset_test.cc +++ b/test/ffmpeg_pts_offset_test.cc @@ -31,7 +31,7 @@ #include "lib/audio_content.h" #include "test.h" -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test) diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc index ebc89d6b1..6fce51060 100644 --- a/test/file_naming_test.cc +++ b/test/file_naming_test.cc @@ -36,7 +36,7 @@ #include using std::string; -using boost::shared_ptr; +using std::shared_ptr; class Keep { diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc index 6af4b7ffe..d1c30c398 100644 --- a/test/film_metadata_test.cc +++ b/test/film_metadata_test.cc @@ -33,7 +33,7 @@ using std::string; using std::list; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (film_metadata_test) { diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc index 2a0aa9415..76a8ed5cb 100644 --- a/test/frame_rate_test.cc +++ b/test/frame_rate_test.cc @@ -35,7 +35,7 @@ #include "lib/audio_content.h" #include "test.h" -using boost::shared_ptr; +using std::shared_ptr; /* Test Playlist::best_dcp_frame_rate and FrameRateChange with a single piece of content. diff --git a/test/hints_test.cc b/test/hints_test.cc index 5222f9046..1be36193a 100644 --- a/test/hints_test.cc +++ b/test/hints_test.cc @@ -28,14 +28,13 @@ #include "lib/text_content.h" #include "lib/util.h" #include "test.h" -#include #include using std::string; using std::vector; using boost::optional; -using boost::shared_ptr; +using std::shared_ptr; vector current_hints; diff --git a/test/image_content_fade_test.cc b/test/image_content_fade_test.cc index 30da3ef3a..61f1c4848 100644 --- a/test/image_content_fade_test.cc +++ b/test/image_content_fade_test.cc @@ -27,7 +27,7 @@ using std::string; using std::list; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (image_content_fade_test) { diff --git a/test/image_proxy_test.cc b/test/image_proxy_test.cc index a80a97f07..9dedb854a 100644 --- a/test/image_proxy_test.cc +++ b/test/image_proxy_test.cc @@ -22,11 +22,10 @@ #include "lib/ffmpeg_image_proxy.h" #include "lib/j2k_image_proxy.h" #include "test.h" -#include #include -using boost::shared_ptr; +using std::shared_ptr; static const boost::filesystem::path data_file0 = TestPaths::private_data() / "player_seek_test_0.png"; diff --git a/test/image_test.cc b/test/image_test.cc index 3d599b82d..88bb00b8d 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -34,7 +34,7 @@ using std::string; using std::list; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (aligned_image_test) { @@ -460,9 +460,9 @@ BOOST_AUTO_TEST_CASE (make_black_test) int N = 0; for (list::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) { - boost::shared_ptr foo (new Image (*i, in_size, true)); + std::shared_ptr foo (new Image (*i, in_size, true)); foo->make_black (); - boost::shared_ptr bar = foo->scale (out_size, dcp::YUV_TO_RGB_REC601, AV_PIX_FMT_RGB24, true, false); + std::shared_ptr bar = foo->scale (out_size, dcp::YUV_TO_RGB_REC601, AV_PIX_FMT_RGB24, true, false); uint8_t* p = bar->data()[0]; for (int y = 0; y < bar->size().height; ++y) { diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index cb485e68a..05b020e1c 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -43,8 +43,8 @@ using std::vector; using std::string; using std::map; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; /** Make an encrypted DCP, import it and make a new unencrypted DCP */ BOOST_AUTO_TEST_CASE (import_dcp_test) diff --git a/test/interrupt_encoder_test.cc b/test/interrupt_encoder_test.cc index 85428e7d3..e146d2916 100644 --- a/test/interrupt_encoder_test.cc +++ b/test/interrupt_encoder_test.cc @@ -33,7 +33,7 @@ #include "test.h" #include -using boost::shared_ptr; +using std::shared_ptr; /** Interrupt a DCP encode when it is in progress, as this used to (still does?) * sometimes give an error related to pthreads. diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index 29bcff6ed..11886cbef 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -38,7 +38,7 @@ #include using std::cout; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (isdcf_name_test) { diff --git a/test/j2k_bandwidth_test.cc b/test/j2k_bandwidth_test.cc index a1e6c1ac6..c114cbfe7 100644 --- a/test/j2k_bandwidth_test.cc +++ b/test/j2k_bandwidth_test.cc @@ -30,10 +30,10 @@ #include "lib/video_content.h" #include #include -#include + using std::string; -using boost::shared_ptr; +using std::shared_ptr; static void check (int target_bits_per_second) diff --git a/test/job_test.cc b/test/job_test.cc index cc1c7ba89..c834ec12e 100644 --- a/test/job_test.cc +++ b/test/job_test.cc @@ -29,7 +29,7 @@ #include "lib/cross.h" using std::string; -using boost::shared_ptr; +using std::shared_ptr; class TestJob : public Job { diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc index 4ff0233dc..bd329eeee 100644 --- a/test/kdm_naming_test.cc +++ b/test/kdm_naming_test.cc @@ -26,14 +26,14 @@ #include "lib/kdm_with_metadata.h" #include "test.h" #include -#include + using std::list; using std::string; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; static bool diff --git a/test/markers_test.cc b/test/markers_test.cc index cbdad26c5..28c9eed42 100644 --- a/test/markers_test.cc +++ b/test/markers_test.cc @@ -37,7 +37,7 @@ using std::string; using boost::optional; -using boost::shared_ptr; +using std::shared_ptr; /** Check that FFOC and LFOC are automatically added if not specified */ diff --git a/test/no_use_video_test.cc b/test/no_use_video_test.cc index 46b7e2aef..3bda3ccc4 100644 --- a/test/no_use_video_test.cc +++ b/test/no_use_video_test.cc @@ -41,8 +41,8 @@ #include -using boost::dynamic_pointer_cast; -using boost::shared_ptr; +using std::dynamic_pointer_cast; +using std::shared_ptr; /** Overlay two video-only bits of content, don't use the video on one and diff --git a/test/optimise_stills_test.cc b/test/optimise_stills_test.cc index a57518b2d..d0f2aaa6b 100644 --- a/test/optimise_stills_test.cc +++ b/test/optimise_stills_test.cc @@ -39,8 +39,8 @@ using std::string; using std::vector; using boost::starts_with; using boost::split; -using boost::dynamic_pointer_cast; -using boost::shared_ptr; +using std::dynamic_pointer_cast; +using std::shared_ptr; static void diff --git a/test/player_test.cc b/test/player_test.cc index b5f082e74..46bd01609 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -46,7 +46,7 @@ using std::cout; using std::list; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; using boost::optional; #if BOOST_VERSION >= 106100 diff --git a/test/pulldown_detect_test.cc b/test/pulldown_detect_test.cc index e6adb288f..3c2df826c 100644 --- a/test/pulldown_detect_test.cc +++ b/test/pulldown_detect_test.cc @@ -26,7 +26,7 @@ #include -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (pulldown_detect_test1) diff --git a/test/recover_test.cc b/test/recover_test.cc index 01afa5e92..aa8da8ba9 100644 --- a/test/recover_test.cc +++ b/test/recover_test.cc @@ -37,7 +37,7 @@ using std::cout; using std::string; -using boost::shared_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/test/reel_writer_test.cc b/test/reel_writer_test.cc index a5a3ed83b..1223a217a 100644 --- a/test/reel_writer_test.cc +++ b/test/reel_writer_test.cc @@ -39,7 +39,7 @@ #include using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; static bool equal (dcp::FrameInfo a, ReelWriter const & writer, shared_ptr file, Frame frame, Eyes eyes) diff --git a/test/reels_test.cc b/test/reels_test.cc index 01b2f9b4a..b609052b9 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -41,7 +41,7 @@ using std::list; using std::cout; using std::vector; using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::function; using namespace dcpomatic; diff --git a/test/remake_id_test.cc b/test/remake_id_test.cc index 2a96a1488..488fada90 100644 --- a/test/remake_id_test.cc +++ b/test/remake_id_test.cc @@ -32,9 +32,9 @@ using std::string; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; /** Check for bug #1126 whereby making a new DCP using the same video asset as an old one * corrupts the old one. diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc index 27d76ed31..81738c2ea 100644 --- a/test/remake_with_subtitle_test.cc +++ b/test/remake_with_subtitle_test.cc @@ -25,8 +25,8 @@ #include "test.h" #include -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; /** Check that if we remake a DCP having turned off subtitles the code notices * and doesn't re-use the old video data. diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc index 125f46686..fbbaba3f1 100644 --- a/test/repeat_frame_test.cc +++ b/test/repeat_frame_test.cc @@ -34,7 +34,7 @@ #include "lib/dcp_content_type.h" #include "lib/video_content.h" -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (repeat_frame_test) { diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc index d1ff82ca6..a4be8b9b7 100644 --- a/test/required_disk_space_test.cc +++ b/test/required_disk_space_test.cc @@ -29,8 +29,8 @@ #include "test.h" #include -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; void check_within_n (int64_t a, int64_t b, int64_t n) { diff --git a/test/resampler_test.cc b/test/resampler_test.cc index 893fad3b5..2978d27f9 100644 --- a/test/resampler_test.cc +++ b/test/resampler_test.cc @@ -31,7 +31,7 @@ using std::pair; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; static void resampler_test_one (int from, int to) diff --git a/test/scaling_test.cc b/test/scaling_test.cc index 491b63723..809748e28 100644 --- a/test/scaling_test.cc +++ b/test/scaling_test.cc @@ -32,7 +32,7 @@ #include "test.h" using std::string; -using boost::shared_ptr; +using std::shared_ptr; static void scaling_test_for (shared_ptr film, shared_ptr content, float ratio, std::string image, string container) { diff --git a/test/shuffler_test.cc b/test/shuffler_test.cc index aac8285a6..f6a2a358c 100644 --- a/test/shuffler_test.cc +++ b/test/shuffler_test.cc @@ -4,8 +4,8 @@ #include using std::list; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc index 9c432d3e2..e1d893ccb 100644 --- a/test/silence_padding_test.cc +++ b/test/silence_padding_test.cc @@ -39,7 +39,7 @@ using std::string; using boost::lexical_cast; -using boost::shared_ptr; +using std::shared_ptr; static void test_silence_padding (int channels) diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc index 4b137c991..928d173df 100644 --- a/test/skip_frame_test.cc +++ b/test/skip_frame_test.cc @@ -34,7 +34,7 @@ #include "lib/dcp_content_type.h" #include "lib/video_content.h" -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (skip_frame_test) { diff --git a/test/socket_test.cc b/test/socket_test.cc index 872136a71..b9aaba9d2 100644 --- a/test/socket_test.cc +++ b/test/socket_test.cc @@ -23,13 +23,12 @@ #include #include #include -#include #include #include using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; @@ -83,7 +82,7 @@ public: } private: - void handle (boost::shared_ptr socket) + void handle (std::shared_ptr socket) { boost::mutex::scoped_lock lm (_mutex); BOOST_REQUIRE (_size); diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc index 1ea4538ba..d07d70ba0 100644 --- a/test/srt_subtitle_test.cc +++ b/test/srt_subtitle_test.cc @@ -36,7 +36,7 @@ using std::string; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; /** Make a very short DCP with a single subtitle from .srt with no specified fonts */ diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc index c07666aa0..0756deed9 100644 --- a/test/ssa_subtitle_test.cc +++ b/test/ssa_subtitle_test.cc @@ -36,7 +36,7 @@ using std::string; using std::list; -using boost::shared_ptr; +using std::shared_ptr; /** Make a DCP with subs from a .ssa file */ BOOST_AUTO_TEST_CASE (ssa_subtitle_test1) diff --git a/test/stream_test.cc b/test/stream_test.cc index b4b7c260b..a706906f8 100644 --- a/test/stream_test.cc +++ b/test/stream_test.cc @@ -34,7 +34,7 @@ DCPOMATIC_ENABLE_WARNINGS using std::pair; using std::list; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (stream_test) { diff --git a/test/subtitle_charset_test.cc b/test/subtitle_charset_test.cc index 67bde8927..ada358a63 100644 --- a/test/subtitle_charset_test.cc +++ b/test/subtitle_charset_test.cc @@ -26,8 +26,8 @@ #include "lib/string_text_file_content.h" #include -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; /** Test parsing of UTF16 CR/LF input */ BOOST_AUTO_TEST_CASE (subtitle_charset_test1) diff --git a/test/subtitle_language_test.cc b/test/subtitle_language_test.cc index 50efb71a1..28c278c94 100644 --- a/test/subtitle_language_test.cc +++ b/test/subtitle_language_test.cc @@ -33,7 +33,7 @@ using std::string; using std::vector; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (subtitle_language_interop_test) diff --git a/test/subtitle_metadata_test.cc b/test/subtitle_metadata_test.cc index a60d0675c..f79aa08f8 100644 --- a/test/subtitle_metadata_test.cc +++ b/test/subtitle_metadata_test.cc @@ -27,12 +27,11 @@ #include "lib/film.h" #include "test.h" #include -#include #include using std::vector; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (subtitle_metadata_test1) diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc index 23e03b7bc..e5f1667ef 100644 --- a/test/subtitle_reel_number_test.cc +++ b/test/subtitle_reel_number_test.cc @@ -33,8 +33,8 @@ #include using std::string; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; /* Check that ReelNumber is setup correctly when making multi-reel subtitled DCPs */ BOOST_AUTO_TEST_CASE (subtitle_reel_number_test) diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc index 2c5c364d0..6e55ee62f 100644 --- a/test/subtitle_reel_test.cc +++ b/test/subtitle_reel_test.cc @@ -38,7 +38,7 @@ using std::list; using std::string; using boost::optional; -using boost::shared_ptr; +using std::shared_ptr; /* Check that timings are done correctly for multi-reel DCPs with PNG subs */ @@ -80,12 +80,12 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test) list >::const_iterator i = reels.begin (); BOOST_REQUIRE ((*i)->main_subtitle()); BOOST_REQUIRE ((*i)->main_subtitle()->asset()); - shared_ptr A = boost::dynamic_pointer_cast((*i)->main_subtitle()->asset()); + shared_ptr A = std::dynamic_pointer_cast((*i)->main_subtitle()->asset()); BOOST_REQUIRE (A); ++i; BOOST_REQUIRE ((*i)->main_subtitle()); BOOST_REQUIRE ((*i)->main_subtitle()->asset()); - shared_ptr B = boost::dynamic_pointer_cast((*i)->main_subtitle()->asset()); + shared_ptr B = std::dynamic_pointer_cast((*i)->main_subtitle()->asset()); BOOST_REQUIRE (B); BOOST_REQUIRE_EQUAL (A->subtitles().size(), 1U); diff --git a/test/subtitle_trim_test.cc b/test/subtitle_trim_test.cc index 966fc66b6..3a615c8d8 100644 --- a/test/subtitle_trim_test.cc +++ b/test/subtitle_trim_test.cc @@ -23,7 +23,7 @@ #include "test.h" #include -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; /** Check for no crash when trimming DCP subtitles (#1275) */ diff --git a/test/test.cc b/test/test.cc index a8c3eb1e4..19e8f978a 100644 --- a/test/test.cc +++ b/test/test.cc @@ -68,9 +68,9 @@ using std::cout; using std::cerr; using std::list; using std::abs; -using boost::shared_ptr; +using std::shared_ptr; using boost::scoped_array; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/test/test.h b/test/test.h index 4968d3301..44ca706f6 100644 --- a/test/test.h +++ b/test/test.h @@ -18,9 +18,10 @@ */ + #include "lib/warnings.h" #include -#include + class Film; class Image; @@ -36,10 +37,10 @@ public: extern bool wait_for_jobs (); extern void setup_test_config (); -extern boost::shared_ptr new_test_film (std::string); -extern boost::shared_ptr new_test_film2 (std::string); +extern std::shared_ptr new_test_film (std::string); +extern std::shared_ptr new_test_film2 (std::string); extern void check_dcp (boost::filesystem::path, boost::filesystem::path); -extern void check_dcp (boost::filesystem::path, boost::shared_ptr); +extern void check_dcp (boost::filesystem::path, std::shared_ptr); extern void check_file (boost::filesystem::path ref, boost::filesystem::path check); extern void check_wav_file (boost::filesystem::path ref, boost::filesystem::path check); extern void check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check); @@ -49,19 +50,19 @@ extern void check_file (boost::filesystem::path, boost::filesystem::path); extern void check_ffmpeg (boost::filesystem::path, boost::filesystem::path, int audio_tolerance); extern void check_image (boost::filesystem::path, boost::filesystem::path, double threshold = 4); extern boost::filesystem::path test_film_dir (std::string); -extern void write_image (boost::shared_ptr image, boost::filesystem::path file); -boost::filesystem::path dcp_file (boost::shared_ptr film, std::string prefix); +extern void write_image (std::shared_ptr image, boost::filesystem::path file); +boost::filesystem::path dcp_file (std::shared_ptr film, std::string prefix); void check_one_frame (boost::filesystem::path dcp, int64_t index, boost::filesystem::path ref); -extern boost::filesystem::path subtitle_file (boost::shared_ptr film); +extern boost::filesystem::path subtitle_file (std::shared_ptr film); extern void make_random_file (boost::filesystem::path path, size_t size); class LogSwitcher { public: - LogSwitcher (boost::shared_ptr log); + LogSwitcher (std::shared_ptr log); ~LogSwitcher (); private: - boost::shared_ptr _old; + std::shared_ptr _old; }; diff --git a/test/threed_test.cc b/test/threed_test.cc index b181d15cb..e6a91a910 100644 --- a/test/threed_test.cc +++ b/test/threed_test.cc @@ -37,7 +37,7 @@ #include using std::cout; -using boost::shared_ptr; +using std::shared_ptr; /** Basic sanity check of 3D_LEFT_RIGHT */ BOOST_AUTO_TEST_CASE (threed_test1) diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc index 8c57a9fdb..d0cf63bb2 100644 --- a/test/time_calculation_test.cc +++ b/test/time_calculation_test.cc @@ -33,7 +33,7 @@ using std::string; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using namespace dcpomatic; static string const xml = "" diff --git a/test/torture_test.cc b/test/torture_test.cc index 27b4b5d14..23eb3ca8e 100644 --- a/test/torture_test.cc +++ b/test/torture_test.cc @@ -43,8 +43,8 @@ using std::list; using std::cout; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using namespace dcpomatic; /** Test start/end trim and positioning of some audio content */ diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc index 085a0dd04..35224ff23 100644 --- a/test/upmixer_a_test.cc +++ b/test/upmixer_a_test.cc @@ -34,7 +34,7 @@ #include "lib/upmixer_a.h" #include "test.h" -using boost::shared_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/test/util_test.cc b/test/util_test.cc index 9f03b6a47..56de057a6 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -34,7 +34,7 @@ using std::string; using std::vector; using std::list; -using boost::shared_ptr; +using std::shared_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc index 5d16e3be5..7a9c30263 100644 --- a/test/vf_kdm_test.cc +++ b/test/vf_kdm_test.cc @@ -38,7 +38,7 @@ using std::vector; using std::string; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (vf_kdm_test) { diff --git a/test/vf_test.cc b/test/vf_test.cc index ad4bcf8a4..9fc02412a 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -43,8 +43,8 @@ using std::list; using std::string; using std::cout; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using namespace dcpomatic; /** Test the logic which decides whether a DCP can be referenced or not */ diff --git a/test/video_level_test.cc b/test/video_level_test.cc index 056a500ee..95b69d2aa 100644 --- a/test/video_level_test.cc +++ b/test/video_level_test.cc @@ -55,12 +55,12 @@ using std::make_pair; using std::max; using std::pair; using std::string; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif -using boost::shared_ptr; +using std::shared_ptr; static diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc index 84c3f4733..e5241b687 100644 --- a/test/video_mxf_content_test.cc +++ b/test/video_mxf_content_test.cc @@ -32,8 +32,8 @@ #include #include -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; static boost::filesystem::path ref_mxf = "test/data/scaling_test_185_185/j2c_c75af074-2809-453c-9192-6affb76b4ba3.mxf";