X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=67ea466dfb146f79537d58d5c64aeccdc90b2444;hb=d456cc07a466329a4c07e5c13322b34814e6489e;hp=8c50fd8a87f89cd0115d2a4e49b462d3af976448;hpb=cf8e0e9e26dbaefab768000ebc1655b34ad11105;p=dcpomatic.git diff --git a/src/lib/image_content.h b/src/lib/image_content.h index 8c50fd8a8..67ea466df 100644 --- a/src/lib/image_content.h +++ b/src/lib/image_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,11 +21,6 @@ #define DCPOMATIC_IMAGE_CONTENT_H #include "video_content.h" -#include - -namespace cxml { - class Node; -} class ImageContent : public VideoContent { @@ -37,15 +32,18 @@ public: return boost::dynamic_pointer_cast (Content::shared_from_this ()); }; - void examine (boost::shared_ptr, bool calculate_digest); + void examine (boost::shared_ptr); std::string summary () const; std::string technical_summary () const; void as_xml (xmlpp::Node *) const; DCPTime full_length () const; std::string identifier () const; - - void set_video_length (ContentTime); + + /* VideoContent */ + void set_default_colour_conversion (); + + void set_video_length (Frame); bool still () const; void set_video_frame_rate (float); };