More zoom / timeline tidying.

[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 1a712f42d71538e302f0a67fc06738003cbf5627..43adfc936a41820b1659ff38eb2c2a1554b4442f 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,7 +31,8 @@ using std::max;
 TimelineLabelsView::TimelineLabelsView (Timeline& tl)
        : TimelineView (tl)
        , _threed (true)
-       , _subtitle (true)
+       , _audio_tracks (0)
+       , _subtitle_tracks (0)
        , _atmos (true)
 {
        wxString labels[] = {
@@ -55,34 +56,36 @@ TimelineLabelsView::TimelineLabelsView (Timeline& tl)
 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;
        int ty = _threed ? 2 * h : h;
-       gc->DrawText (_("Video"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8);
+       gc->DrawText (_("Video"), 0, (ty + fy) / 2 - 8);
        fy = ty;
 
-       if (_subtitle) {
-               ty = fy + h;
-               gc->DrawText (_("Subtitles"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8);
+       if (_subtitle_tracks) {
+               ty = fy + _subtitle_tracks * h;
+               gc->DrawText (_("Subtitles"), 0, (ty + fy) / 2 - 8);
                fy = ty;
        }
 
        if (_atmos) {
                ty = fy + h;
-               gc->DrawText (_("Atmos"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8);
+               gc->DrawText (_("Atmos"), 0, (ty + fy) / 2 - 8);
                fy = ty;
        }
 
-       ty = _timeline.tracks() * h;
-       gc->DrawText (_("Audio"), 0, _timeline.tracks_position().y + (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 (bool s)
+TimelineLabelsView::set_audio_tracks (int n)
+{
+       _audio_tracks = n;
+}
+
+void
+TimelineLabelsView::set_subtitle_tracks (int n)
 {
-       _subtitle = s;
+       _subtitle_tracks = n;
 }
 
 void