X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=81396c63ba19a95683c856d2441d17f62db80306;hp=f929e2b6f15b72105a6a97880e6bef647eb98175;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=1629bd7df2150156109afbc7a16677cb29e82adf

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index f929e2b6f..81396c63b 100644
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -1,53 +1,59 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    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/>.
 
 */
 
 #ifndef DCPOMATIC_IMAGE_CONTENT_H
 #define DCPOMATIC_IMAGE_CONTENT_H
 
-#include <boost/enable_shared_from_this.hpp>
-#include "video_content.h"
-
-namespace cxml {
-	class Node;
-}
+#include "content.h"
 
-class ImageContent : public VideoContent
+class ImageContent : public Content
 {
 public:
-	ImageContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	ImageContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int);
+	ImageContent (boost::filesystem::path);
+	ImageContent (cxml::ConstNodePtr, int);
+
+	std::shared_ptr<ImageContent> shared_from_this () {
+		return std::dynamic_pointer_cast<ImageContent> (Content::shared_from_this ());
+	};
 
-	boost::shared_ptr<ImageContent> shared_from_this () {
-		return boost::dynamic_pointer_cast<ImageContent> (Content::shared_from_this ());
+	std::shared_ptr<const ImageContent> shared_from_this () const {
+		return std::dynamic_pointer_cast<const ImageContent> (Content::shared_from_this ());
 	};
 
-	void examine (boost::shared_ptr<Job>);
+	void examine (std::shared_ptr<const Film> film, std::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 (std::shared_ptr<const Film> film) const;
+	dcpomatic::DCPTime approximate_length () const;
 
 	std::string identifier () const;
-	
-	void set_video_length (VideoFrame);
+
+	void set_default_colour_conversion ();
+
 	bool still () const;
-	void set_video_frame_rate (float);
+
+private:
+	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
+
+	boost::optional<boost::filesystem::path> _path_to_scan;
 };
 
 #endif