Various improvements to the content properties dialogue (including #791).

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index af85e0ff08d17fcbf7fd4111ce27988d9fe405dd..724cabb6c6ce28f4bf1d5057e08dc062ab07b525 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -277,13 +277,11 @@ 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;
 }
@@ -295,3 +293,13 @@ Content::film () const
        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;
+}