projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
It doesn't seem necessary to use shared_ptr for the DCPVideo queue in J2KEncoder.
[dcpomatic.git]
/
src
/
wx
/
timeline_text_content_view.h
diff --git
a/src/wx/timeline_text_content_view.h
b/src/wx/timeline_text_content_view.h
index 4f69f2aefa40d6b2d70ee0075c965f7ec90bbfba..046f5b3e66ca9d5a288a53369bb81a0e49c28068 100644
(file)
--- a/
src/wx/timeline_text_content_view.h
+++ b/
src/wx/timeline_text_content_view.h
@@
-21,7
+21,7
@@
#include "timeline_content_view.h"
class TextContent;
#include "timeline_content_view.h"
class TextContent;
-class
Caption
Content;
+class
Text
Content;
/** @class TimelineTextContentView
* @brief Timeline view for TextContent.
/** @class TimelineTextContentView
* @brief Timeline view for TextContent.
@@
-29,12
+29,12
@@
class CaptionContent;
class TimelineTextContentView : public TimelineContentView
{
public:
class TimelineTextContentView : public TimelineContentView
{
public:
- TimelineTextContentView (Timeline& tl,
boost::shared_ptr<Content>, boost::shared_ptr<Caption
Content>);
+ TimelineTextContentView (Timeline& tl,
std::shared_ptr<Content>, std::shared_ptr<Text
Content>);
private:
private:
- bool active () const;
- wxColour background_colour () const;
- wxColour foreground_colour () const;
+ bool active () const
override
;
+ wxColour background_colour () const
override
;
+ wxColour foreground_colour () const
override
;
-
boost::shared_ptr<Caption
Content> _caption;
+
std::shared_ptr<Text
Content> _caption;
};
};