X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=970a68d661271be3b567d714ec880cc55111527a;hb=7c730205e50014347bd96ab9735346d0b5922798;hp=dcdb7b526660d53b7b23bf411874637be737100e;hpb=6f344b876689a1234a5eb75041882f06f5d9fe5c;p=dcpomatic.git

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index dcdb7b526..970a68d66 100644
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,24 +26,34 @@
 class ImageContent : public Content
 {
 public:
-	ImageContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	ImageContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
+	ImageContent (boost::filesystem::path);
+	ImageContent (cxml::ConstNodePtr, int);
 
 	boost::shared_ptr<ImageContent> shared_from_this () {
 		return boost::dynamic_pointer_cast<ImageContent> (Content::shared_from_this ());
 	};
 
-	void examine (boost::shared_ptr<Job>);
+	boost::shared_ptr<const ImageContent> shared_from_this () const {
+		return boost::dynamic_pointer_cast<const ImageContent> (Content::shared_from_this ());
+	};
+
+	void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
 	std::string summary () const;
 	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *) const;
-	DCPTime full_length () const;
+	void as_xml (xmlpp::Node *, bool with_paths) const;
+	dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime approximate_length () const;
 
 	std::string identifier () const;
 
 	void set_default_colour_conversion ();
 
 	bool still () const;
+
+private:
+	void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
+
+	boost::optional<boost::filesystem::path> _path_to_scan;
 };
 
 #endif