Forward frequent parameter from Playlist::ContentChanged through Film::ContentChanged.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 66d651c27e06825c94425a61c55883e68da2fec0..19aa6ae9b344e36ef64277f19de0e21585ae49a3 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -136,7 +136,7 @@ Film::Film (boost::filesystem::path dir, bool log)
        set_isdcf_date_today ();
 
        _playlist_changed_connection = _playlist->Changed.connect (bind (&Film::playlist_changed, this));
-       _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Film::playlist_content_changed, this, _1, _2));
+       _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Film::playlist_content_changed, this, _1, _2, _3));
        
        /* Make state.directory a complete path without ..s (where possible)
           (Code swiped from Adam Bowen on stackoverflow)
@@ -1019,7 +1019,7 @@ Film::active_frame_rate_change (DCPTime t) const
 }
 
 void
-Film::playlist_content_changed (boost::weak_ptr<Content> c, int p)
+Film::playlist_content_changed (boost::weak_ptr<Content> c, int p, bool frequent)
 {
        if (p == VideoContentProperty::VIDEO_FRAME_RATE) {
                set_video_frame_rate (_playlist->best_dcp_frame_rate ());
@@ -1027,7 +1027,7 @@ Film::playlist_content_changed (boost::weak_ptr<Content> c, int p)
                signal_changed (NAME);
        }
 
-       emit (boost::bind (boost::ref (ContentChanged), c, p));
+       emit (boost::bind (boost::ref (ContentChanged), c, p, frequent));
 }
 
 void

diff --git a/src/lib/film.h b/src/lib/film.h
index 96a79f9cf5abfd6179922da03e376e0a2aac472c..fb75504a2aecfbdaf0e368deee2b23e5226a12ee 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -280,7 +280,7 @@ public:
        mutable boost::signals2::signal<void (Property)> Changed;
 
        /** Emitted when some property of our content has changed */
-       mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
+       mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
 
        /** Current version number of the state file */
        static int const current_state_version;
@@ -292,7 +292,7 @@ private:
        void signal_changed (Property);
        std::string video_identifier () const;
        void playlist_changed ();
-       void playlist_content_changed (boost::weak_ptr<Content>, int);
+       void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
        std::string filename_safe_name () const;
        void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);