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

diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc
index af9cb771e..b0bd8acbb 100644
--- a/src/wx/timeline_labels_view.cc
+++ b/src/wx/timeline_labels_view.cc
@@ -30,27 +30,21 @@ using std::max;
 
 TimelineLabelsView::TimelineLabelsView (Timeline& tl)
 	: TimelineView (tl)
-	, _threed (true)
-	, _audio_tracks (0)
-	, _caption_tracks (0)
-	, _atmos (true)
 {
 	wxString labels[] = {
 		_("Video"),
 		_("Audio"),
-		_("Captions"),
+		_("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>
@@ -66,32 +60,34 @@ 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 (_caption_tracks) {
-		ty = fy + _caption_tracks * h;
-		gc->DrawText (_("Captions"), 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;
 	}
 
 	if (_audio_tracks) {
-		ty = _timeline.tracks() * h;
+		int ty = _timeline.tracks() * h;
 		gc->DrawText (_("Audio"), 0, (ty + fy) / 2 - 8);
 	}
 }
 
 void
-TimelineLabelsView::set_3d (bool s)
+TimelineLabelsView::set_video_tracks (int n)
 {
-	_threed = s;
+	_video_tracks = n;
 }
 
 void
@@ -101,9 +97,9 @@ TimelineLabelsView::set_audio_tracks (int n)
 }
 
 void
-TimelineLabelsView::set_caption_tracks (int n)
+TimelineLabelsView::set_text_tracks (int n)
 {
-	_caption_tracks = n;
+	_text_tracks = n;
 }
 
 void