Merge master.

[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 10157eb2c6460e6fea4177f15c57471c3c323173..43119ef4e245c69f7ff57e06382c585e563b6765 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -112,9 +114,9 @@ AudioMappingView::AudioMappingView (wxWindow* parent)
 
        _grid->AutoSize ();
 
-       wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
-       s->Add (_grid, 1, wxEXPAND);
-       SetSizerAndFit (s);
+       _sizer = new wxBoxSizer (wxVERTICAL);
+       _sizer->Add (_grid, 1, wxEXPAND | wxALL);
+       SetSizerAndFit (_sizer);
 
        Connect (wxID_ANY, wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler (AudioMappingView::left_click), 0, this);
 }
@@ -131,6 +133,17 @@ AudioMappingView::left_click (wxGridEvent& ev)
        } else {
                _grid->SetCellValue (ev.GetRow(), ev.GetCol(), wxT("1"));
        }
+
+       AudioMapping mapping;
+       for (int i = 0; i < _grid->GetNumberRows(); ++i) {
+               for (int j = 1; j < _grid->GetNumberCols(); ++j) {
+                       if (_grid->GetCellValue (i, j) == wxT ("1")) {
+                               mapping.add (i, static_cast<libdcp::Channel> (j - 1));
+                       }
+               }
+       }
+
+       Changed (mapping);
 }
 
 void
@@ -159,7 +172,5 @@ AudioMappingView::set_mapping (AudioMapping map)
                }
                ++n;
        }
-
-       _grid->AutoSize ();
 }