diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-09-21 14:39:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-09-21 14:39:42 +0100 |
| commit | 2169abd0f6d569492122ad699253ab7c792f4969 (patch) | |
| tree | 0596a808dada6fdfb9ff9e50ab7054a509455867 /src/lib/dcp_content.h | |
| parent | ea491ba4ea7d5c4c575ae8b3d0415d78bbf32af6 (diff) | |
Disallow referencing DCPs of different frame rates to the project.
Fix reel calculations of DCPContent under trim.
Diffstat (limited to 'src/lib/dcp_content.h')
| -rw-r--r-- | src/lib/dcp_content.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h index 11096037c..f97045484 100644 --- a/src/lib/dcp_content.h +++ b/src/lib/dcp_content.h @@ -120,6 +120,8 @@ public: } private: + friend class reels_test5; + void add_properties (std::list<UserProperty>& p) const; void read_directory (boost::filesystem::path); |