diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-02 18:17:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-02 18:17:35 +0100 |
| commit | 40b3ced17b7fff8badfaa8ec2201a8186cdc7dc2 (patch) | |
| tree | 38c13732a1d05e7b4c925e651caa25aa6f6edd4c /src/lib/sndfile_content.cc | |
| parent | 3967bd6a07b436a6b2eb8d0f8f634fdc11689c75 (diff) | |
Rename AudioContent frame_rate methods and move resampled_audio_frame_rate into AudioContent.
Diffstat (limited to 'src/lib/sndfile_content.cc')
| -rw-r--r-- | src/lib/sndfile_content.cc | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc index 5b408f2da..0cf65967f 100644 --- a/src/lib/sndfile_content.cc +++ b/src/lib/sndfile_content.cc @@ -80,8 +80,8 @@ SndfileContent::information () const s << String::compose ( _("%1 channels, %2kHz, %3 samples"), audio_channels(), - content_audio_frame_rate() / 1000.0, - audio_length().frames (content_audio_frame_rate ()) + audio_frame_rate() / 1000.0, + audio_length().frames (audio_frame_rate ()) ); return s.str (); @@ -134,7 +134,7 @@ SndfileContent::as_xml (xmlpp::Node* node) const node->add_child("AudioChannels")->add_child_text (lexical_cast<string> (audio_channels ())); node->add_child("AudioLength")->add_child_text (lexical_cast<string> (audio_length().get ())); - node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (content_audio_frame_rate ())); + node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (audio_frame_rate ())); _audio_mapping.as_xml (node->add_child("AudioMapping")); } @@ -146,15 +146,6 @@ SndfileContent::full_length () const return DCPTime (audio_length(), film->active_frame_rate_change (position ())); } -int -SndfileContent::output_audio_frame_rate () const -{ - shared_ptr<const Film> film = _film.lock (); - assert (film); - - return film->audio_frame_rate (); -} - void SndfileContent::set_audio_mapping (AudioMapping m) { |