X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fimage_proxy.h;h=b0ec161102d1f311e1e019c47793314c35166944;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=7ff28e174ec092afdbc832ec6b07fb40c7f47c37;hpb=391d85619ac19a2a93696ddc35c222eb9bb5d9d6;p=dcpomatic.git

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 7ff28e174..b0ec16110 100644
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,22 +25,23 @@
  *  @brief ImageProxy and subclasses.
  */
 
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
+#include <dcp/types.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/filesystem.hpp>
-#include <Magick++.h>
-#include <libxml++/libxml++.h>
+#include <boost/optional.hpp>
+#include <boost/utility.hpp>
 
 class Image;
 class Socket;
-class Log;
 
-namespace cxml {
+namespace xmlpp {
 	class Node;
 }
 
-namespace dcp {
-	class MonoPictureFrame;
-	class StereoPictureFrame;
+namespace cxml {
+	class Node;
 }
 
 /** @class ImageProxy
@@ -56,22 +58,17 @@ namespace dcp {
 class ImageProxy : public boost::noncopyable
 {
 public:
-	ImageProxy (boost::shared_ptr<Log> log);
 	virtual ~ImageProxy () {}
 
 	/** @return Image (which must be aligned) */
-	virtual boost::shared_ptr<Image> image () const = 0;
+	virtual boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const = 0;
 	virtual void add_metadata (xmlpp::Node *) const = 0;
 	virtual void send_binary (boost::shared_ptr<Socket>) const = 0;
 	/** @return true if our image is definitely the same as another, false if it is probably not */
-	virtual bool same (boost::shared_ptr<const ImageProxy>) const {
-		return false;
-	}
-
-protected:
-	boost::shared_ptr<Log> _log;
+	virtual bool same (boost::shared_ptr<const ImageProxy>) const = 0;
+	virtual AVPixelFormat pixel_format () const = 0;
 };
 
-boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
+boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
 #endif