diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-14 14:23:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-14 14:23:50 +0100 |
| commit | 23b69b228ed5b34b59e1789de4bff052bc905ae4 (patch) | |
| tree | f2c4f3bdfd80d1fe3d3b3dc7800e2d2589693680 /src/lib/content.h | |
| parent | f509c806965f4a381eec454e7f55a70fd676f302 (diff) | |
Express trims using ContentTime so that they do not change
when DCP frame rate is changed (#637).
Diffstat (limited to 'src/lib/content.h')
| -rw-r--r-- | src/lib/content.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/content.h b/src/lib/content.h index 2deee9763..b7f7987ef 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -128,16 +128,16 @@ public: return _position; } - void set_trim_start (DCPTime); + void set_trim_start (ContentTime); - DCPTime trim_start () const { + ContentTime trim_start () const { boost::mutex::scoped_lock lm (_mutex); return _trim_start; } - void set_trim_end (DCPTime); + void set_trim_end (ContentTime); - DCPTime trim_end () const { + ContentTime trim_end () const { boost::mutex::scoped_lock lm (_mutex); return _trim_end; } @@ -176,8 +176,8 @@ protected: private: std::string _digest; DCPTime _position; - DCPTime _trim_start; - DCPTime _trim_end; + ContentTime _trim_start; + ContentTime _trim_end; bool _change_signals_frequent; }; |
