diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-25 21:43:25 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 0a2d40420813403a96352c6dc895d23fcd9994c0 (patch) | |
| tree | 44f707f5bed1b062e45b2d5caf04fcfac7896539 /src/wx/audio_dialog.cc | |
| parent | 8008b81c0ccee843263e2a648707b71cc3ae081f (diff) | |
Fix rebase onto master.
Diffstat (limited to 'src/wx/audio_dialog.cc')
| -rw-r--r-- | src/wx/audio_dialog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index a1354e9f8..d4052defb 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -175,10 +175,10 @@ AudioDialog::try_to_load_analysis () /* Nothing checked; check mapped ones */ list<int> mapped; - shared_ptr<AudioContent> content = _content.lock (); + shared_ptr<Content> content = _content.lock (); if (content) { - mapped = content->audio_mapping().mapped_output_channels (); + mapped = content->audio->mapping().mapped_output_channels (); } else { mapped = film->mapped_audio_channels (); } |