Cleanup: make things a little clearer.

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 567cd5c1f78c68901ef13cdbfcf6ff49ed81fc34..0ce87ed9be0a192ec6923036f724b9d33abe7cd0 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -27,11 +27,12 @@
 #ifndef DCPOMATIC_CONTENT_H
 #define DCPOMATIC_CONTENT_H
 
-#include "types.h"
-#include "signaller.h"
-#include "dcpomatic_time.h"
+
 #include "change_signaller.h"
+#include "dcpomatic_time.h"
+#include "signaller.h"
 #include "user_property.h"
+#include "text_type.h"
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
@@ -49,6 +50,9 @@ namespace cxml {
 class Job;
 class Film;
 class AtmosContent;
+class AudioContent;
+class TextContent;
+class VideoContent;
 
 class ContentProperty
 {
@@ -152,7 +156,7 @@ public:
                return _position;
        }
 
-       void set_trim_start (dcpomatic::ContentTime);
+       void set_trim_start(std::shared_ptr<const Film> film, dcpomatic::ContentTime);
 
        dcpomatic::ContentTime trim_start () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -171,6 +175,10 @@ public:
                return position() + length_after_trim(film);
        }
 
+       dcpomatic::DCPTimePeriod period(std::shared_ptr<const Film> film) const {
+               return { position(), end(film) };
+       }
+
        dcpomatic::DCPTime length_after_trim (std::shared_ptr<const Film> film) const;
 
        boost::optional<double> video_frame_rate () const {
@@ -178,7 +186,7 @@ public:
                return _video_frame_rate;
        }
 
-       void set_video_frame_rate (double r);
+       void set_video_frame_rate(std::shared_ptr<const Film> film, double r);
        void unset_video_frame_rate ();
 
        double active_video_frame_rate (std::shared_ptr<const Film> film) const;
@@ -191,17 +199,24 @@ public:
 
        std::string calculate_digest () const;
 
-       /* CHANGE_TYPE_PENDING and CHANGE_TYPE_CANCELLED may be emitted from any thread; CHANGE_TYPE_DONE always from GUI thread */
+       virtual bool can_be_played () const {
+               return true;
+       }
+
+       /* ChangeType::PENDING and ChangeType::CANCELLED may be emitted from any thread; ChangeType::DONE always from GUI thread */
        boost::signals2::signal<void (ChangeType, std::weak_ptr<Content>, int, bool)> Change;
 
        std::shared_ptr<VideoContent> video;
        std::shared_ptr<AudioContent> audio;
-       std::list<std::shared_ptr<TextContent>> text;
+       std::vector<std::shared_ptr<TextContent>> text;
        std::shared_ptr<AtmosContent> atmos;
 
        std::shared_ptr<TextContent> only_text () const;
        std::shared_ptr<TextContent> text_of_original_type (TextType type) const;
 
+       /** @return true if this content has changed since it was last examined */
+       bool changed () const;
+
 protected:
 
        virtual void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty> &) const;
@@ -218,6 +233,7 @@ private:
        friend struct best_dcp_frame_rate_test_single;
        friend struct best_dcp_frame_rate_test_double;
        friend struct audio_sampling_rate_test;
+       friend struct subtitle_font_id_change_test2;
        template<class, class> friend class ChangeSignaller;
 
        void signal_change (ChangeType, int);
@@ -235,7 +251,7 @@ private:
         *  else (either some video happening at the same time, or the rate of the DCP).
         */
        boost::optional<double> _video_frame_rate;
-       bool _change_signals_frequent;
+       bool _change_signals_frequent = false;
 };