diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-13 16:34:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 775ae0e37bbec115d742feade0adc614a9a2301c (patch) | |
| tree | 3f9b7d86c547b2340b09ec4e3b157e88de44ff2e /src/wx/timeline_subtitle_content_view.cc | |
| parent | 334b94526f2c1271718a94fe97cfa843cf6ef7a1 (diff) | |
Subtitle rearrangements.
Diffstat (limited to 'src/wx/timeline_subtitle_content_view.cc')
| -rw-r--r-- | src/wx/timeline_subtitle_content_view.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/wx/timeline_subtitle_content_view.cc b/src/wx/timeline_subtitle_content_view.cc index 2b6f8c4a9..83360ac42 100644 --- a/src/wx/timeline_subtitle_content_view.cc +++ b/src/wx/timeline_subtitle_content_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,12 +19,12 @@ #include "timeline_subtitle_content_view.h" #include "lib/subtitle_content.h" +#include "lib/content.h" using boost::shared_ptr; -TimelineSubtitleContentView::TimelineSubtitleContentView (Timeline& tl, shared_ptr<SubtitleContent> c) +TimelineSubtitleContentView::TimelineSubtitleContentView (Timeline& tl, shared_ptr<Content> c) : TimelineContentView (tl, c) - , _subtitle_content (c) { } @@ -32,7 +32,6 @@ TimelineSubtitleContentView::TimelineSubtitleContentView (Timeline& tl, shared_p wxColour TimelineSubtitleContentView::background_colour () const { - shared_ptr<SubtitleContent> sc = _subtitle_content.lock (); if (!active ()) { return wxColour (210, 210, 210, 128); } @@ -43,7 +42,6 @@ TimelineSubtitleContentView::background_colour () const wxColour TimelineSubtitleContentView::foreground_colour () const { - shared_ptr<SubtitleContent> sc = _subtitle_content.lock (); if (!active ()) { return wxColour (180, 180, 180, 128); } @@ -54,6 +52,7 @@ TimelineSubtitleContentView::foreground_colour () const bool TimelineSubtitleContentView::active () const { - shared_ptr<SubtitleContent> sc = _subtitle_content.lock (); - return sc && sc->use_subtitles(); + shared_ptr<Content> c = _content.lock (); + DCPOMATIC_ASSERT (c); + return c->subtitle && c->subtitle->use_subtitles(); } |