Untested first cut.

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

diff --git a/src/lib/util.h b/src/lib/util.h
index 1f635677aa81d3ba0d7cd14076bfaa4231197ddb..c3a42e448e55dbc75f425f8b10676fc69f494611 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -28,6 +28,7 @@
 #include <string>
 #include <vector>
 #include <boost/shared_ptr.hpp>
+#include <boost/asio.hpp>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
@@ -41,7 +42,6 @@ extern void stacktrace (std::ostream &, int);
 extern std::string audio_sample_format_to_string (AVSampleFormat);
 extern AVSampleFormat audio_sample_format_from_string (std::string);
 extern std::string dependency_version_summary ();
-extern void socket_write (int, uint8_t const *, int);
 extern double seconds (struct timeval);
 extern void dvdomatic_setup ();
 extern std::vector<std::string> split_at_spaces_considering_quotes (std::string);
@@ -56,27 +56,6 @@ enum ContentType {
 extern void md5_data (std::string, void const *, int);
 #endif
 
-/** @class SocketReader
- *  @brief A helper class from reading from sockets.
- */
-class SocketReader
-{
-public:
-       SocketReader (int);
-
-       void read_definite_and_consume (uint8_t *, int);
-       void read_indefinite (uint8_t *, int);
-       void consume (int);
-
-private:
-       /** file descriptor we are reading from */
-       int _fd;
-       /** a buffer for small reads */
-       uint8_t _buffer[256];
-       /** amount of valid data in the buffer */
-       int _buffer_data;
-};
-
 /** @class Size
  *  @brief Representation of the size of something */
 struct Size
@@ -101,6 +80,19 @@ struct Size
        int height;
 };
 
+struct Crop
+{
+       Crop () : left (0), right (0), top (0), bottom (0) {}
+       
+       int left;
+       int right;
+       int top;
+       int bottom;
+};
+
+extern bool operator== (Crop const & a, Crop const & b);
+extern bool operator!= (Crop const & a, Crop const & b);
+
 struct Position
 {
        Position ()
@@ -118,5 +110,34 @@ struct Position
 };
 
 extern std::string crop_string (Position, Size);
+extern int dcp_audio_sample_rate (int);
+extern std::string colour_lut_index_to_name (int index);
+
+class DeadlineWrapper
+{
+public:
+       DeadlineWrapper (boost::asio::io_service& io_service);
+
+       void set_socket (boost::shared_ptr<boost::asio::ip::tcp::socket> socket);
+
+       void connect (boost::asio::ip::basic_resolver_entry<boost::asio::ip::tcp> const & endpoint, int timeout);
+       void write (uint8_t const * data, int size, int timeout);
+       int read (uint8_t* data, int size, int timeout);
+       
+       void read_definite_and_consume (uint8_t* data, int size, int timeout);
+       void read_indefinite (uint8_t* data, int size, int timeout);
+       void consume (int amount);
+       
+private:
+       void check ();
+
+       boost::asio::io_service& _io_service;
+       boost::asio::deadline_timer _deadline;
+       boost::shared_ptr<boost::asio::ip::tcp::socket> _socket;
+       /** a buffer for small reads */
+       uint8_t _buffer[256];
+       /** amount of valid data in the buffer */
+       int _buffer_data;
+};
 
 #endif