Build fix for previous.

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

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 4b7609b370c6c73eac677f4e47919797bd270959..959975a0096912fd0a72149bfcd55214cadb7483 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -269,8 +269,12 @@ AudioMappingView::paint_row_lines (wxGraphicsContext* gc)
 void
 AudioMappingView::paint_indicators (wxDC& dc)
 {
-       for (size_t x = 0; x < _output_channels.size(); ++x) {
-               for (size_t y = 0; y < _input_channels.size(); ++y) {
+       /* _{input,output}_channels and _map may not always be in sync, be careful here */
+       size_t const output = min(_output_channels.size(), size_t(_map.output_channels()));
+       size_t const input = min(_input_channels.size(), size_t(_map.input_channels()));
+
+       for (size_t x = 0; x < output; ++x) {
+               for (size_t y = 0; y < input; ++y) {
                        dc.SetBrush (*wxWHITE_BRUSH);
                        dc.DrawRectangle (
                                wxRect(
@@ -343,17 +347,17 @@ AudioMappingView::paint ()
        paint_column_labels (dc, gc);
        restore (dc, gc);
 
-       clip (dc, gc, 0, TOP_HEIGHT, GRID_SPACING * (3 + _output_channels.size()), GRID_SPACING * _input_channels.size());
+       clip (dc, gc, 0, TOP_HEIGHT, GRID_SPACING * (3 + _output_channels.size()), GRID_SPACING * _input_channels.size() + 1);
        translate (dc, gc, 0, vs);
        paint_row_labels (dc, gc);
        restore (dc, gc);
 
-       clip (dc, gc, GRID_SPACING * 2, TOP_HEIGHT, GRID_SPACING * (1 + _output_channels.size()), GRID_SPACING * _input_channels.size());
+       clip (dc, gc, GRID_SPACING * 2, TOP_HEIGHT, GRID_SPACING * (1 + _output_channels.size()), GRID_SPACING * _input_channels.size() + 1);
        translate (dc, gc, hs, vs);
        paint_row_lines (gc);
        restore (dc, gc);
 
-       clip (dc, gc, LEFT_WIDTH, GRID_SPACING, GRID_SPACING * (1 + _output_channels.size()), GRID_SPACING * _input_channels.size());
+       clip (dc, gc, LEFT_WIDTH, GRID_SPACING, GRID_SPACING * (1 + _output_channels.size()), GRID_SPACING * (1 + _input_channels.size()));
        translate (dc, gc, hs, vs);
        paint_column_lines (gc);
        restore (dc, gc);