X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.cc;h=e757c77c5469704e48c386b81199b5532bfc91b2;hb=59e769023c392c332331567a1aea94660002c463;hp=1a17976657c42759a10566aaec00559de94e1ba9;hpb=3b48d5494c3cae7743d283203f5c8021860ab81f;p=dcpomatic.git diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc index 1a1797665..e757c77c5 100644 --- a/src/lib/sndfile_content.cc +++ b/src/lib/sndfile_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -72,25 +72,6 @@ SndfileContent::technical_summary () const + " - sndfile"; } -string -SndfileContent::information () const -{ - if (_audio_frame_rate == 0) { - return ""; - } - - SafeStringStream s; - - s << String::compose ( - _("%1 channels, %2kHz, %3 samples"), - audio_channels(), - audio_frame_rate() / 1000.0, - audio_length().frames (audio_frame_rate ()) - ); - - return s.str (); -} - bool SndfileContent::valid_file (boost::filesystem::path f) { @@ -113,7 +94,7 @@ DCPTime SndfileContent::full_length () const { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); return DCPTime (audio_length(), film->active_frame_rate_change (position ())); }