projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compiles; strange hang on adding content to a film.
[dcpomatic.git]
/
src
/
lib
/
types.h
diff --git
a/src/lib/types.h
b/src/lib/types.h
index c2bb9d8531d2ee1f8c5761ebd2f1827119a5d372..4b8b8072d909caa311db52b815da8c888f6448cf 100644
(file)
--- a/
src/lib/types.h
+++ b/
src/lib/types.h
@@
-21,14
+21,19
@@
#define DCPOMATIC_TYPES_H
#include <vector>
#define DCPOMATIC_TYPES_H
#include <vector>
+#include <stdint.h>
#include <boost/shared_ptr.hpp>
#include <libdcp/util.h>
class Content;
#include <boost/shared_ptr.hpp>
#include <libdcp/util.h>
class Content;
-typedef std::vector<boost::shared_ptr<Content> > ContentList;
typedef int64_t ContentAudioFrame;
typedef int64_t ContentAudioFrame;
-typedef int ContentVideoFrame;
+typedef int ContentVideoFrame;
+typedef int64_t Time;
+#define TIME_MAX INT64_MAX
+#define TIME_HZ 96000
+typedef int64_t OutputAudioFrame;
+typedef int OutputVideoFrame;
/** @struct Crop
* @brief A description of the crop of an image or video.
/** @struct Crop
* @brief A description of the crop of an image or video.
@@
-104,6
+109,8
@@
struct Rect
}
Rect intersection (Rect const & other) const;
}
Rect intersection (Rect const & other) const;
+
+ bool contains (Position) const;
};
#endif
};
#endif