Rename video/audio/subtitle part methods.

[dcpomatic.git] / src / wx / timeline_subtitle_content_view.cc

diff --git a/src/wx/timeline_subtitle_content_view.cc b/src/wx/timeline_subtitle_content_view.cc
index 559fc7f4d2a93834f07ddbb2578e750e70109ded..c28ac93ef62c6439e9434cae69e019a28ed55693 100644 (file)
--- 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,8 +32,7 @@ TimelineSubtitleContentView::TimelineSubtitleContentView (Timeline& tl, shared_p
 wxColour
 TimelineSubtitleContentView::background_colour () const
 {
-       shared_ptr<SubtitleContent> sc = _subtitle_content.lock ();
-       if (!sc || !sc->use_subtitles ()) {
+       if (!active ()) {
                return wxColour (210, 210, 210, 128);
        }
 
@@ -43,10 +42,17 @@ TimelineSubtitleContentView::background_colour () const
 wxColour
 TimelineSubtitleContentView::foreground_colour () const
 {
-       shared_ptr<SubtitleContent> sc = _subtitle_content.lock ();
-       if (!sc || !sc->use_subtitles ()) {
+       if (!active ()) {
                return wxColour (180, 180, 180, 128);
        }
 
        return wxColour (0, 0, 0, 255);
 }
+
+bool
+TimelineSubtitleContentView::active () const
+{
+       shared_ptr<Content> c = _content.lock ();
+       DCPOMATIC_ASSERT (c);
+       return c->subtitle && c->subtitle->use();
+}