Add another believed-correct subtitle timing fix.

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

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index aa11d7d3c62b4b1591efd3d0ec77d774e1f57355..0bb583c57488432e86b27fbf2411430660d6a147 100644 (file)
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -39,11 +39,14 @@ class PlayerVideo;
  *  Objects of this class are used for the queue that we keep
  *  of images that require encoding.
  */
-class DCPVideo : public boost::noncopyable
+class DCPVideo
 {
 public:
-       DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution);
-       DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr);
+       DCPVideo (std::shared_ptr<const PlayerVideo>, int index, int dcp_fps, int bandwidth, Resolution r);
+       DCPVideo (std::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr);
+
+       DCPVideo (DCPVideo const&) = delete;
+       DCPVideo& operator= (DCPVideo const&) = delete;
 
        dcp::ArrayData encode_locally ();
        dcp::ArrayData encode_remotely (EncodeServerDescription, int timeout = 30);
@@ -54,15 +57,15 @@ public:
 
        Eyes eyes () const;
 
-       bool same (boost::shared_ptr<const DCPVideo> other) const;
+       bool same (std::shared_ptr<const DCPVideo> other) const;
 
-       static boost::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz (boost::shared_ptr<const PlayerVideo> frame, dcp::NoteHandler note);
+       static std::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz (std::shared_ptr<const PlayerVideo> frame, dcp::NoteHandler note);
 
 private:
 
        void add_metadata (xmlpp::Element *) const;
 
-       boost::shared_ptr<const PlayerVideo> _frame;
+       std::shared_ptr<const PlayerVideo> _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