X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=28af8ef2f88c41bcfbdb8bad30806248ff98af35;hb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;hp=c68bb4f1619614b29e91b9ceb7f45c88898547b1;hpb=d0d584a7dde6de383302615634fdee17e9724fe8;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index c68bb4f16..28af8ef2f 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -31,7 +31,8 @@
 #include <boost/asio.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/util.h>
+#include <dcp/util.h>
+#include <dcp/signer.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
@@ -40,21 +41,21 @@ extern "C" {
 #include "types.h"
 #include "video_content.h"
 
-#ifdef DCPOMATIC_DEBUG
-#define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
-#else
-#define TIMING(...)
-#endif
-
 #undef check
 
-/** The maximum number of audio channels that we can cope with */
-#define MAX_AUDIO_CHANNELS 6
+/** The maximum number of audio channels that we can have in a DCP */
+#define MAX_DCP_AUDIO_CHANNELS 12
+
+#define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way"
+
+namespace libdcp {
+	class Signer;
+}
 
-class Scaler;
+class Job;
+struct AVSubtitle;
 
 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 ();
@@ -62,60 +63,30 @@ 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
-
-struct FrameRateConversion
-{
-	FrameRateConversion (float, int);
-
-	/** @return factor by which to multiply a source frame rate
-	    to get the effective rate after any skip or repeat has happened.
-	*/
-	float factor () const {
-		if (skip) {
-			return 0.5;
-		} else if (repeat) {
-			return 2;
-		}
-
-		return 1;
-	}
-
-	/** true to skip every other frame */
-	bool skip;
-	/** true to repeat every frame once */
-	bool 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
-	 *  but not if
-	 *          source is 15.00fps, DCP is 30fps
-	 *          source is 12.50fps, DCP is 25fps)
-	 */
-	bool change_speed;
-
-	std::string description;
-};
-
-extern std::string crop_string (Position, libdcp::Size);
+extern std::string tidy_for_filename (std::string);
+extern boost::shared_ptr<const dcp::Signer> make_signer ();
+extern dcp::Size fit_ratio_within (float ratio, dcp::Size);
+extern std::string entities_to_text (std::string e);
+extern std::map<std::string, std::string> split_get_request (std::string url);
 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);
 extern std::string get_required_string (std::multimap<std::string, std::string> const & kv, std::string k);
 extern int get_optional_int (std::multimap<std::string, std::string> const & kv, std::string k);
 extern std::string get_optional_string (std::multimap<std::string, std::string> const & kv, std::string k);
+extern void* wrapped_av_malloc (size_t);
+extern int64_t divide_with_round (int64_t a, int64_t b);
+extern ContentTimePeriod subtitle_period (AVSubtitle const &);
 
 /** @class Socket
  *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things
@@ -128,13 +99,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);
@@ -150,21 +123,34 @@ 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 (VideoContent::Frame v, float audio_sample_rate, float frames_per_second);
 
-class LocaleGuard
+/** @class ScopedTemporary
+ *  @brief A temporary file which is deleted when the ScopedTemporary object goes out of scope.
+ */
+class ScopedTemporary
 {
 public:
-	LocaleGuard ();
-	~LocaleGuard ();
-	
+	ScopedTemporary ();
+	~ScopedTemporary ();
+
+	/** @return temporary filename */
+	boost::filesystem::path file () const {
+		return _file;
+	}
+
+	char const * c_str () const;
+	FILE* open (char const *);
+	void close ();
+
 private:
-	char* _old;
+	boost::filesystem::path _file;
+	FILE* _open;
 };
 
-
 #endif