X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ffilm.h;h=e5d29145c8761a25705fd7f92989c20cbf952f41;hb=30b0bd88a811753061d02945e95d0424229bc1a7;hp=b77ce7a7651099dfd4334381002613b824207af4;hpb=9fa17d52810490359f899cc0cbdb4c25ac74bc92;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index b77ce7a76..e5d29145c 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -200,7 +200,9 @@ public: REEL_TYPE, REEL_LENGTH, UPLOAD_AFTER_MAKE_DCP, - REENCODE_J2K + REENCODE_J2K, + MARKERS, + RATINGS }; @@ -296,6 +298,14 @@ public: return _reencode_j2k; } + boost::optional marker (dcp::Marker type) const; + std::map markers () const { + return _markers; + } + + std::vector ratings () const { + return _ratings; + } /* SET */ @@ -327,6 +337,9 @@ public: void set_reel_length (int64_t); void set_upload_after_make_dcp (bool); void set_reencode_j2k (bool); + void set_marker (dcp::Marker type, DCPTime time); + void unset_marker (dcp::Marker type); + void set_ratings (std::vector r); /** Emitted when some property has of the Film is about to change or has changed */ mutable boost::signals2::signal Change; @@ -406,6 +419,8 @@ private: bool _reencode_j2k; /** true if the user has ever explicitly set the video frame rate of this film */ bool _user_explicit_video_frame_rate; + std::map _markers; + std::vector _ratings; int _state_version; @@ -414,7 +429,6 @@ private: /** film being used as a template, or 0 */ boost::shared_ptr _template_film; - boost::signals2::scoped_connection _playlist_change_connection; boost::signals2::scoped_connection _playlist_order_changed_connection; boost::signals2::scoped_connection _playlist_content_change_connection;