X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=67ea466dfb146f79537d58d5c64aeccdc90b2444;hb=4685843ba4194d8b59ed6eb1335ae27052178726;hp=f929e2b6f15b72105a6a97880e6bef647eb98175;hpb=1629bd7df2150156109afbc7a16677cb29e82adf;p=dcpomatic.git diff --git a/src/lib/image_content.h b/src/lib/image_content.h index f929e2b6f..67ea466df 100644 --- a/src/lib/image_content.h +++ b/src/lib/image_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 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 @@ -20,18 +20,13 @@ #ifndef DCPOMATIC_IMAGE_CONTENT_H #define DCPOMATIC_IMAGE_CONTENT_H -#include #include "video_content.h" -namespace cxml { - class Node; -} - class ImageContent : public VideoContent { public: ImageContent (boost::shared_ptr, boost::filesystem::path); - ImageContent (boost::shared_ptr, boost::shared_ptr, int); + ImageContent (boost::shared_ptr, cxml::ConstNodePtr, int); boost::shared_ptr shared_from_this () { return boost::dynamic_pointer_cast (Content::shared_from_this ()); @@ -44,8 +39,11 @@ public: DCPTime full_length () const; std::string identifier () const; - - void set_video_length (VideoFrame); + + /* VideoContent */ + void set_default_colour_conversion (); + + void set_video_length (Frame); bool still () const; void set_video_frame_rate (float); };