diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-02 13:02:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-02 13:02:30 +0000 |
| commit | 3dfdd5795cf6514e15fdbece54c28f3bddc2aadc (patch) | |
| tree | 0b6a71d8d5c8be03ff424da5c5b0b42fb5f3018a /src/lib/sndfile_content.cc | |
| parent | 30e45dd697afc053f2d7be4ee2bc154e5061ad80 (diff) | |
Rationalise video/audio frame types.
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 1c872cf96..48bdb56ec 100644 --- a/src/lib/sndfile_content.cc +++ b/src/lib/sndfile_content.cc @@ -49,7 +49,7 @@ SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml: , _audio_mapping (node->node_child ("AudioMapping")) { _audio_channels = node->number_child<int> ("AudioChannels"); - _audio_length = node->number_child<AudioContent::Frame> ("AudioLength"); + _audio_length = node->number_child<AudioFrame> ("AudioLength"); _audio_frame_rate = node->number_child<int> ("AudioFrameRate"); } @@ -147,7 +147,7 @@ SndfileContent::full_length () const shared_ptr<const Film> film = _film.lock (); assert (film); - OutputAudioFrame const len = audio_length() * output_audio_frame_rate() / content_audio_frame_rate (); + AudioFrame const len = audio_length() * output_audio_frame_rate() / content_audio_frame_rate (); /* XXX: this depends on whether, alongside this audio, we are running video slower or faster than it should be. The calculation above works out the output audio frames assuming that we are just |