Use the correct font to render subtitles in preview / burn-in (#663).

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 6ee9e59dd289fd15c0eff15258d15a9916bdc9f2..b7f7987ef4fa0d79783df8a56d869f52fedfabf8 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -84,6 +84,8 @@ public:
        virtual DCPTime full_length () const = 0;
        virtual std::string identifier () const;
 
+       std::list<std::pair<std::string, std::string> > properties () const;
+
        boost::shared_ptr<Content> clone () const;
 
        void set_path (boost::filesystem::path);
@@ -126,16 +128,16 @@ public:
                return _position;
        }
 
-       void set_trim_start (DCPTime);
+       void set_trim_start (ContentTime);
 
-       DCPTime trim_start () const {
+       ContentTime trim_start () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _trim_start;
        }
 
-       void set_trim_end (DCPTime);
+       void set_trim_end (ContentTime);
 
-       DCPTime trim_end () const {
+       ContentTime trim_end () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _trim_end;
        }
@@ -159,6 +161,7 @@ public:
 
 protected:
        void signal_changed (int);
+       virtual void add_properties (std::list<std::pair<std::string, std::string> > &) const {}
 
        boost::weak_ptr<const Film> _film;
 
@@ -173,8 +176,8 @@ protected:
 private:
        std::string _digest;
        DCPTime _position;
-       DCPTime _trim_start;
-       DCPTime _trim_end;
+       ContentTime _trim_start;
+       ContentTime _trim_end;
        bool _change_signals_frequent;
 };