Make player/KDM creator and main DCP-o-matic all behave the same with respect to...

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

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 605738b4fdabfdad2fd16ee26c9b14e75c2669c1..fe031aaac28aa5b8d095d6241206b74f0bbc4fb9 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -1,25 +1,27 @@
 /*
     Copyright (C) 2013-2015 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/>.
 
 */
 
 #include "audio_plot.h"
 #include "lib/audio_decoder.h"
 #include "lib/audio_analysis.h"
+#include "lib/compose.hpp"
 #include "wx/wx_util.h"
 #include <wx/graphics.h>
 #include <boost/bind.hpp>
@@ -66,9 +68,14 @@ AudioPlot::AudioPlot (wxWindow* parent)
        _colours.push_back (wxColour (255,   0, 139));
        _colours.push_back (wxColour (139,   0, 255));
 
+       _colours.push_back (wxColour (139, 139, 255));
+       _colours.push_back (wxColour (  0, 139, 255));
+       _colours.push_back (wxColour (255, 139, 139));
+       _colours.push_back (wxColour (255, 139,   0));
+
        set_analysis (shared_ptr<AudioAnalysis> ());
 
-#if MAX_DCP_AUDIO_CHANNELS != 12
+#if MAX_DCP_AUDIO_CHANNELS != 16
 #warning AudioPlot::AudioPlot is expecting the wrong MAX_DCP_AUDIO_CHANNELS
 #endif
 
@@ -312,3 +319,13 @@ AudioPlot::get_point (int channel, int point) const
 
        return p;
 }
+
+/** @param n Channel index.
+ *  @return Colour used by that channel in the plot.
+ */
+wxColour
+AudioPlot::colour (int n) const
+{
+       DCPOMATIC_ASSERT (n < int(_colours.size()));
+       return _colours[n];
+}