X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=58c2771b7cebd8e46b9d700c3218041abd3dadd4;hb=308488324dbc4d8b709d3fb1dc9fee0479346c21;hp=fc17dc9443c920b2dd084c30eba7ca41273e3f69;hpb=a2e3a20a441e604550f0036ca198d5d2122e16a7;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index fc17dc944..58c2771b7 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>
@@ -48,8 +49,8 @@ extern "C" {
 
 #undef check
 
-/** The maximum number of audio channels that we can cope with */
-#define MAX_AUDIO_CHANNELS 8
+/** 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"
 
@@ -76,44 +77,10 @@ extern bool valid_image_file (boost::filesystem::path);
 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);
+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);
-
-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;
-		}
-
-		return repeat;
-	}
-
-	/** true to skip every other frame */
-	bool skip;
-	/** 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
-	 *  but not if
-	 *	    source is 15.00fps, DCP is 30fps
-	 *	    source is 12.50fps, DCP is 25fps)
-	 */
-	bool change_speed;
-
-	std::string description;
-};
-
 extern int dcp_audio_frame_rate (int);
 extern int stride_round_up (int, int const *, int);
 extern std::multimap<std::string, std::string> read_key_value (std::istream& s);
@@ -166,16 +133,28 @@ private:
 
 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