X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_decoder.cc;h=ecd1a7e16d46d74ba49e84c2a22482e24839b38c;hb=387304bc9147933b68eda2b38ba8cac0d250e87e;hp=602014d5883d2dba1381588bb44a7036debc9c96;hpb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;p=dcpomatic.git diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc index 602014d58..ecd1a7e16 100644 --- a/src/lib/sndfile_decoder.cc +++ b/src/lib/sndfile_decoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-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 @@ -65,7 +65,7 @@ SndfileDecoder::~SndfileDecoder () } bool -SndfileDecoder::pass () +SndfileDecoder::pass (PassReason) { if (_remaining == 0) { return true; @@ -116,10 +116,10 @@ SndfileDecoder::audio_channels () const return _info.channels; } -ContentTime +Frame SndfileDecoder::audio_length () const { - return ContentTime::from_frames (_info.frames, audio_frame_rate ()); + return _info.frames; } int