Fix audio analysis; make sure we don't decode video and let it pile up unwanted.

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

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 20bf70cf17eb92eb710905a2aad5250d8502d052..175f4c796e6afc039cd6f216da68a608257463dd 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -30,6 +30,7 @@
 
 using std::string;
 using boost::shared_ptr;
+using boost::optional;
 
 /** Construct a J2KImageProxy from a JPEG2000 file */
 J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size)
@@ -74,12 +75,12 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 }
 
 shared_ptr<Image>
-J2KImageProxy::image () const
+J2KImageProxy::image (optional<dcp::NoteHandler> note) const
 {
        shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, false));
 
        if (_mono) {
-               _mono->rgb_frame (reinterpret_cast<uint16_t*> (image->data()[0]));
+               _mono->rgb_frame (reinterpret_cast<uint16_t*> (image->data()[0]), note);
        } else {
                _stereo->rgb_frame (_eye, reinterpret_cast<uint16_t*> (image->data()[0]));
        }