projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: use enum class.
[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..722a9f30a30e45cce7628bda6eaff1f727f8eace 100644
(file)
--- a/
src/wx/timeline_text_content_view.cc
+++ b/
src/wx/timeline_text_content_view.cc
@@
-19,13
+19,14
@@
*/
#include "timeline_text_content_view.h"
*/
#include "timeline_text_content_view.h"
-#include "lib/
caption
_content.h"
+#include "lib/
text
_content.h"
#include "lib/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->caption && c->caption->use();
+ return _caption->use();
}
}