Rename MD5Digester -> Digester.

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

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 66b0d477e7f92aa2df87db3e8c2e521ce2a4e98c..b64e68c4b1739e0dec621877349971815ff93f49 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -161,10 +161,10 @@ Content::examine (shared_ptr<Job> job)
        lm.unlock ();
 
        /* Some content files are very big, so we use a poor man's
-          digest here: a MD5 of the first and last 1e6 bytes with the
+          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.
        */
-       string const d = md5_digest_head_tail (p, 1000000) + raw_convert<string> (boost::filesystem::file_size (p.front ()));
+       string const d = digest_head_tail (p, 1000000) + raw_convert<string> (boost::filesystem::file_size (p.front ()));
 
        lm.lock ();
        _digest = d;
@@ -359,9 +359,13 @@ Content::active_video_frame_rate () const
 void
 Content::add_properties (list<UserProperty>& p) const
 {
-       p.push_back (UserProperty (_("General"), _("Filename"), path(0).string ()));
+       p.push_back (UserProperty (UserProperty::GENERAL, _("Filename"), path(0).string ()));
 
        if (_video_frame_rate) {
-               p.push_back (UserProperty (_("General"), _("Video frame rate"), raw_convert<string> (_video_frame_rate.get(), 5), _("frames per second")));
+               p.push_back (
+                       UserProperty (
+                               UserProperty::GENERAL, _("Video frame rate"), raw_convert<string> (_video_frame_rate.get(), 5), _("frames per second")
+                               )
+                       );
        }
 }