diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-12 22:10:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 6f344b876689a1234a5eb75041882f06f5d9fe5c (patch) | |
| tree | 3a51f17cab8b8f31b21661b643aaed6a53326031 /src/lib/image_content.h | |
| parent | 36774ee2b48f0bfde43b743592e5816ff58bb7d2 (diff) | |
Reasonably straightforward stuff; main things are adding
a _parent to VideoContent (mainly, but not only, for signalling)
and moving the video shared_ptr into Content, which makes much
more sense to replace dynamic_cast tests for whether something
has video or whatever. Nearly builds.
Diffstat (limited to 'src/lib/image_content.h')
| -rw-r--r-- | src/lib/image_content.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/image_content.h b/src/lib/image_content.h index 353ce8370..dcdb7b526 100644 --- a/src/lib/image_content.h +++ b/src/lib/image_content.h @@ -42,10 +42,7 @@ public: void set_default_colour_conversion (); - void set_video_length (Frame); bool still () const; - - boost::shared_ptr<VideoContent> video; }; #endif |