projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up after previous commit.
[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..bb874449ef7321c9795e53a294edaa6bcbf18d0d 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.
@@
-19,7
+19,7
@@
*/
#include "timeline_text_content_view.h"
*/
#include "timeline_text_content_view.h"
-#include "lib/
text
_content.h"
+#include "lib/
caption
_content.h"
#include "lib/content.h"
using boost::shared_ptr;
#include "lib/content.h"
using boost::shared_ptr;
@@
-55,5
+55,5
@@
TimelineTextContentView::active () const
{
shared_ptr<Content> c = _content.lock ();
DCPOMATIC_ASSERT (c);
{
shared_ptr<Content> c = _content.lock ();
DCPOMATIC_ASSERT (c);
- return c->
subtitle && c->subtitle
->use();
+ return c->
caption && c->caption
->use();
}
}