X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_labels_view.cc;h=4450fef0552ec2dd4f60e4ef59f24370655b09df;hb=c76a7e968f54eb0e6c8da9c1ae6bc069ed05fdda;hp=ee1b707183466a14f7c79a0601ff2ab4a0a4c2af;hpb=48e51965d74cf2a2f2f6f4c5e9c349f1b1103e66;p=dcpomatic.git

diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc
index ee1b70718..4450fef05 100644
--- a/src/wx/timeline_labels_view.cc
+++ b/src/wx/timeline_labels_view.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,79 +24,92 @@
 #include <wx/wx.h>
 #include <wx/graphics.h>
 
+
 using std::list;
-using std::min;
 using std::max;
+using std::min;
+
 
 TimelineLabelsView::TimelineLabelsView (Timeline& tl)
 	: TimelineView (tl)
-	, _threed (true)
-	, _subtitle (true)
-	, _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>
 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> >)
+TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>>)
 {
-	int const h = _timeline.track_height ();
-	gc->SetFont (gc->CreateFont(wxNORMAL_FONT->Bold(), wxColour (0, 0, 0)));
+	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);
-	fy = ty;
+	if (_video_tracks) {
+		int ty = fy + _video_tracks * h;
+		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 (_text_tracks) {
+		int ty = fy + _text_tracks * h;
+		gc->DrawText (_("Subtitles/captions"), 0, (ty + fy) / 2 - 8);
 		fy = ty;
 	}
 
 	if (_atmos) {
-		ty = fy + h;
-		gc->DrawText (_("Atmos"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8);
+		int ty = fy + h;
+		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) {
+		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
-TimelineLabelsView::set_subtitle (bool s)
+TimelineLabelsView::set_audio_tracks (int n)
 {
-	_subtitle = s;
+	_audio_tracks = n;
 }
 
+
+void
+TimelineLabelsView::set_text_tracks (int n)
+{
+	_text_tracks = n;
+}
+
+
 void
 TimelineLabelsView::set_atmos (bool s)
 {