Compiles; strange hang on adding content to a film.

[dcpomatic.git] / src / lib / sndfile_content.cc

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 539b0dfb586a4926c47e4e1f3e6678966e254ad9..210ca15779980d6970d79eebf61d801ca973cdb7 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -68,7 +68,7 @@ SndfileContent::information () const
        s << String::compose (
                _("%1 channels, %2kHz, %3 samples"),
                audio_channels(),
-               audio_frame_rate() / 1000.0,
+               content_audio_frame_rate() / 1000.0,
                audio_length()
                );
        
@@ -120,3 +120,15 @@ SndfileContent::as_xml (xmlpp::Node* node) const
        node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (_audio_frame_rate));
 }
 
+int
+SndfileContent::output_audio_frame_rate (shared_ptr<const Film>) const
+{
+       /* Resample to a DCI-approved sample rate */
+       return dcp_audio_frame_rate (content_audio_frame_rate ());
+}
+
+Time
+SndfileContent::length (shared_ptr<const Film> film) const
+{
+       return film->audio_frames_to_time (audio_length ());
+}