X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=7dcd920b7cac3d72974332eda264466faf0cc42a;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=a83426206f88e7398423a152b408573cb31066cb;hpb=bed373d380d35294b03d228a2ef41cfa8fceb4b0;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index a83426206..7dcd920b7 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -51,6 +51,12 @@ extern "C" {
 /** The maximum number of audio channels that we can cope with */
 #define MAX_AUDIO_CHANNELS 6
 
+#define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
+
+namespace libdcp {
+	class Signer;
+}
+
 class Job;
 
 extern std::string seconds_to_hms (int);
@@ -61,8 +67,7 @@ extern double seconds (struct timeval);
 extern void dcpomatic_setup ();
 extern void dcpomatic_setup_gettext_i18n (std::string);
 extern std::vector<std::string> split_at_spaces_considering_quotes (std::string);
-extern std::string md5_digest (boost::filesystem::path);
-extern std::string md5_digest_directory (boost::filesystem::path, boost::shared_ptr<Job>);
+extern std::string md5_digest (std::vector<boost::filesystem::path>, boost::shared_ptr<Job>);
 extern std::string md5_digest (void const *, int);
 extern void ensure_ui_thread ();
 extern std::string audio_channel_name (int);
@@ -70,6 +75,9 @@ extern bool valid_image_file (boost::filesystem::path);
 #ifdef DCPOMATIC_WINDOWS
 extern boost::filesystem::path mo_path ();
 #endif
+extern std::string tidy_for_filename (std::string);
+extern boost::shared_ptr<const libdcp::Signer> make_signer ();
+extern libdcp::Size fit_ratio_within (float ratio, libdcp::Size);
 
 struct FrameRateConversion
 {
@@ -81,17 +89,15 @@ struct FrameRateConversion
 	float factor () const {
 		if (skip) {
 			return 0.5;
-		} else if (repeat) {
-			return 2;
 		}
 
-		return 1;
+		return repeat;
 	}
 
 	/** true to skip every other frame */
 	bool skip;
-	/** true to repeat every frame once */
-	bool repeat;
+	/** number of times to use each frame (e.g. 1 is normal, 2 means repeat each frame once, and so on) */
+	int repeat;
 	/** true if this DCP will run its video faster or slower than the source
 	 *  without taking into account `repeat' nor `skip'.
 	 *  (e.g. change_speed will be true if
@@ -126,13 +132,15 @@ 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::basic_resolver_entry<boost::asio::ip::tcp> const & endpoint);
+	void connect (boost::asio::ip::tcp::endpoint);
+	void accept (int);
 
 	void write (uint32_t n);
 	void write (uint8_t const * data, int size);
@@ -148,6 +156,7 @@ private:
 	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;
 };