X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=3ea0cdd1da9b72717b038ed1c6606a47f275040e;hb=09a9ac376db005a40a351736bcff4077f098825d;hp=093d25b7c8cae0d99346d2c1f9ffbb4511ea3848;hpb=c2930f166cad691fb5302d9924e109443bf2365f;p=dcpomatic.git

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index 093d25b7c..3ea0cdd1d 100644
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -112,9 +112,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,16 +131,27 @@ 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
-AudioMappingView::set_mapping (AudioMapping map)
+AudioMappingView::set (AudioMapping map)
 {
 	if (_grid->GetNumberRows ()) {
 		_grid->DeleteRows (0, _grid->GetNumberRows ());
 	}
 
-	list<AudioMapping::Channel> content_channels = map.content_channels ();
+	list<int> content_channels = map.content_channels ();
 	_grid->InsertRows (0, content_channels.size ());
 
 	for (size_t r = 0; r < content_channels.size(); ++r) {
@@ -150,10 +161,8 @@ AudioMappingView::set_mapping (AudioMapping map)
 	}
 	
 	int n = 0;
-	for (list<AudioMapping::Channel>::iterator i = content_channels.begin(); i != content_channels.end(); ++i) {
-		shared_ptr<const AudioContent> ac = i->content.lock ();
-		assert (ac);
-		_grid->SetCellValue (n, 0, wxString::Format (wxT("%s %d"), std_to_wx (ac->file().filename().string()).data(), i->index + 1));
+	for (list<int>::iterator i = content_channels.begin(); i != content_channels.end(); ++i) {
+		_grid->SetCellValue (n, 0, wxString::Format (wxT("%d"), *i + 1));
 
 		list<libdcp::Channel> const d = map.content_to_dcp (*i);
 		for (list<libdcp::Channel>::const_iterator j = d.begin(); j != d.end(); ++j) {
@@ -161,7 +170,5 @@ AudioMappingView::set_mapping (AudioMapping map)
 		}
 		++n;
 	}
-
-	_grid->AutoSize ();
 }