Fix assertion failure on opening content properties (#816).

[dcpomatic.git] / src / lib / content.cc

diff --git a/src/lib/content.cc b/src/lib/content.cc
index f0d35186abde70627236c808658a4126f70aa1b0..724cabb6c6ce28f4bf1d5057e08dc062ab07b525 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -28,10 +28,12 @@
 #include "film.h"
 #include "safe_stringstream.h"
 #include "job.h"
+#include "compose.hpp"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/thread/mutex.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -221,13 +223,11 @@ Content::technical_summary () const
 DCPTime
 Content::length_after_trim () const
 {
-       shared_ptr<const Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film->active_frame_rate_change (position ())));
+       return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film()->active_frame_rate_change (position ())));
 }
 
-/** @return string which includes everything about how this content affects
- *  its playlist.
+/** @return string which changes when something about this content changes which affects
+ *  the appearance of its video.
  */
 string
 Content::identifier () const
@@ -277,13 +277,29 @@ Content::path_summary () const
        return s;
 }
 
-/** @return a list of properties that might be interesting to the user; first string is the property name,
- *  second is the value.
- */
-list<pair<string, string> >
-Content::properties () const
+/** @return a list of properties that might be interesting to the user */
+list<Content::UserProperty>
+Content::user_properties () const
 {
-       list<pair<string, string> > p;
+       list<UserProperty> p;
        add_properties (p);
        return p;
 }
+
+shared_ptr<const Film>
+Content::film () const
+{
+       shared_ptr<const Film> film = _film.lock ();
+       DCPOMATIC_ASSERT (film);
+       return film;
+}
+
+/** @return DCP times of points within this content where a reel split could occur */
+list<DCPTime>
+Content::reel_split_points () const
+{
+       list<DCPTime> t;
+       /* XXX: this is questionable; perhaps the position itself should be forced to be on a frame boundary */
+       t.push_back (position().round_up (film()->video_frame_rate()));
+       return t;
+}