projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add hinting to the seek dialogue; may be a nice fix for #1736.
[dcpomatic.git]
/
src
/
lib
/
raw_image_proxy.h
diff --git
a/src/lib/raw_image_proxy.h
b/src/lib/raw_image_proxy.h
index 71c8df30bab4ce5a1ad029944e7d0b3cc93a2205..7971d4a109a82d0ed8ff741a19a99088b15ffe04 100644
(file)
--- a/
src/lib/raw_image_proxy.h
+++ b/
src/lib/raw_image_proxy.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2015 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.
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
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/>.
*/
*/
@@
-25,13
+26,17
@@
class RawImageProxy : public ImageProxy
{
public:
class RawImageProxy : public ImageProxy
{
public:
- RawImageProxy (boost::shared_ptr<Image>);
+
explicit
RawImageProxy (boost::shared_ptr<Image>);
RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
- boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const;
+ Result image (
+ boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
+ ) const;
+
void add_metadata (xmlpp::Node *) 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;
bool same (boost::shared_ptr<const ImageProxy>) const;
+ size_t memory_used () const;
private:
boost::shared_ptr<Image> _image;
private:
boost::shared_ptr<Image> _image;