Make Content::_paths private.

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 7a808828939deeab28e9f80b0ebfe9a53d77ee22..9e7beee33c71d27de11262f8ece3639791e32816 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -23,6 +23,7 @@
  */
 
 #include "content.h"
+#include "change_signaller.h"
 #include "util.h"
 #include "content_factory.h"
 #include "video_content.h"
@@ -86,7 +87,7 @@ Content::Content (shared_ptr<const Film> film, boost::filesystem::path p)
        , _trim_end (0)
        , _change_signals_frequent (false)
 {
-       _paths.push_back (p);
+       add_path (p);
 }
 
 Content::Content (shared_ptr<const Film> film, cxml::ConstNodePtr node)
@@ -144,8 +145,8 @@ Content::as_xml (xmlpp::Node* node, bool with_paths) const
        boost::mutex::scoped_lock lm (_mutex);
 
        if (with_paths) {
-               for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
-                       node->add_child("Path")->add_child_text (i->string ());
+               BOOST_FOREACH (boost::filesystem::path i, _paths) {
+                       node->add_child("Path")->add_child_text (i.string());
                }
        }
        node->add_child("Digest")->add_child_text (_digest);
@@ -179,10 +180,14 @@ Content::examine (shared_ptr<Job> job)
 }
 
 void
-Content::signal_changed (int p)
+Content::signal_change (ChangeType c, int p)
 {
        try {
-               emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent));
+               if (c == CHANGE_TYPE_PENDING || c == CHANGE_TYPE_CANCELLED) {
+                       Change (c, shared_from_this(), p, _change_signals_frequent);
+               } else {
+                       emit (boost::bind (boost::ref(Change), c, shared_from_this(), p, _change_signals_frequent));
+               }
        } catch (boost::bad_weak_ptr) {
                /* This must be during construction; never mind */
        }
@@ -191,48 +196,59 @@ Content::signal_changed (int p)
 void
 Content::set_position (DCPTime p)
 {
-       /* video content can modify its position */
+       /* video and audio content can modify its position */
+
        if (video) {
                video->modify_position (p);
        }
 
+       if (audio) {
+               audio->modify_position (p);
+       }
+
+       ChangeSignaller<Content> cc (this, ContentProperty::POSITION);
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                if (p == _position) {
+                       cc.abort ();
                        return;
                }
 
                _position = p;
        }
-
-       signal_changed (ContentProperty::POSITION);
 }
 
 void
 Content::set_trim_start (ContentTime t)
 {
-       /* video content can modify its start trim */
+       /* video and audio content can modify its start trim */
+
        if (video) {
                video->modify_trim_start (t);
        }
 
+       if (audio) {
+               audio->modify_trim_start (t);
+       }
+
+       ChangeSignaller<Content> cc (this, ContentProperty::TRIM_START);
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                _trim_start = t;
        }
-
-       signal_changed (ContentProperty::TRIM_START);
 }
 
 void
 Content::set_trim_end (ContentTime t)
 {
+       ChangeSignaller<Content> cc (this, ContentProperty::TRIM_END);
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                _trim_end = t;
        }
-
-       signal_changed (ContentProperty::TRIM_END);
 }
 
 
@@ -283,8 +299,8 @@ Content::identifier () const
 bool
 Content::paths_valid () const
 {
-       for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
-               if (!boost::filesystem::exists (*i)) {
+       BOOST_FOREACH (boost::filesystem::path i, _paths) {
+               if (!boost::filesystem::exists (i)) {
                        return false;
                }
        }
@@ -292,19 +308,15 @@ Content::paths_valid () const
        return true;
 }
 
-void
-Content::set_path (boost::filesystem::path path)
-{
-       _paths.clear ();
-       _paths.push_back (path);
-       signal_changed (ContentProperty::PATH);
-}
-
 void
 Content::set_paths (vector<boost::filesystem::path> paths)
 {
-       _paths = paths;
-       signal_changed (ContentProperty::PATH);
+       ChangeSignaller<Content> cc (this, ContentProperty::PATH);
+
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               _paths = paths;
+       }
 }
 
 string
@@ -354,16 +366,15 @@ Content::reel_split_points () const
 void
 Content::set_video_frame_rate (double r)
 {
+       ChangeSignaller<Content> cc (this, ContentProperty::VIDEO_FRAME_RATE);
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                _video_frame_rate = r;
        }
 
-       signal_changed (ContentProperty::VIDEO_FRAME_RATE);
-
-       /* Make sure things are still on frame boundaries */
+       /* Make sure trim is still on a frame boundary */
        if (video) {
-               set_position (position());
                set_trim_start (trim_start());
        }
 }
@@ -371,12 +382,12 @@ Content::set_video_frame_rate (double r)
 void
 Content::unset_video_frame_rate ()
 {
+       ChangeSignaller<Content> cc (this, ContentProperty::VIDEO_FRAME_RATE);
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                _video_frame_rate = optional<double>();
        }
-
-       signal_changed (ContentProperty::VIDEO_FRAME_RATE);
 }
 
 double
@@ -437,9 +448,9 @@ Content::take_settings_from (shared_ptr<const Content> c)
                audio->take_settings_from (c->audio);
        }
 
-       list<shared_ptr<TextContent> >::iterator i = caption.begin ();
-       list<shared_ptr<TextContent> >::const_iterator j = c->caption.begin ();
-       while (i != caption.end() && j != c->caption.end()) {
+       list<shared_ptr<TextContent> >::iterator i = text.begin ();
+       list<shared_ptr<TextContent> >::const_iterator j = c->text.begin ();
+       while (i != text.end() && j != c->text.end()) {
                (*i)->take_settings_from (*j);
                ++i;
                ++j;
@@ -447,19 +458,19 @@ Content::take_settings_from (shared_ptr<const Content> c)
 }
 
 shared_ptr<TextContent>
-Content::only_caption () const
+Content::only_text () const
 {
-       DCPOMATIC_ASSERT (caption.size() < 2);
-       if (caption.empty ()) {
+       DCPOMATIC_ASSERT (text.size() < 2);
+       if (text.empty ()) {
                return shared_ptr<TextContent> ();
        }
-       return caption.front ();
+       return text.front ();
 }
 
 shared_ptr<TextContent>
-Content::caption_of_original_type (TextType type) const
+Content::text_of_original_type (TextType type) const
 {
-       BOOST_FOREACH (shared_ptr<TextContent> i, caption) {
+       BOOST_FOREACH (shared_ptr<TextContent> i, text) {
                if (i->original_type() == type) {
                        return i;
                }
@@ -467,3 +478,10 @@ Content::caption_of_original_type (TextType type) const
 
        return shared_ptr<TextContent> ();
 }
+
+void
+Content::add_path (boost::filesystem::path p)
+{
+       boost::mutex::scoped_lock lm (_mutex);
+       _paths.push_back (p);
+}