X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2Fresampler.cc;h=e414436e8b39960c6c5f78ca16188c0781bc0407;hb=05654d0e1799746a9df3ccab040c92e0ed825cac;hp=e6b1623d9cbeb3afbe7df32a758323d9980b36b9;hpb=1b576d63f5b5babda35c3995dd375e39baa16947;p=dcpomatic.git

diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index e6b1623d9..e414436e8 100644
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -60,11 +60,9 @@ Resampler::~Resampler ()
 	swr_free (&_swr_context);
 }
 
-pair<shared_ptr<const AudioBuffers>, AudioContent::Frame>
-Resampler::run (shared_ptr<const AudioBuffers> in, AudioContent::Frame frame)
+shared_ptr<const AudioBuffers>
+Resampler::run (shared_ptr<const AudioBuffers> in)
 {
-	AudioContent::Frame const resamp_time = swr_next_pts (_swr_context, frame * _out_rate) / _in_rate;
-		
 	/* Compute the resampled frames count and add 32 for luck */
 	int const max_resampled_frames = ceil ((double) in->frames() * _out_rate / _in_rate) + 32;
 	shared_ptr<AudioBuffers> resampled (new AudioBuffers (_channels, max_resampled_frames));
@@ -80,7 +78,7 @@ Resampler::run (shared_ptr<const AudioBuffers> in, AudioContent::Frame frame)
 	}
 	
 	resampled->set_frames (resampled_frames);
-	return make_pair (resampled, resamp_time);
+	return resampled;
 }	
 
 shared_ptr<const AudioBuffers>
@@ -91,7 +89,7 @@ Resampler::flush ()
 	int64_t const pass_size = 256;
 	shared_ptr<AudioBuffers> pass (new AudioBuffers (_channels, 256));
 
-	while (1) {
+	while (true) {
 		int const frames = swr_convert (_swr_context, (uint8_t **) pass->data(), pass_size, 0, 0);
 		
 		if (frames < 0) {