X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.h;h=dcdb7b526660d53b7b23bf411874637be737100e;hb=6f344b876689a1234a5eb75041882f06f5d9fe5c;hp=a1b1437c811fb391154b222466b7fa22a27b5258;hpb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;p=dcpomatic.git diff --git a/src/lib/image_content.h b/src/lib/image_content.h index a1b1437c8..dcdb7b526 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-2016 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,14 +20,9 @@ #ifndef DCPOMATIC_IMAGE_CONTENT_H #define DCPOMATIC_IMAGE_CONTENT_H -#include -#include "video_content.h" +#include "content.h" -namespace cxml { - class Node; -} - -class ImageContent : public VideoContent +class ImageContent : public Content { public: ImageContent (boost::shared_ptr, boost::filesystem::path); @@ -44,10 +39,10 @@ public: DCPTime full_length () const; std::string identifier () const; - - void set_video_length (ContentTime); + + void set_default_colour_conversion (); + bool still () const; - void set_video_frame_rate (float); }; #endif