Some comment tweaks; a little more logging.

diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h
index 2004aca8318225e2b2f33da0c6b70f1c959b0c59..729c287b58fe66488526f02eeff31708d2f7d307 100644 (file)
--- a/src/lib/examine_content_job.h
+++ b/src/lib/examine_content_job.h
@@ -18,13 +18,13 @@
 */
 
 /** @file  src/examine_content_job.h
- *  @brief A class to run through content at high speed to find its length.
+ *  @brief A class to obtain the length and MD5 digest of a content file.
  */
 
 #include "job.h"
 
 /** @class ExamineContentJob
- *  @brief A class to run through content at high speed to find its length.
+ *  @brief A class to obtain the length and MD5 digest of a content file.
  */
 class ExamineContentJob : public Job
 {

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 9fd8c7400b3f987344927812379ddc5c4ae2a9e2..ad9f6525650e5cdebe54e70edb5349d796ce3d9c 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -252,13 +252,24 @@ Film::make_dcp (bool transcode)
                char buffer[128];
                gethostname (buffer, sizeof (buffer));
                log()->log (String::compose ("Starting to make DCP on %1", buffer));
-               log()->log (String::compose ("Content is %1; type %2", content_path(), (content_type() == STILL ? "still" : "video")));
-               log()->log (String::compose ("Content length %1", length().get()));
-               log()->log (String::compose ("Content digest %1", content_digest()));
-               log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads()));
-               log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth()));
        }
-               
+       
+       log()->log (String::compose ("Content is %1; type %2", content_path(), (content_type() == STILL ? "still" : "video")));
+       log()->log (String::compose ("Content length %1", length().get()));
+       log()->log (String::compose ("Content digest %1", content_digest()));
+       log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads()));
+       log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth()));
+#ifdef DVDOMATIC_DEBUG
+       log()->log ("DVD-o-matic built in debug mode.");
+#else
+       log()->log ("DVD-o-matic built in optimised mode.");
+#endif
+#ifdef LIBDCP_DEBUG
+       log()->log ("libdcp built in debug mode.");
+#else
+       log()->log ("libdcp built in optimised mode.");
+#endif
+       
        if (format() == 0) {
                throw MissingSettingError ("format");
        }

diff --git a/src/lib/film.h b/src/lib/film.h
index 02d9cf7d076949225f52e25d179234f70e688bd3..025527531d06c0fd577b521cae0c36b565de04de 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -47,9 +47,9 @@ class ExamineContentJob;
 class ExternalAudioStream;
 
 /** @class Film
- *  @brief A representation of a video with sound.
+ *  @brief A representation of a video, maybe with sound.
  *
- *  A representation of a piece of video (with sound), including naming,
+ *  A representation of a piece of video (maybe with sound), including naming,
  *  the source content file, and how it should be presented in a DCP.
  */
 class Film : public boost::enable_shared_from_this<Film>
@@ -92,6 +92,7 @@ public:
        std::string dci_name () const;
        std::string dcp_name () const;
 
+       /** @return true if our state has changed since we last saved it */
        bool dirty () const {
                return _dirty;
        }
@@ -100,6 +101,9 @@ public:
 
        void set_dci_date_today ();
 
+       /** Identifiers for the parts of our state;
+           used for signalling changes.
+       */
        enum Property {
                NONE,
                NAME,
@@ -258,16 +262,11 @@ public:
                return _subtitle_scale;
        }
 
-       /** @return index of colour LUT to use when converting RGB to XYZ.
-        *  0: sRGB
-        *  1: Rec 709
-        */
        int colour_lut () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _colour_lut;
        }
 
-       /** @return bandwidth for J2K files in bits per second */
        int j2k_bandwidth () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _j2k_bandwidth;
@@ -428,6 +427,10 @@ private:
         *  or an absolute path.
         */
        std::string _content;
+       /** If this is true, we will believe the length specified by the content
+        *  file's header; if false, we will run through the whole content file
+        *  the first time we see it in order to obtain the length.
+        */
        bool _trust_content_header;
        /** The type of content that this Film represents (feature, trailer etc.) */
        DCPContentType const * _dcp_content_type;
@@ -473,8 +476,9 @@ private:
        int _subtitle_offset;
        /** scale factor to apply to subtitles */
        float _subtitle_scale;
-       /** index of colour LUT to use when converting RGB to XYZ
-        *  (see colour_lut ())
+       /** index of colour LUT to use when converting RGB to XYZ.
+        *  0: sRGB
+        *  1: Rec 709
         */
        int _colour_lut;
        /** bandwidth for J2K files in bits per second */