/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "magick_image_proxy.h"
#include "cross.h"
#include "exceptions.h"
-#include "util.h"
+#include "dcpomatic_socket.h"
#include "image.h"
+#include "compose.hpp"
#include "i18n.h"
using std::string;
using std::cout;
using boost::shared_ptr;
+using boost::optional;
using boost::dynamic_pointer_cast;
MagickImageProxy::MagickImageProxy (boost::filesystem::path path)
}
shared_ptr<Image>
-MagickImageProxy::image () const
+MagickImageProxy::image (optional<dcp::NoteHandler>) const
{
+ boost::mutex::scoped_lock lm (_mutex);
+
if (_image) {
return _image;
}