pot/merge.

[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 3146d03662873325a7ea64d7446b4217388bfe40..ee1b1948996e3120571873f397cc9b6bdae0e0bc 100644 (file)
--- a/src/wx/timeline_labels_view.cc
+++ b/src/wx/timeline_labels_view.cc
@@ -31,7 +31,7 @@ using std::max;
 TimelineLabelsView::TimelineLabelsView (Timeline& tl)
        : TimelineView (tl)
        , _threed (true)
-       , _subtitle (true)
+       , _subtitle_tracks (0)
        , _atmos (true)
 {
        wxString labels[] = {
@@ -66,11 +66,11 @@ TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >
 
        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, _timeline.tracks_position().y + (ty + fy) / 2 - 8);
        fy = ty;
 
-       if (_subtitle) {
-               ty = fy + h;
+       if (_subtitle_tracks) {
+               ty = fy + _subtitle_tracks * h;
                gc->DrawText (_("Subtitles"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8);
                fy = ty;
        }
@@ -92,9 +92,9 @@ TimelineLabelsView::set_3d (bool s)
 }
 
 void
-TimelineLabelsView::set_subtitle (bool s)
+TimelineLabelsView::set_subtitle_tracks (int n)
 {
-       _subtitle = s;
+       _subtitle_tracks = n;
 }
 
 void