Fix potential crash if maybe_add_text() fails.

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

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 65bed29bc91bd55b7ab16ce4ad3937ee151527bc..473dbae36df5f16d7f3f4b0079a685bfc988be54 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -144,10 +144,30 @@ public:
                return _content_kind;
        }
 
+       dcp::Standard standard () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               DCPOMATIC_ASSERT (_standard);
+               return _standard.get ();
+       }
+
+       std::map<dcp::Marker, dcpomatic::ContentTime> markers () const {
+               return _markers;
+       }
+
        bool kdm_timing_window_valid () const;
 
+       Resolution resolution () const;
+
+       std::vector<dcp::Rating> ratings () const {
+               return _ratings;
+       }
+
+       std::vector<std::string> content_versions () const {
+               return _content_versions;
+       }
+
 private:
-       friend class reels_test5;
+       friend struct reels_test5;
 
        void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
 
@@ -192,6 +212,9 @@ private:
        boost::optional<std::string> _cpl;
        /** List of the lengths of the reels in this DCP */
        std::list<int64_t> _reel_lengths;
+       std::map<dcp::Marker, dcpomatic::ContentTime> _markers;
+       std::vector<dcp::Rating> _ratings;
+       std::vector<std::string> _content_versions;
 };
 
 #endif