projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix position of content outline (#2108).
[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 b4820bfea8471d4598fe38c60d13663a7c97a325..722a9f30a30e45cce7628bda6eaff1f727f8eace 100644
(file)
--- a/
src/wx/timeline_text_content_view.cc
+++ b/
src/wx/timeline_text_content_view.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-22,10
+22,11
@@
#include "lib/text_content.h"
#include "lib/content.h"
#include "lib/text_content.h"
#include "lib/content.h"
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
-TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr<Content> c)
+TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr<Content> c
, shared_ptr<TextContent> caption
)
: TimelineContentView (tl, c)
: TimelineContentView (tl, c)
+ , _caption (caption)
{
}
{
}
@@
-53,7
+54,5
@@
TimelineTextContentView::foreground_colour () const
bool
TimelineTextContentView::active () const
{
bool
TimelineTextContentView::active () const
{
- shared_ptr<Content> c = _content.lock ();
- DCPOMATIC_ASSERT (c);
- return c->subtitle && c->subtitle->use();
+ return _caption->use();
}
}