diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-21 15:16:18 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-21 15:16:18 +0100 |
| commit | cbd4450197a083bf58bda510e626f73ba583cb66 (patch) | |
| tree | 2be308772512539570beab36beab02bde72d6d4b /src/wx/timeline_text_content_view.cc | |
| parent | 1013175d5f6adfa0e6a7442e4c9aebb893787748 (diff) | |
Basics of multiple captions per content so that DCPContent can
hold subs and closed captions.
Diffstat (limited to 'src/wx/timeline_text_content_view.cc')
| -rw-r--r-- | src/wx/timeline_text_content_view.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/wx/timeline_text_content_view.cc b/src/wx/timeline_text_content_view.cc index bb874449e..30158941c 100644 --- a/src/wx/timeline_text_content_view.cc +++ b/src/wx/timeline_text_content_view.cc @@ -24,8 +24,9 @@ using boost::shared_ptr; -TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr<Content> c) +TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr<Content> c, shared_ptr<CaptionContent> caption) : TimelineContentView (tl, c) + , _caption (caption) { } @@ -55,5 +56,5 @@ TimelineTextContentView::active () const { shared_ptr<Content> c = _content.lock (); DCPOMATIC_ASSERT (c); - return c->caption && c->caption->use(); + return _caption->use(); } |