Remove unused Film::content_paths_valid; fix ImageDecoder to throw an OpenFileError...

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 5d8100e5db825e021dfd1ca7a09b6909ce830ef6..4ee7c267f354c5cf65da2f1c948f3b8d93b79424 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -52,6 +52,7 @@ public:
        Content (boost::shared_ptr<const Film>, Time);
        Content (boost::shared_ptr<const Film>, boost::filesystem::path);
        Content (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+       Content (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
        virtual ~Content () {}
        
        virtual void examine (boost::shared_ptr<Job>);
@@ -65,10 +66,12 @@ public:
        boost::shared_ptr<Content> clone () const;
 
        void set_path (boost::filesystem::path);
-       
-       boost::filesystem::path path () const {
+
+       std::string path_summary () const;
+
+       std::vector<boost::filesystem::path> paths () const {
                boost::mutex::scoped_lock lm (_mutex);
-               return _paths.front ();
+               return _paths;
        }
 
        size_t number_of_paths () const {
@@ -81,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 {