Move Socket to dcpomatic_socket.{cc,h}.

[dcpomatic.git] / src / lib / image.h

diff --git a/src/lib/image.h b/src/lib/image.h
index 5eba11041713f42ecc252648a7789505dbba467b..814ad1c5895a8c7d6edd8f5ed7563c4479c306cd 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -24,18 +24,20 @@
 #ifndef DCPOMATIC_IMAGE_H
 #define DCPOMATIC_IMAGE_H
 
-#include <string>
-#include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
+#include "position.h"
+#include "position_image.h"
+#include "types.h"
+#include <dcp/image.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
-#include <dcp/image.h>
-#include "util.h"
-#include "position.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+#include <string>
 
 class Scaler;
+class Socket;
 
 class Image : public dcp::Image
 {
@@ -47,9 +49,9 @@ public:
        Image& operator= (Image const &);
        ~Image ();
        
-       uint8_t ** data () const;
+       uint8_t * const * data () const;
        int * line_size () const;
-       int * stride () const;
+       int const * stride () const;
        dcp::Size size () const;
        bool aligned () const;
 
@@ -63,8 +65,10 @@ public:
        boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
        
        void make_black ();
+       void make_transparent ();
        void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
        void copy (boost::shared_ptr<const Image> image, Position<int> pos);
+       void fade (float);
 
        void read_from_socket (boost::shared_ptr<Socket>);
        void write_to_socket (boost::shared_ptr<Socket>) const;
@@ -73,8 +77,10 @@ public:
                return _pixel_format;
        }
 
+       std::string digest () const;
+
 private:
-       friend class pixel_formats_test;
+       friend struct pixel_formats_test;
        
        void allocate ();
        void swap (Image &);
@@ -89,4 +95,7 @@ private:
        bool _aligned;
 };
 
+extern PositionImage merge (std::list<PositionImage> images);
+extern bool operator== (Image const & a, Image const & b);
+
 #endif