Emit no audio from DCPs if none is mapped

[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 b0bd8acbb48eeaedf1ea619e8b2b866498831910..181adc5ca411b07a8ada58617309e62782768010 100644 (file)
--- a/src/wx/timeline_labels_view.cc
+++ b/src/wx/timeline_labels_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,14 +19,20 @@
 */
 
 
-#include "timeline_labels_view.h"
 #include "timeline.h"
-#include <wx/wx.h>
+#include "timeline_labels_view.h"
+#include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
 
 using std::list;
-using std::min;
 using std::max;
+using std::min;
+
 
 TimelineLabelsView::TimelineLabelsView (Timeline& tl)
        : TimelineView (tl)
@@ -47,17 +53,20 @@ TimelineLabelsView::TimelineLabelsView (Timeline& tl)
        _width += 24;
 }
 
+
 dcpomatic::Rect<int>
 TimelineLabelsView::bbox () const
 {
        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.pixels_per_track ();
-       gc->SetFont (gc->CreateFont(wxNORMAL_FONT->Bold(), wxColour (0, 0, 0)));
+       wxColour const colour = gui_is_dark() ? *wxWHITE : *wxBLACK;
+       gc->SetFont(gc->CreateFont(wxNORMAL_FONT->Bold(), colour));
 
        int fy = 0;
        if (_video_tracks) {
@@ -84,24 +93,28 @@ TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >
        }
 }
 
+
 void
 TimelineLabelsView::set_video_tracks (int n)
 {
        _video_tracks = n;
 }
 
+
 void
 TimelineLabelsView::set_audio_tracks (int n)
 {
        _audio_tracks = n;
 }
 
+
 void
 TimelineLabelsView::set_text_tracks (int n)
 {
        _text_tracks = n;
 }
 
+
 void
 TimelineLabelsView::set_atmos (bool s)
 {