diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-26 11:58:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-26 11:58:37 +0000 |
| commit | e8c1880a2b9a40eb11ee259feee3edd799139a43 (patch) | |
| tree | b229f71d8ce191710b5787b9061953b22a5ce88d /src/wx/audio_plot.cc | |
| parent | 58588c485eac7c488a574fe923576f109ec0134e (diff) | |
| parent | e52d78a0ebf4852c56bcf4119ed7d4c1d0d9b8ff (diff) | |
Merge branch 'master' into 2.0
Diffstat (limited to 'src/wx/audio_plot.cc')
| -rw-r--r-- | src/wx/audio_plot.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 0868d931a..f1d91b030 100644 --- 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)); |