From: Carl Hetherington <cth@carlh.net>
Date: Wed, 15 Apr 2020 19:01:54 +0000 (+0200)
Subject: Rename send_binary -> write_to_socket.
X-Git-Tag: v2.15.52~10
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e9cca90a162e3e4b1db4a5e5188831beaa69d44e

Rename send_binary -> write_to_socket.
---

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 6f32b6686..9d7ccf565 100644
--- 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 87fb154d0..db6059266 100644
--- 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 88e31ad4a..aa77003a4 100644
--- 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 1d57b4e08..08516e718 100644
--- 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 0e3fa88f5..acf8bb052 100644
--- 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 78f291e5d..71bcffb2c 100644
--- 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 8d55ffb2e..cb2a55724 100644
--- 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 0a6a9da67..a8f12a082 100644
--- 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 5bd8c4811..2509bd0d4 100644
--- 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 a247d7610..7971d4a10 100644
--- 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;