Fix crashes on x-thread signal emission.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 2de06515965d785c0e5e4ccb5e6ef1a50a6914bb..f61062be0cc3bfde33d368e3c12e0941a90b79d9 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -29,6 +29,7 @@
 #include "types.h"
 #include "isdcf_metadata.h"
 #include "frame_rate_change.h"
+#include "signaller.h"
 #include "ratio.h"
 #include <dcp/key.h>
 #include <dcp/encrypted_kdm.h>
@@ -45,7 +46,6 @@ class Content;
 class Player;
 class Playlist;
 class AudioContent;
-class Scaler;
 class Screen;
 struct isdcf_name_test;
 
@@ -56,14 +56,14 @@ struct isdcf_name_test;
  *
  *  The content of a Film is held in a Playlist (created and managed by the Film).
  */
-class Film : public boost::enable_shared_from_this<Film>, public boost::noncopyable
+class Film : public boost::enable_shared_from_this<Film>, public Signaller, public boost::noncopyable
 {
 public:
        Film (boost::filesystem::path, bool log = true);
+       ~Film ();
 
-       boost::filesystem::path info_dir () const;
+       boost::filesystem::path info_file () const;
        boost::filesystem::path j2c_path (int, Eyes, bool) const;
-       boost::filesystem::path info_path (int, Eyes) const;
        boost::filesystem::path internal_video_mxf_dir () const;
        boost::filesystem::path internal_video_mxf_filename () const;
        boost::filesystem::path audio_analysis_dir () const;
@@ -82,8 +82,6 @@ public:
                return _log;
        }
 
-       int encoded_frames () const;
-       
        boost::filesystem::path file (boost::filesystem::path f) const;
        boost::filesystem::path dir (boost::filesystem::path d) const;
 
@@ -110,7 +108,7 @@ public:
        int audio_frame_rate () const;
 
        uint64_t required_disk_space () const;
-       bool should_be_enough_disk_space (double &, double &) const;
+       bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const;
        
        /* Proxies for some Playlist methods */
 
@@ -136,10 +134,6 @@ public:
                dcp::Formulation formulation
                ) const;
 
-       dcp::Key key () const {
-               return _key;
-       }
-
        int state_version () const {
                return _state_version;
        }
@@ -158,9 +152,9 @@ public:
                DCP_CONTENT_TYPE,
                CONTAINER,
                RESOLUTION,
-               SCALER,
                SIGNED,
                ENCRYPTED,
+               KEY,
                J2K_BANDWIDTH,
                ISDCF_METADATA,
                VIDEO_FRAME_RATE,
@@ -200,10 +194,6 @@ public:
                return _resolution;
        }
 
-       Scaler const * scaler () const {
-               return _scaler;
-       }
-
        /* signed is a reserved word */
        bool is_signed () const {
                return _signed;
@@ -213,6 +203,10 @@ public:
                return _encrypted;
        }
 
+       dcp::Key key () const {
+               return _key;
+       }
+
        int j2k_bandwidth () const {
                return _j2k_bandwidth;
        }
@@ -261,9 +255,9 @@ public:
        void set_dcp_content_type (DCPContentType const *);
        void set_container (Ratio const *);
        void set_resolution (Resolution);
-       void set_scaler (Scaler const *);
        void set_signed (bool);
        void set_encrypted (bool);
+       void set_key (dcp::Key key);
        void set_j2k_bandwidth (int);
        void set_isdcf_metadata (ISDCFMetadata);
        void set_video_frame_rate (int);
@@ -313,8 +307,6 @@ private:
        Ratio const * _container;
        /** DCP resolution (2K or 4K) */
        Resolution _resolution;
-       /** Scaler algorithm to use */
-       Scaler const * _scaler;
        bool _signed;
        bool _encrypted;
        /** bandwidth for J2K files in bits per second */
@@ -341,6 +333,10 @@ private:
        /** true if our state has changed since we last saved it */
        mutable bool _dirty;
 
+       boost::signals2::scoped_connection _playlist_changed_connection;
+       boost::signals2::scoped_connection _playlist_content_changed_connection;
+       std::list<boost::signals2::connection> _job_connections;
+
        friend struct paths_test;
        friend struct film_metadata_test;
 };