Updated fr_FR translation from Thierry Journet.

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

diff --git a/src/lib/content.h b/src/lib/content.h
index bb66bc1416233c322705fd6f07e4969182dd752c..4c1d55765b6d07484e57455926ab6885b661580c 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -135,7 +135,7 @@ public:
                return _digest;
        }
 
-       void set_position (boost::shared_ptr<const Film> film, DCPTime);
+       void set_position (boost::shared_ptr<const Film> film, DCPTime, bool force_emit = false);
 
        /** DCPTime that this content starts; i.e. the time that the first
         *  bit of the content (trimmed or not) will happen.
@@ -180,11 +180,11 @@ public:
                _change_signals_frequent = f;
        }
 
-       std::list<UserProperty> user_properties () const;
+       std::list<UserProperty> user_properties (boost::shared_ptr<const Film> film) const;
 
        std::string calculate_digest () const;
 
-       /* CHANGE_PENDING and CHANGE_CANCELLED may be emitted from any thread; CHANGE_DONE always from GUI thread */
+       /* CHANGE_TYPE_PENDING and CHANGE_TYPE_CANCELLED may be emitted from any thread; CHANGE_TYPE_DONE always from GUI thread */
        boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> Change;
 
        boost::shared_ptr<VideoContent> video;
@@ -196,7 +196,7 @@ public:
 
 protected:
 
-       virtual void add_properties (std::list<UserProperty> &) const;
+       virtual void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
        /** _mutex which should be used to protect accesses, as examine
         *  jobs can update content state in threads other than the main one.