diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-12 16:33:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 3ef438f90729d78ad579bbeb7933b3cf4f09c10c (patch) | |
| tree | 9ecb2d9657986395570b0239486dfa0efdb01f55 /src/lib/image_content.h | |
| parent | 500a503a982e8e62884035e156e47ed61a20ef85 (diff) | |
Basic detach of FFmpegContent, ImageContent, DCPContent
Diffstat (limited to 'src/lib/image_content.h')
| -rw-r--r-- | src/lib/image_content.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/image_content.h b/src/lib/image_content.h index a4968ea8b..353ce8370 100644 --- a/src/lib/image_content.h +++ b/src/lib/image_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 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 it under the terms of the GNU General Public License as published by @@ -20,9 +20,9 @@ #ifndef DCPOMATIC_IMAGE_CONTENT_H #define DCPOMATIC_IMAGE_CONTENT_H -#include "video_content.h" +#include "content.h" -class ImageContent : public VideoContent +class ImageContent : public Content { public: ImageContent (boost::shared_ptr<const Film>, boost::filesystem::path); @@ -40,11 +40,12 @@ public: std::string identifier () const; - /* VideoContent */ void set_default_colour_conversion (); void set_video_length (Frame); bool still () const; + + boost::shared_ptr<VideoContent> video; }; #endif |