X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimeline_labels_view.cc;h=b0bd8acbb48eeaedf1ea619e8b2b866498831910;hp=3d0b4265173419e2cd55b9c6629ed355b4961edc;hb=14a9755762cf1d1e33877dec4a02b627dfa400cb;hpb=aaaa51f6d9eda60ab3b3d182c6d2a7a5bda375aa

diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc
index 3d0b42651..b0bd8acbb 100644
--- 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.
 
@@ -30,26 +30,21 @@ using std::max;
 
 TimelineLabelsView::TimelineLabelsView (Timeline& tl)
 	: TimelineView (tl)
-	, _threed (true)
-	, _subtitle_tracks (0)
-	, _atmos (true)
 {
 	wxString labels[] = {
 		_("Video"),
 		_("Audio"),
-		_("Subtitles"),
+		_("Subtitles/captions"),
 		_("Atmos")
 	};
 
-	_width = 0;
-
         wxClientDC dc (&_timeline);
 	for (int i = 0; i < 3; ++i) {
-		wxSize size = dc.GetTextExtent (labels[i]);
+		auto size = dc.GetTextExtent (labels[i]);
 		_width = max (_width, size.GetWidth());
 	}
 
-	_width += 16;
+	_width += 24;
 }
 
 dcpomatic::Rect<int>
@@ -65,36 +60,46 @@ TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >
 	gc->SetFont (gc->CreateFont(wxNORMAL_FONT->Bold(), wxColour (0, 0, 0)));
 
 	int fy = 0;
-	int ty = _threed ? 2 * h : h;
-	gc->DrawText (_("Video"), 0, (ty + fy) / 2 - 8);
-	fy = ty;
+	if (_video_tracks) {
+		int ty = fy + _video_tracks * h;
+		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) {
+		int ty = fy + _text_tracks * h;
+		gc->DrawText (_("Subtitles/captions"), 0, (ty + fy) / 2 - 8);
 		fy = ty;
 	}
 
 	if (_atmos) {
-		ty = fy + h;
+		int ty = fy + h;
 		gc->DrawText (_("Atmos"), 0, (ty + fy) / 2 - 8);
 		fy = ty;
 	}
 
-	ty = _timeline.tracks() * h;
-	gc->DrawText (_("Audio"), 0, (ty + fy) / 2 - 8);
+	if (_audio_tracks) {
+		int ty = _timeline.tracks() * h;
+		gc->DrawText (_("Audio"), 0, (ty + fy) / 2 - 8);
+	}
+}
+
+void
+TimelineLabelsView::set_video_tracks (int n)
+{
+	_video_tracks = n;
 }
 
 void
-TimelineLabelsView::set_3d (bool s)
+TimelineLabelsView::set_audio_tracks (int n)
 {
-	_threed = s;
+	_audio_tracks = n;
 }
 
 void
-TimelineLabelsView::set_subtitle_tracks (int n)
+TimelineLabelsView::set_text_tracks (int n)
 {
-	_subtitle_tracks = n;
+	_text_tracks = n;
 }
 
 void