projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove log from ImageProxy hierarchy.
[dcpomatic.git]
/
src
/
lib
/
image_proxy.h
diff --git
a/src/lib/image_proxy.h
b/src/lib/image_proxy.h
index 7ff28e174ec092afdbc832ec6b07fb40c7f47c37..79b2bf4e89270d53f3a9b69684c94ea8a6929fdd 100644
(file)
--- a/
src/lib/image_proxy.h
+++ b/
src/lib/image_proxy.h
@@
-31,7
+31,6
@@
class Image;
class Socket;
class Image;
class Socket;
-class Log;
namespace cxml {
class Node;
namespace cxml {
class Node;
@@
-56,7
+55,6
@@
namespace dcp {
class ImageProxy : public boost::noncopyable
{
public:
class ImageProxy : public boost::noncopyable
{
public:
- ImageProxy (boost::shared_ptr<Log> log);
virtual ~ImageProxy () {}
/** @return Image (which must be aligned) */
virtual ~ImageProxy () {}
/** @return Image (which must be aligned) */
@@
-67,11
+65,8
@@
public:
virtual bool same (boost::shared_ptr<const ImageProxy>) const {
return false;
}
virtual bool same (boost::shared_ptr<const ImageProxy>) const {
return false;
}
-
-protected:
- boost::shared_ptr<Log> _log;
};
};
-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
#endif