Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 2e4e77f8d6e6fcbcd3f5eb65bb0f99eab5aed818..3814956d581951c3057a1112b6d9bfef5d0824a0 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -27,7 +27,7 @@
 #include "content_factory.h"
 #include "video_content.h"
 #include "audio_content.h"
-#include "subtitle_content.h"
+#include "text_content.h"
 #include "exceptions.h"
 #include "film.h"
 #include "job.h"
@@ -182,7 +182,7 @@ void
 Content::signal_changed (int p)
 {
        try {
-               emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent));
+               emit (boost::bind (boost::ref(Changed), shared_from_this(), p, _change_signals_frequent));
        } catch (boost::bad_weak_ptr) {
                /* This must be during construction; never mind */
        }
@@ -191,48 +191,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);
+       }
+
+       ContentChange 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);
+       }
+
+       ContentChange 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)
 {
+       ContentChange cc (this, ContentProperty::TRIM_END);
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                _trim_end = t;
        }
-
-       signal_changed (ContentProperty::TRIM_END);
 }
 
 
@@ -295,16 +306,16 @@ Content::paths_valid () const
 void
 Content::set_path (boost::filesystem::path path)
 {
+       ContentChange cc (this, ContentProperty::PATH);
        _paths.clear ();
        _paths.push_back (path);
-       signal_changed (ContentProperty::PATH);
 }
 
 void
 Content::set_paths (vector<boost::filesystem::path> paths)
 {
+       ContentChange cc (this, ContentProperty::PATH);
        _paths = paths;
-       signal_changed (ContentProperty::PATH);
 }
 
 string
@@ -354,13 +365,13 @@ Content::reel_split_points () const
 void
 Content::set_video_frame_rate (double r)
 {
+       ContentChange 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 */
        if (video) {
                set_position (position());
@@ -371,12 +382,12 @@ Content::set_video_frame_rate (double r)
 void
 Content::unset_video_frame_rate ()
 {
+       ContentChange cc (this, ContentProperty::VIDEO_FRAME_RATE);
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                _video_frame_rate = optional<double>();
        }
-
-       signal_changed (ContentProperty::VIDEO_FRAME_RATE);
 }
 
 double
@@ -436,7 +447,34 @@ Content::take_settings_from (shared_ptr<const Content> c)
        if (audio && c->audio) {
                audio->take_settings_from (c->audio);
        }
-       if (subtitle && c->subtitle) {
-               subtitle->take_settings_from (c->subtitle);
+
+       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;
+       }
+}
+
+shared_ptr<TextContent>
+Content::only_text () const
+{
+       DCPOMATIC_ASSERT (text.size() < 2);
+       if (text.empty ()) {
+               return shared_ptr<TextContent> ();
        }
+       return text.front ();
+}
+
+shared_ptr<TextContent>
+Content::text_of_original_type (TextType type) const
+{
+       BOOST_FOREACH (shared_ptr<TextContent> i, text) {
+               if (i->original_type() == type) {
+                       return i;
+               }
+       }
+
+       return shared_ptr<TextContent> ();
 }