Hand-apply bd7102b476c631b1fa9067f18ce938d86073f6c8; single-file hashes.

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

diff --git a/src/lib/util.h b/src/lib/util.h
index ee2865e763df84a2328c5b05064d4add768e43fc..bf1d0265b0dec3b90da1c0ba57414ed1868f6312 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -29,12 +29,12 @@
 #include "exceptions.h"
 #include "dcpomatic_time.h"
 #include <dcp/util.h>
+#include <dcp/picture_mxf_writer.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
 #include <boost/shared_ptr.hpp>
-#include <boost/asio.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
 #include <string>
@@ -57,7 +57,6 @@ struct AVSubtitle;
 
 extern std::string seconds_to_hms (int);
 extern std::string seconds_to_approximate_hms (int);
-extern std::string dependency_version_summary ();
 extern double seconds (struct timeval);
 extern void dcpomatic_setup ();
 extern void dcpomatic_setup_gettext_i18n (std::string);
@@ -77,47 +76,10 @@ extern int round_to (float n, int r);
 extern void* wrapped_av_malloc (size_t);
 extern ContentTimePeriod subtitle_period (AVSubtitle const &);
 extern void set_backtrace_file (boost::filesystem::path);
-
-/** @class Socket
- *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things
- *  that are useful for DCP-o-matic.
- *
- *  This class wraps some things that I could not work out how to do with boost;
- *  most notably, sync read/write calls with timeouts.
- */
-class Socket
-{
-public:
-       Socket (int timeout = 30);
-       ~Socket ();
-
-       /** @return Our underlying socket */
-       boost::asio::ip::tcp::socket& socket () {
-               return _socket;
-       }
-
-       void connect (boost::asio::ip::tcp::endpoint);
-       void accept (int);
-
-       void write (uint32_t n);
-       void write (uint8_t const * data, int size);
-       
-       void read (uint8_t* data, int size);
-       uint32_t read_uint32 ();
-       
-private:
-       void check ();
-
-       Socket (Socket const &);
-
-       boost::asio::io_service _io_service;
-       boost::asio::deadline_timer _deadline;
-       boost::asio::ip::tcp::socket _socket;
-       boost::asio::ip::tcp::acceptor* _acceptor;
-       int _timeout;
-};
-
+extern dcp::FrameInfo read_frame_info (FILE* file, int frame, Eyes eyes);
+extern void write_frame_info (FILE* file, int frame, Eyes eyes, dcp::FrameInfo info);
 extern int64_t video_frames_to_audio_frames (VideoFrame v, float audio_sample_rate, float frames_per_second);
+extern std::map<std::string, std::string> split_get_request (std::string url);
 
 #endif