X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=23ebd52bcf0ed85b8a16f7de262f6c70a9c16bf0;hb=7f203e4df9ca94a44099c26158c6c81b5299567f;hp=22c6ea95baafa4f1f2cb545c5f20468b2b5e5b80;hpb=dd7cf1ef6e860243b80f4c47a99393244f63a3d5;p=dcpomatic.git

diff --git a/src/lib/util.h b/src/lib/util.h
index 22c6ea95b..23ebd52bc 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -30,12 +30,14 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/asio.hpp>
 #include <boost/optional.hpp>
+#include <boost/filesystem.hpp>
 #include <libdcp/util.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
 #include "compose.hpp"
+#include "types.h"
 
 #ifdef DVDOMATIC_DEBUG
 #define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
@@ -54,17 +56,19 @@ extern void stacktrace (std::ostream &, int);
 extern std::string dependency_version_summary ();
 extern double seconds (struct timeval);
 extern void dvdomatic_setup ();
+extern void dvdomatic_setup_i18n (std::string);
 extern std::vector<std::string> split_at_spaces_considering_quotes (std::string);
-extern std::string md5_digest (std::string);
+extern std::string md5_digest (boost::filesystem::path);
 extern std::string md5_digest (void const *, int);
 extern void ensure_ui_thread ();
 extern std::string audio_channel_name (int);
+#ifdef DVDOMATIC_WINDOWS
+extern boost::filesystem::path mo_path ();
+#endif
 
-typedef int SourceFrame;
-
-struct DCPFrameRate
+struct FrameRateConversion
 {
-	DCPFrameRate (float);
+	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.
@@ -78,15 +82,13 @@ struct DCPFrameRate
 
 		return 1;
 	}
-	
-	/** frames per second for the DCP */
-	int frames_per_second;
+
 	/** 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'.
+	 *  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
@@ -95,88 +97,11 @@ struct DCPFrameRate
 	 *          source is 12.50fps, DCP is 25fps)
 	 */
 	bool change_speed;
-};
 
-enum ContentType {
-	STILL, ///< content is still images
-	VIDEO  ///< content is a video
+	std::string description;
 };
 
-/** @struct Crop
- *  @brief A description of the crop of an image or video.
- */
-struct Crop
-{
-	Crop () : left (0), right (0), top (0), bottom (0) {}
-
-	/** Number of pixels to remove from the left-hand side */
-	int left;
-	/** Number of pixels to remove from the right-hand side */
-	int right;
-	/** Number of pixels to remove from the top */
-	int top;
-	/** Number of pixels to remove from the bottom */
-	int bottom;
-};
-
-extern bool operator== (Crop const & a, Crop const & b);
-extern bool operator!= (Crop const & a, Crop const & b);
-
-/** @struct Position
- *  @brief A position.
- */
-struct Position
-{
-	Position ()
-		: x (0)
-		, y (0)
-	{}
-
-	Position (int x_, int y_)
-		: x (x_)
-		, y (y_)
-	{}
-
-	/** x coordinate */
-	int x;
-	/** y coordinate */
-	int y;
-};
-
-/** @struct Rect
- *  @brief A rectangle.
- */
-struct Rect
-{
-	Rect ()
-		: x (0)
-		, y (0)
-		, width (0)
-		, height (0)
-	{}
-
-	Rect (int x_, int y_, int w_, int h_)
-		: x (x_)
-		, y (y_)
-		, width (w_)
-		, height (h_)
-	{}
-
-	int x;
-	int y;
-	int width;
-	int height;
-
-	Position position () const {
-		return Position (x, y);
-	}
-
-	libdcp::Size size () const {
-		return libdcp::Size (width, height);
-	}
-
-	Rect intersection (Rect const & other) const;
-};
+int best_dcp_frame_rate (float);
 
 extern std::string crop_string (Position, libdcp::Size);
 extern int dcp_audio_sample_rate (int);
@@ -282,8 +207,7 @@ private:
 	int _source_channels;
 };
 
-extern int64_t video_frames_to_audio_frames (SourceFrame v, float audio_sample_rate, float frames_per_second);
-extern bool still_image_file (std::string);
+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 ();
 
 #endif