Merge branch 'master' into 2.0

[dcpomatic.git] / src / wx / audio_plot.cc

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 0868d931a8be1d38dc7b95e0c154afce4e544a51..f1d91b030b59f156d4728ad15c7273cd648a4d62 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -59,7 +59,13 @@ AudioPlot::AudioPlot (wxWindow* parent)
        _colours.push_back (wxColour (  0, 255,   0));
        _colours.push_back (wxColour (139,   0, 204));
        _colours.push_back (wxColour (  0,   0, 255));
-       _colours.push_back (wxColour (100, 100, 100));
+       _colours.push_back (wxColour (  0, 139,   0));
+       _colours.push_back (wxColour (  0,   0, 139));
+       _colours.push_back (wxColour (255, 255,   0));
+
+#if MAX_AUDIO_CHANNELS != 8
+#warning AudioPlot::AudioPlot is expecting the wrong MAX_AUDIO_CHANNELS
+#endif 
        
        Bind (wxEVT_PAINT, boost::bind (&AudioPlot::paint, this));