Log failure to hard-link.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index c268d3eac9a01498505d50e6369089a19caeb279..698e7ef46c3d82cc3c51e93bfc40485dae56d2c7 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -77,7 +77,7 @@ public:
        /** @return Logger.
         *  It is safe to call this from any thread.
         */
-       Log* log () const {
+       boost::shared_ptr<Log> log () const {
                return _log;
        }
 
@@ -98,10 +98,6 @@ public:
        std::string dci_name (bool if_created_now) const;
        std::string dcp_name (bool if_created_now = false) const;
 
-       boost::optional<int> dcp_intrinsic_duration () const {
-               return _dcp_intrinsic_duration;
-       }
-
        /** @return true if our state has changed since we last saved it */
        bool dirty () const {
                return _dirty;
@@ -145,10 +141,10 @@ public:
                DCI_METADATA,
                SIZE,
                LENGTH,
-               DCP_INTRINSIC_DURATION,
                CONTENT_AUDIO_STREAMS,
                SUBTITLE_STREAMS,
-               FRAMES_PER_SECOND,
+               SOURCE_FRAME_RATE,
+               DCP_FRAME_RATE
        };
 
 
@@ -285,6 +281,11 @@ public:
                boost::mutex::scoped_lock lm (_state_mutex);
                return _dci_metadata;
        }
+
+       int dcp_frame_rate () const {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               return _dcp_frame_rate;
+       }
        
        libdcp::Size size () const {
                boost::mutex::scoped_lock lm (_state_mutex);
@@ -311,17 +312,17 @@ public:
                return _subtitle_streams;
        }
        
-       float frames_per_second () const {
+       float source_frame_rate () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                if (content_type() == STILL) {
                        return 24;
                }
                
-               return _frames_per_second;
+               return _source_frame_rate;
        }
 
        boost::shared_ptr<AudioStream> audio_stream () const;
-
+       bool has_audio () const;
        
        /* SET */
 
@@ -355,25 +356,27 @@ public:
        void set_colour_lut (int);
        void set_j2k_bandwidth (int);
        void set_dci_metadata (DCIMetadata);
+       void set_dcp_frame_rate (int);
        void set_size (libdcp::Size);
        void set_length (SourceFrame);
        void unset_length ();
-       void set_dcp_intrinsic_duration (int);
        void set_content_digest (std::string);
        void set_content_audio_streams (std::vector<boost::shared_ptr<AudioStream> >);
        void set_subtitle_streams (std::vector<boost::shared_ptr<SubtitleStream> >);
-       void set_frames_per_second (float);
+       void set_source_frame_rate (float);
 
        /** Emitted when some property has changed */
        mutable boost::signals2::signal<void (Property)> Changed;
 
+       boost::signals2::signal<void ()> AudioAnalysisSucceeded;
+
        /** Current version number of the state file */
        static int const state_version;
 
 private:
        
        /** Log to write to */
-       Log* _log;
+       boost::shared_ptr<Log> _log;
 
        /** Any running ExamineContentJob, or 0 */
        boost::shared_ptr<ExamineContentJob> _examine_content_job;
@@ -459,6 +462,8 @@ private:
        DCIMetadata _dci_metadata;
        /** The date that we should use in a DCI name */
        boost::gregorian::date _dci_date;
+       /** Frames per second to run our DCP at */
+       int _dcp_frame_rate;
 
        /* Data which are cached to speed things up */
 
@@ -466,7 +471,6 @@ private:
        libdcp::Size _size;
        /** The length of the source, in video frames (as far as we know) */
        boost::optional<SourceFrame> _length;
-       boost::optional<int> _dcp_intrinsic_duration;
        /** MD5 digest of our content file */
        std::string _content_digest;
        /** The audio streams in our content */
@@ -476,7 +480,7 @@ private:
        /** the subtitle streams that we can use */
        std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
        /** Frames per second of the source */
-       float _frames_per_second;
+       float _source_frame_rate;
 
        /** true if our state has changed since we last saved it */
        mutable bool _dirty;