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/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/content.h')
| -rw-r--r-- | src/lib/content.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/content.h b/src/lib/content.h index d08540a9a..0ce9d39c1 100644 --- a/src/lib/content.h +++ b/src/lib/content.h @@ -166,9 +166,12 @@ public: boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed; -protected: + boost::shared_ptr<VideoContent> video; + void signal_changed (int); +protected: + virtual void add_properties (std::list<UserProperty> &) const {} boost::weak_ptr<const Film> _film; |
