Merge master.

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 1eee02e01463e434bd65acd3a1bac53bd7f72170..3172b9c8d1c77b3ad19a3d4b034b88f744181311 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -84,7 +84,7 @@ public:
                return _paths[i];
        }
        
-       bool path_valid () const;
+       bool paths_valid () const;
 
        /** @return MD5 digest of the content's file(s) */
        std::string digest () const {
@@ -126,8 +126,6 @@ public:
                _change_signals_frequent = f;
        }
 
-       bool trimmed (DCPTime) const;
-
        boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
 
 protected: