X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fraw_image_proxy.h;h=7971d4a109a82d0ed8ff741a19a99088b15ffe04;hp=6707f689c4e361895fa11791ac4571ca89e06151;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=f4030653da8f5a0b3daebe640f485b3daf9ef091

diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index 6707f689c..7971d4a10 100644
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_image_proxy.h
@@ -1,34 +1,45 @@
 /*
-    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);
+	explicit RawImageProxy (boost::shared_ptr<Image>);
+	RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
+
+	Result image (
+		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
+		) const;
 
-	boost::shared_ptr<Image> image () const;
 	void add_metadata (xmlpp::Node *) const;
-	void send_binary (boost::shared_ptr<Socket>) const;
-	
+	void write_to_socket (boost::shared_ptr<Socket>) const;
+	bool same (boost::shared_ptr<const ImageProxy>) const;
+	size_t memory_used () const;
+
 private:
 	boost::shared_ptr<Image> _image;
 };
+
+#endif