X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=9b201a50e7ab6cf92e59c2233809d1828d0b5ca7;hb=ea910e250a0fb3b0ad3ce0cf32dd27b24c17cd1d;hp=65859309daaf9de91f8af1a2ce39ad182ffb71e7;hpb=996b0c06e23bcb6b300d7b8799df94993692e07d;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index 65859309d..9b201a50e 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -38,6 +38,7 @@ extern "C" {
 }
 #include "compose.hpp"
 #include "types.h"
+#include "video_content.h"
 
 #ifdef DCPOMATIC_DEBUG
 #define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
@@ -45,13 +46,20 @@ extern "C" {
 #define TIMING(...)
 #endif
 
+#undef check
+
 /** The maximum number of audio channels that we can cope with */
 #define MAX_AUDIO_CHANNELS 6
 
-class Scaler;
+#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);
-extern std::string time_to_hms (Time);
 extern std::string seconds_to_approximate_hms (int);
 extern void stacktrace (std::ostream &, int);
 extern std::string dependency_version_summary ();
@@ -59,17 +67,21 @@ 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 (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);
+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
+struct FrameRateChange
 {
-	FrameRateConversion (float, int);
+	FrameRateChange (float, int);
 
 	/** @return factor by which to multiply a source frame rate
 	    to get the effective rate after any skip or repeat has happened.
@@ -77,36 +89,36 @@ 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
-	 *          source is 29.97fps, DCP is 30fps
-	 *          source is 14.50fps, DCP is 30fps
+	 *	    source is 29.97fps, DCP is 30fps
+	 *	    source is 14.50fps, DCP is 30fps
 	 *  but not if
-	 *          source is 15.00fps, DCP is 30fps
-	 *          source is 12.50fps, DCP is 25fps)
+	 *	    source is 15.00fps, DCP is 30fps
+	 *	    source is 12.50fps, DCP is 25fps)
 	 */
 	bool change_speed;
 
+	/** Amount by which the video is being sped-up in the DCP; e.g. for a
+	 *  24fps source in a 25fps DCP this would be 25/24.
+	 */
+	float speed_up;
+
 	std::string description;
 };
 
-extern std::string crop_string (Position, libdcp::Size);
 extern int dcp_audio_frame_rate (int);
-extern std::string colour_lut_index_to_name (int index);
 extern int stride_round_up (int, int const *, int);
-extern int stride_lookup (int c, int const * stride);
 extern std::multimap<std::string, std::string> read_key_value (std::istream& s);
 extern int get_required_int (std::multimap<std::string, std::string> const & kv, std::string k);
 extern float get_required_float (std::multimap<std::string, std::string> const & kv, std::string k);
@@ -125,13 +137,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);
@@ -147,11 +161,11 @@ 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;
 };
 
-extern int64_t video_frames_to_audio_frames (ContentVideoFrame v, float audio_sample_rate, float frames_per_second);
-extern std::pair<std::string, int> cpu_info ();
+extern int64_t video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, float frames_per_second);
 
 class LocaleGuard
 {