Remove unused define.

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 3c3942aa13c351bd18e9e595c503410d69b26e87..97edc7c892c33612263ae14b33e403d3a0b1bd11 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -66,7 +66,6 @@ int const ContentProperty::VIDEO_FRAME_RATE = 405;
 
 
 Content::Content ()
-       : _change_signals_frequent (false)
 {
 
 }
@@ -74,21 +73,18 @@ Content::Content ()
 
 Content::Content (DCPTime p)
        : _position (p)
-       , _change_signals_frequent (false)
 {
 
 }
 
 
 Content::Content (boost::filesystem::path p)
-       : _change_signals_frequent (false)
 {
        add_path (p);
 }
 
 
 Content::Content (cxml::ConstNodePtr node)
-       : _change_signals_frequent (false)
 {
        for (auto i: node->node_children("Path")) {
                _paths.push_back (i->content());
@@ -114,7 +110,6 @@ Content::Content (vector<shared_ptr<Content>> c)
        , _trim_start (c.front()->trim_start())
        , _trim_end (c.back()->trim_end())
        , _video_frame_rate (c.front()->video_frame_rate())
-       , _change_signals_frequent (false)
 {
        for (size_t i = 0; i < c.size(); ++i) {
                if (i > 0 && c[i]->trim_start() > ContentTime ()) {
@@ -169,15 +164,11 @@ Content::as_xml (xmlpp::Node* node, bool with_paths) const
 string
 Content::calculate_digest () const
 {
-       boost::mutex::scoped_lock lm (_mutex);
-       auto p = _paths;
-       lm.unlock ();
-
        /* Some content files are very big, so we use a poor man's
           digest here: a digest of the first and last 1e6 bytes with the
           size of the first file tacked on the end as a string.
        */
-       return digest_head_tail(p, 1000000) + raw_convert<string>(boost::filesystem::file_size(p.front()));
+       return simple_digest (paths());
 }
 
 
@@ -251,7 +242,7 @@ Content::set_position (shared_ptr<const Film> film, DCPTime p, bool force_emit)
 
 
 void
-Content::set_trim_start (ContentTime t)
+Content::set_trim_start(shared_ptr<const Film> film, ContentTime t)
 {
        DCPOMATIC_ASSERT (t.get() >= 0);
 
@@ -263,14 +254,18 @@ Content::set_trim_start (ContentTime t)
 
        /* See note in ::set_position */
        if (!video && audio) {
-               audio->modify_trim_start (t);
+               audio->modify_trim_start(film, t);
        }
 
        ContentChangeSignaller cc (this, ContentProperty::TRIM_START);
 
        {
                boost::mutex::scoped_lock lm (_mutex);
-               _trim_start = t;
+               if (_trim_start == t) {
+                       cc.abort();
+               } else {
+                       _trim_start = t;
+               }
        }
 }
 
@@ -411,7 +406,7 @@ Content::reel_split_points (shared_ptr<const Film>) const
 
 
 void
-Content::set_video_frame_rate (double r)
+Content::set_video_frame_rate(shared_ptr<const Film> film, double r)
 {
        ContentChangeSignaller cc (this, ContentProperty::VIDEO_FRAME_RATE);
 
@@ -425,7 +420,7 @@ Content::set_video_frame_rate (double r)
 
        /* Make sure trim is still on a frame boundary */
        if (video) {
-               set_trim_start (trim_start());
+               set_trim_start(film, trim_start());
        }
 }