Try to fix deadlock.

[dcpomatic.git] / src / lib / types.h

diff --git a/src/lib/types.h b/src/lib/types.h
index 67384103d2145ab42b1f888459cd94890ecb7f5b..458a2ecf3a21377b1bc4e3f91cb5186416741360 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -29,9 +29,10 @@ class Content;
 
 typedef int64_t Time;
 #define TIME_MAX INT64_MAX
-#define TIME_HZ  ((Time) 96000)
+#define TIME_HZ         ((Time) 96000)
 typedef int64_t OutputAudioFrame;
-typedef int     OutputVideoFrame;
+typedef int    OutputVideoFrame;
+typedef std::vector<boost::shared_ptr<Content> > ContentList;
 
 /** @struct Crop
  *  @brief A description of the crop of an image or video.
@@ -53,4 +54,12 @@ struct Crop
 extern bool operator== (Crop const & a, Crop const & b);
 extern bool operator!= (Crop const & a, Crop const & b);
 
+enum Resolution {
+       RESOLUTION_2K,
+       RESOLUTION_4K
+};
+
+std::string resolution_to_string (Resolution);
+Resolution string_to_resolution (std::string);
+
 #endif