Extract common code out into kdm_for_screen()

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

diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc
index 3fe315aaf3f4b5edbc11dcb3ba2c4544b41b22b0..d3aa02afcc68b20b981a3029499721f5d40de0c6 100644 (file)
--- a/src/wx/timeline_labels_view.cc
+++ b/src/wx/timeline_labels_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -31,13 +31,14 @@ using std::max;
 TimelineLabelsView::TimelineLabelsView (Timeline& tl)
        : TimelineView (tl)
        , _threed (true)
-       , _subtitle_tracks (0)
+       , _audio_tracks (0)
+       , _text_tracks (0)
        , _atmos (true)
 {
        wxString labels[] = {
                _("Video"),
                _("Audio"),
-               _("Subtitles"),
+               _("Subtitles/captions"),
                _("Atmos")
        };
 
@@ -49,19 +50,19 @@ TimelineLabelsView::TimelineLabelsView (Timeline& tl)
                _width = max (_width, size.GetWidth());
        }
 
-       _width += 16;
+       _width += 24;
 }
 
 dcpomatic::Rect<int>
 TimelineLabelsView::bbox () const
 {
-       return dcpomatic::Rect<int> (0, 0, _width, _timeline.tracks() * _timeline.track_height());
+       return dcpomatic::Rect<int> (0, 0, _width, _timeline.tracks() * _timeline.pixels_per_track());
 }
 
 void
 TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
 {
-       int const h = _timeline.track_height ();
+       int const h = _timeline.pixels_per_track ();
        gc->SetFont (gc->CreateFont(wxNORMAL_FONT->Bold(), wxColour (0, 0, 0)));
 
        int fy = 0;
@@ -69,9 +70,9 @@ TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >
        gc->DrawText (_("Video"), 0, (ty + fy) / 2 - 8);
        fy = ty;
 
-       if (_subtitle_tracks) {
-               ty = fy + _subtitle_tracks * h;
-               gc->DrawText (_("Subtitles"), 0, (ty + fy) / 2 - 8);
+       if (_text_tracks) {
+               ty = fy + _text_tracks * h;
+               gc->DrawText (_("Subtitles/captions"), 0, (ty + fy) / 2 - 8);
                fy = ty;
        }
 
@@ -81,8 +82,10 @@ TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >
                fy = ty;
        }
 
-       ty = _timeline.tracks() * h;
-       gc->DrawText (_("Audio"), 0, (ty + fy) / 2 - 8);
+       if (_audio_tracks) {
+               ty = _timeline.tracks() * h;
+               gc->DrawText (_("Audio"), 0, (ty + fy) / 2 - 8);
+       }
 }
 
 void
@@ -92,9 +95,15 @@ TimelineLabelsView::set_3d (bool s)
 }
 
 void
-TimelineLabelsView::set_subtitle_tracks (int n)
+TimelineLabelsView::set_audio_tracks (int n)
+{
+       _audio_tracks = n;
+}
+
+void
+TimelineLabelsView::set_text_tracks (int n)
 {
-       _subtitle_tracks = n;
+       _text_tracks = n;
 }
 
 void