Rename send_binary -> write_to_socket.

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 6f32b6686dca1ac44eeeb4d8d7a575f4c1e004fe..9d7ccf56593c20893e6a694dfb744a35a15b06ca 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -172,7 +172,7 @@ DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
 
        /* Send binary data */
        LOG_TIMING("start-remote-send thread=%1", thread_id ());
-       _frame->send_binary (socket);
+       _frame->write_to_socket (socket);
 
        /* Read the response (JPEG2000-encoded data); this blocks until the data
           is ready and sent back.

diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc
index 87fb154d0a7741517e7fc0b35b47a75ee14f3c06..db6059266dc472e13b8908a67f5baf0b2a800618 100644 (file)
--- a/src/lib/ffmpeg_image_proxy.cc
+++ b/src/lib/ffmpeg_image_proxy.cc
@@ -203,7 +203,7 @@ FFmpegImageProxy::add_metadata (xmlpp::Node* node) const
 }
 
 void
-FFmpegImageProxy::send_binary (shared_ptr<Socket> socket) const
+FFmpegImageProxy::write_to_socket (shared_ptr<Socket> socket) const
 {
        socket->write (_data.size());
        socket->write (_data.data().get(), _data.size());

diff --git a/src/lib/ffmpeg_image_proxy.h b/src/lib/ffmpeg_image_proxy.h
index 88e31ad4a238513d6fa83a471de66a61106a1c7f..aa77003a4f9169c90bbf47471806700369f6b96e 100644 (file)
--- a/src/lib/ffmpeg_image_proxy.h
+++ b/src/lib/ffmpeg_image_proxy.h
@@ -35,7 +35,7 @@ public:
                ) 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> other) const;
        size_t memory_used () const;
 

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 1d57b4e08e27b746b38fdd2c4e9584ac4e66d4a8..08516e718bb4dbfe34ae5f07a81ef16abfe3265b 100644 (file)
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -93,7 +93,7 @@ public:
                ) const = 0;
 
        virtual void add_metadata (xmlpp::Node *) const = 0;
-       virtual void send_binary (boost::shared_ptr<Socket>) const = 0;
+       virtual void write_to_socket (boost::shared_ptr<Socket>) const = 0;
        /** @return true if our image is definitely the same as another, false if it is probably not */
        virtual bool same (boost::shared_ptr<const ImageProxy>) const = 0;
        /** Do any useful work that would speed up a subsequent call to ::image().

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 0e3fa88f5070182de40686dd06bf6629c458569d..acf8bb05235e7018216824bfd484f0fa533b5d6a 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -203,7 +203,7 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const
 }
 
 void
-J2KImageProxy::send_binary (shared_ptr<Socket> socket) const
+J2KImageProxy::write_to_socket (shared_ptr<Socket> socket) const
 {
        socket->write (_data.data().get(), _data.size());
 }

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index 78f291e5d87426b7e910fb224167aee721627840..71bcffb2c50754460736700310ad0af8f002cb3b 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -55,7 +55,7 @@ public:
                ) const;
 
        void add_metadata (xmlpp::Node *) const;
-       void send_binary (boost::shared_ptr<Socket>) const;
+       void write_to_socket (boost::shared_ptr<Socket>) const;
        /** @return true if our image is definitely the same as another, false if it is probably not */
        bool same (boost::shared_ptr<const ImageProxy>) const;
        int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 8d55ffb2e2e5cf51db512f3bf90aacd1f64583e8..cb2a55724726cb46803ad29f2178a620759ada6d 100644 (file)
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -211,9 +211,9 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const
 }
 
 void
-PlayerVideo::send_binary (shared_ptr<Socket> socket) const
+PlayerVideo::write_to_socket (shared_ptr<Socket> socket) const
 {
-       _in->send_binary (socket);
+       _in->write_to_socket (socket);
        if (_text) {
                _text->image->write_to_socket (socket);
        }

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 0a6a9da67858cff0e97d9fb30921b5f901422976..a8f12a0829c886aded28cb30242edb212e2e334c 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -73,7 +73,7 @@ public:
        static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat);
 
        void add_metadata (xmlpp::Node* node) const;
-       void send_binary (boost::shared_ptr<Socket> socket) const;
+       void write_to_socket (boost::shared_ptr<Socket> socket) const;
 
        bool reset_metadata (boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size);
 

diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc
index 5bd8c4811306feea406d5e023dfe3e0cbd706780..2509bd0d46f460390e6fb5b72b54c51d0b59bf9c 100644 (file)
--- a/src/lib/raw_image_proxy.cc
+++ b/src/lib/raw_image_proxy.cc
@@ -70,7 +70,7 @@ RawImageProxy::add_metadata (xmlpp::Node* node) const
 }
 
 void
-RawImageProxy::send_binary (shared_ptr<Socket> socket) const
+RawImageProxy::write_to_socket (shared_ptr<Socket> socket) const
 {
        _image->write_to_socket (socket);
 }

diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index a247d7610b4489b2198e24c5cffb4127eb14bf6c..7971d4a109a82d0ed8ff741a19a99088b15ffe04 100644 (file)
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_image_proxy.h
@@ -34,7 +34,7 @@ public:
                ) 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;