diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-16 08:36:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-16 08:36:47 +0100 |
| commit | 21ce34c2cd04a2e7e133ff693b84c054182f4f91 (patch) | |
| tree | 5bda50a34b2fa7526dcd682578247f75a85d26b1 /src/wx/audio_mapping_view.cc | |
| parent | 0db016f90ae722fc8b72d465e21d9f153f72b340 (diff) | |
Compiles; strange hang on adding content to a film.
Diffstat (limited to 'src/wx/audio_mapping_view.cc')
| -rw-r--r-- | src/wx/audio_mapping_view.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 093d25b7c..10157eb2c 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -140,7 +140,7 @@ AudioMappingView::set_mapping (AudioMapping map) _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 +150,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) { |