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.h | |
| parent | 8008b81c0ccee843263e2a648707b71cc3ae081f (diff) | |
Fix rebase onto master.
Diffstat (limited to 'src/wx/audio_dialog.h')
| -rw-r--r-- | src/wx/audio_dialog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h index 8624b7af3..fd0b1c3f7 100644 --- a/src/wx/audio_dialog.h +++ b/src/wx/audio_dialog.h @@ -45,7 +45,7 @@ private: boost::shared_ptr<AudioAnalysis> _analysis; boost::weak_ptr<Film> _film; - boost::weak_ptr<AudioContent> _content; + boost::weak_ptr<Content> _content; int _channels; boost::shared_ptr<const Playlist> _playlist; AudioPlot* _plot; |