X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fraw_image_proxy.h;h=379c06f32786722c9e9c2c9a387a2f242fadb6f5;hp=6707f689c4e361895fa11791ac4571ca89e06151;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1

diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index 6707f689c..379c06f32 100644
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_image_proxy.h
@@ -1,34 +1,42 @@
 /*
-    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
+    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/>.
 
 */
 
+#ifndef DCPOMATIC_RAW_IMAGE_PROXY_H
+#define DCPOMATIC_RAW_IMAGE_PROXY_H
+
 #include "image_proxy.h"
 
 class RawImageProxy : public ImageProxy
 {
 public:
-	RawImageProxy (boost::shared_ptr<Image>, boost::shared_ptr<Log> log);
-	RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
+	RawImageProxy (boost::shared_ptr<Image>);
+	RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
-	boost::shared_ptr<Image> image () const;
+	boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const;
 	void add_metadata (xmlpp::Node *) const;
 	void send_binary (boost::shared_ptr<Socket>) const;
-	
+	bool same (boost::shared_ptr<const ImageProxy>) const;
+	AVPixelFormat pixel_format () const;
+
 private:
 	boost::shared_ptr<Image> _image;
 };
+
+#endif