Fix incorrect conversion of audio from DCP sources (#642).

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

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index 125e2c8186ccef960fd45eac476454656bdf4efe..8fd668b00dc7402a016a171b5967b54dcded8fa8 100644 (file)
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -32,7 +32,7 @@ class Image;
 class Log;
 class Subtitle;
 class PlayerVideo;
-class EncodedData;
+class Data;
 
 /** @class DCPVideo
  *  @brief A single frame of video destined for a DCP.
@@ -46,11 +46,11 @@ class EncodedData;
 class DCPVideo : public boost::noncopyable
 {
 public:
-       DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution, bool b, boost::shared_ptr<Log>);
+       DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution, boost::shared_ptr<Log>);
        DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr, boost::shared_ptr<Log>);
 
-       boost::shared_ptr<EncodedData> encode_locally (dcp::NoteHandler note);
-       boost::shared_ptr<EncodedData> encode_remotely (ServerDescription);
+       Data encode_locally (dcp::NoteHandler note);
+       Data encode_remotely (ServerDescription);
 
        int index () const {
                return _index;
@@ -59,17 +59,16 @@ public:
        Eyes eyes () const;
 
        bool same (boost::shared_ptr<const DCPVideo> other) const;
-       
+
 private:
 
        void add_metadata (xmlpp::Element *) const;
-       
+
        boost::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
        Resolution _resolution;          ///< Resolution (2K or 4K)
-       bool _burn_subtitles;            ///< true to burn subtitles into the image
 
        boost::shared_ptr<Log> _log; ///< log
 };