projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basics of multiple captions per content so that DCPContent can
[dcpomatic.git]
/
src
/
wx
/
timeline_text_content_view.cc
diff --git
a/src/wx/timeline_text_content_view.cc
b/src/wx/timeline_text_content_view.cc
index bb874449ef7321c9795e53a294edaa6bcbf18d0d..30158941c2fe711536ebde5ed9d7feafd8675e12 100644
(file)
--- a/
src/wx/timeline_text_content_view.cc
+++ b/
src/wx/timeline_text_content_view.cc
@@
-24,8
+24,9
@@
using boost::shared_ptr;
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)
: TimelineContentView (tl, c)
+ , _caption (caption)
{
}
{
}
@@
-55,5
+56,5
@@
TimelineTextContentView::active () const
{
shared_ptr<Content> c = _content.lock ();
DCPOMATIC_ASSERT (c);
{
shared_ptr<Content> c = _content.lock ();
DCPOMATIC_ASSERT (c);
- return
c->caption && c->
caption->use();
+ return
_
caption->use();
}
}