Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index 97be0779802b8cc7653feed28b24f68fcb2957bb..cb38cd542db16471aa2580325ff7c4b659b47e60 100644 (file)
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -18,21 +18,17 @@
 
 */
 
-#include "util.h"
-#include <dcp/picture_asset_writer.h>
+#include "types.h"
+#include "data.h"
+#include "server_description.h"
 #include <libcxml/cxml.h>
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
  */
 
-class ServerDescription;
-class Scaler;
-class Image;
 class Log;
-class Subtitle;
 class PlayerVideo;
-class Data;
 
 /** @class DCPVideo
  *  @brief A single frame of video destined for a DCP.
@@ -46,7 +42,7 @@ class Data;
 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>);
 
        Data encode_locally (dcp::NoteHandler note);
@@ -60,6 +56,8 @@ public:
 
        bool same (boost::shared_ptr<const DCPVideo> other) const;
 
+       static boost::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz (boost::shared_ptr<const PlayerVideo> frame, dcp::NoteHandler note);
+
 private:
 
        void add_metadata (xmlpp::Element *) const;
@@ -69,7 +67,6 @@ private:
        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
 };