diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-09 22:18:42 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-09 22:18:42 +0000 |
| commit | e8204f55c981493b99814f71a50b3c3d62601032 (patch) | |
| tree | 19e155586aca13839e440a0574ed5aa5cfa4c4d5 /src/lib/sndfile_content.cc | |
| parent | ae9b0b509787d244366eb8f69bdf9d563b6c6bb6 (diff) | |
| parent | e28def57ff4591f02ca3585a506ea58fbeba5d46 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/sndfile_content.cc')
| -rw-r--r-- | src/lib/sndfile_content.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc index 48bdb56ec..d3acc7d2e 100644 --- a/src/lib/sndfile_content.cc +++ b/src/lib/sndfile_content.cc @@ -43,10 +43,10 @@ SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::pat } -SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int) +SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version) : Content (f, node) , AudioContent (f, node) - , _audio_mapping (node->node_child ("AudioMapping")) + , _audio_mapping (node->node_child ("AudioMapping"), version) { _audio_channels = node->number_child<int> ("AudioChannels"); _audio_length = node->number_child<AudioFrame> ("AudioLength"); |