X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_video.h;h=5d8b9b720a3aef0da98223f287e3668755d8f8b9;hp=aa11d7d3c62b4b1591efd3d0ec77d774e1f57355;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=0d35820cf50d2789752b8776683b26d04642518d 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