Remove in-place translations support.

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

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 5879d6be68da23cca44f1ecd85d4d137d45cd118..217b72183c2af0b2d61b945d0b60ba3551c34933 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -71,9 +71,6 @@ using namespace boost::placeholders;
 #endif
 
 
-#define DCI_COEFFICENT (48.0 / 52.37)
-
-
 /** Construct a DCP video frame.
  *  @param frame Input frame.
  *  @param index Index of the frame within the DCP.
@@ -101,7 +98,7 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::
 }
 
 shared_ptr<dcp::OpenJPEGImage>
-DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler note)
+DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame)
 {
        shared_ptr<dcp::OpenJPEGImage> xyz;
 
@@ -111,8 +108,7 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
                        image->data()[0],
                        image->size(),
                        image->stride()[0],
-                       frame->colour_conversion().get(),
-                       note
+                       frame->colour_conversion().get()
                        );
        } else {
                xyz = make_shared<dcp::OpenJPEGImage>(image->data()[0], image->size(), image->stride()[0]);
@@ -134,7 +130,7 @@ DCPVideo::encode_locally () const
        int const minimum_size = 16384;
        LOG_DEBUG_ENCODE("Using minimum frame size %1", minimum_size);
 
-       auto xyz = convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2));
+       auto xyz = convert_to_xyz(_frame);
        int noise_amount = 2;
        int pixel_skip = 16;
        while (true) {
@@ -159,7 +155,7 @@ DCPVideo::encode_locally () const
                 * convert_to_xyz() again because compress_j2k() corrupts its xyz parameter.
                 */
 
-               xyz = convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2));
+               xyz = convert_to_xyz(_frame);
                auto size = xyz->size ();
                auto pixels = size.width * size.height;
                dcpomatic::RNG rng(42);
@@ -229,7 +225,7 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) const
 
                /* Send XML metadata */
                auto xml = doc.write_to_string ("UTF-8");
-               socket->write (xml.length() + 1);
+               socket->write(xml.bytes() + 1);
                socket->write ((uint8_t *) xml.c_str(), xml.bytes() + 1);
 
                /* Send binary data */