diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-04 14:52:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-04 14:52:43 +0000 |
| commit | d9f9938c2ca2a1f9b27a85bf64a50d7f480f969b (patch) | |
| tree | 5a3c0abf1813983324e57c896deff490055d311e /src/lib/util.h | |
| parent | b4dd5979b6c1d48b0af4fefd9d1df4e9947da402 (diff) | |
| parent | c366d41af080b9ac37117a9b27a249722c77f74e (diff) | |
Merge master.
Diffstat (limited to 'src/lib/util.h')
| -rw-r--r-- | src/lib/util.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/util.h b/src/lib/util.h index 1af650085..26c6ed9fa 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -54,6 +54,13 @@ extern std::string md5_digest (std::string); extern std::string md5_digest (void const *, int); extern void ensure_ui_thread (); +struct DCPFrameRate +{ + int frames_per_second; + int skip; + bool run_fast; +}; + enum ContentType { STILL, VIDEO @@ -157,6 +164,7 @@ struct Rect extern std::string crop_string (Position, Size); extern int dcp_audio_sample_rate (int); +extern DCPFrameRate dcp_frame_rate (float); extern std::string colour_lut_index_to_name (int index); extern int round_up (int, int); extern std::multimap<std::string, std::string> read_key_value (std::istream& s); |