X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=484c4fb9ba012edb895b0c466f484af2028bd2d8;hb=a0c0e609f7fbff8513135428378cc16684bae937;hp=eebcf89af045e7bd63f8c634b82d3dcd58a0913b;hpb=e271f7ab5ff943f90e1443f72f914aa9332cd034;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index eebcf89af..484c4fb9b 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -69,9 +69,6 @@ extern "C" {
 #ifdef DCPOMATIC_WINDOWS
 #include "stack.hpp"
 #endif
-#ifdef DCPOMATIC_OSX
-#include <ltdl.h>
-#endif
 
 #include "i18n.h"
 
@@ -93,6 +90,7 @@ using std::istream;
 using std::numeric_limits;
 using std::pair;
 using std::ofstream;
+using std::cout;
 using boost::shared_ptr;
 using boost::thread;
 using boost::lexical_cast;
@@ -288,8 +286,6 @@ dcpomatic_setup ()
 	*/
 	boost::filesystem::path lib = app_contents ();
 	lib /= "lib";
-	std::cout << "adding search dir " << lib.c_str() << "\n";
-//	lt_dladdsearchdir (lib.c_str ());
 	setenv ("LTDL_LIBRARY_PATH", lib.c_str (), 1);
 #endif	
 
@@ -523,17 +519,27 @@ dcp_audio_frame_rate (int fs)
 Socket::Socket (int timeout)
 	: _deadline (_io_service)
 	, _socket (_io_service)
+	, _acceptor (0)
 	, _timeout (timeout)
 {
 	_deadline.expires_at (boost::posix_time::pos_infin);
 	check ();
 }
 
+Socket::~Socket ()
+{
+	delete _acceptor;
+}
+
 void
 Socket::check ()
 {
 	if (_deadline.expires_at() <= boost::asio::deadline_timer::traits_type::now ()) {
-		_socket.close ();
+		if (_acceptor) {
+			_acceptor->cancel ();
+		} else {
+			_socket.close ();
+		}
 		_deadline.expires_at (boost::posix_time::pos_infin);
 	}
 
@@ -544,7 +550,7 @@ Socket::check ()
  *  @param endpoint End-point to connect to.
  */
 void
-Socket::connect (boost::asio::ip::basic_resolver_entry<boost::asio::ip::tcp> const & endpoint)
+Socket::connect (boost::asio::ip::tcp::endpoint endpoint)
 {
 	_deadline.expires_from_now (boost::posix_time::seconds (_timeout));
 	boost::system::error_code ec = boost::asio::error::would_block;
@@ -553,11 +559,35 @@ Socket::connect (boost::asio::ip::basic_resolver_entry<boost::asio::ip::tcp> con
 		_io_service.run_one();
 	} while (ec == boost::asio::error::would_block);
 
-	if (ec || !_socket.is_open ()) {
+	if (ec) {
+		throw NetworkError (ec.message ());
+	}
+
+	if (!_socket.is_open ()) {
 		throw NetworkError (_("connect timed out"));
 	}
 }
 
+void
+Socket::accept (int port)
+{
+	_acceptor = new boost::asio::ip::tcp::acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port));
+	
+	_deadline.expires_from_now (boost::posix_time::seconds (_timeout));
+	boost::system::error_code ec = boost::asio::error::would_block;
+	_acceptor->async_accept (_socket, boost::lambda::var(ec) = boost::lambda::_1);
+	do {
+		_io_service.run_one ();
+	} while (ec == boost::asio::error::would_block );
+
+	delete _acceptor;
+	_acceptor = 0;
+	
+	if (ec) {
+		throw NetworkError (ec.message ());
+	}
+}
+
 /** Blocking write.
  *  @param data Buffer to write.
  *  @param size Number of bytes to write.
@@ -749,7 +779,7 @@ audio_channel_name (int c)
 	assert (MAX_AUDIO_CHANNELS == 6);
 
 	/* TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency
-	   enhancement channel (sub-woofer)./
+	   enhancement channel (sub-woofer).
 	*/
 	string const channels[] = {
 		_("Left"),
@@ -765,24 +795,33 @@ audio_channel_name (int c)
 
 FrameRateConversion::FrameRateConversion (float source, int dcp)
 	: skip (false)
-	, repeat (false)
+	, repeat (1)
 	, change_speed (false)
 {
-	if (fabs (source / 2.0 - dcp) < (fabs (source - dcp))) {
+	if (fabs (source / 2.0 - dcp) < fabs (source - dcp)) {
+		/* The difference between source and DCP frame rate will be lower
+		   (i.e. better) if we skip.
+		*/
 		skip = true;
 	} else if (fabs (source * 2 - dcp) < fabs (source - dcp)) {
-		repeat = true;
+		/* The difference between source and DCP frame rate would be better
+		   if we repeated each frame once; it may be better still if we
+		   repeated more than once.  Work out the required repeat.
+		*/
+		repeat = round (dcp / source);
 	}
 
 	change_speed = !about_equal (source * factor(), dcp);
 
-	if (!skip && !repeat && !change_speed) {
+	if (!skip && repeat == 1 && !change_speed) {
 		description = _("Content and DCP have the same rate.\n");
 	} else {
 		if (skip) {
 			description = _("DCP will use every other frame of the content.\n");
-		} else if (repeat) {
+		} else if (repeat == 2) {
 			description = _("Each content frame will be doubled in the DCP.\n");
+		} else if (repeat > 2) {
+			description = String::compose (_("Each content frame will be repeated %1 more times in the DCP.\n"), repeat - 1);
 		}
 
 		if (change_speed) {
@@ -887,3 +926,12 @@ make_signer ()
 	return shared_ptr<const libdcp::Signer> (new libdcp::Signer (chain, signer_key));
 }
 
+libdcp::Size
+fit_ratio_within (float ratio, libdcp::Size full_frame)
+{
+	if (ratio < full_frame.ratio ()) {
+		return libdcp::Size (rint (full_frame.height * ratio), full_frame.height);
+	}
+	
+	return libdcp::Size (full_frame.width, rint (full_frame.width / ratio));
+}