projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e6d117e
)
Fix audio plot after MAX_DCP_AUDIO_CHANNELS increase.
author
Carl Hetherington
<cth@carlh.net>
Fri, 13 Nov 2015 10:38:38 +0000
(10:38 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 13 Nov 2015 10:38:38 +0000
(10:38 +0000)
src/wx/audio_plot.cc
patch
|
blob
|
history
diff --git
a/src/wx/audio_plot.cc
b/src/wx/audio_plot.cc
index a622e2b8686a3dca116a6db94efb606339a063d7..8dab84be8bf21ff5453fe3e9c6f12212ca1b70cb 100644
(file)
--- a/
src/wx/audio_plot.cc
+++ b/
src/wx/audio_plot.cc
@@
-67,9
+67,14
@@
AudioPlot::AudioPlot (wxWindow* parent)
_colours.push_back (wxColour (255, 0, 139));
_colours.push_back (wxColour (139, 0, 255));
_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> ());
set_analysis (shared_ptr<AudioAnalysis> ());
-#if MAX_DCP_AUDIO_CHANNELS != 1
2
+#if MAX_DCP_AUDIO_CHANNELS != 1
6
#warning AudioPlot::AudioPlot is expecting the wrong MAX_DCP_AUDIO_CHANNELS
#endif
#warning AudioPlot::AudioPlot is expecting the wrong MAX_DCP_AUDIO_CHANNELS
#endif