X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.cc;h=77c9b0695a3d7b6f4c7d3b57df84193e017863eb;hb=3339d3bce70afe9ae2ca10e9fcfc4b54b748fbf4;hp=051fb4dd8bebe7eff08b69f095edc18a681c8551;hpb=8798bfab1539c3ac6031bb325e1b181c58b13fc5;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 051fb4dd8..77c9b0695 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "audio_decoder.h"
 #include "audio_buffers.h"
 #include "audio_content.h"
@@ -25,29 +26,32 @@
 #include "log.h"
 #include "resampler.h"
 #include "compose.hpp"
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
+
 using std::cout;
 using std::map;
 using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
 using boost::optional;
 using namespace dcpomatic;
 
+
 AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, bool fast)
 	: DecoderPart (parent)
 	, _content (content)
 	, _fast (fast)
 {
 	/* Set up _positions so that we have one for each stream */
-	BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
+	for (auto i: content->streams ()) {
 		_positions[i] = 0;
 	}
 }
 
+
 /** @param time_already_delayed true if the delay should not be added to time */
 void
 AudioDecoder::emit (shared_ptr<const Film> film, AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time, bool time_already_delayed)
@@ -67,7 +71,7 @@ AudioDecoder::emit (shared_ptr<const Film> film, AudioStreamPtr stream, shared_p
 		time += ContentTime::from_seconds (_content->delay() / 1000.0);
 	}
 
-	bool reset = false;
+	auto reset = false;
 	if (_positions[stream] == 0) {
 		/* This is the first data we have received since initialisation or seek.  Set
 		   the position based on the ContentTime that was given.  After this first time
@@ -96,8 +100,8 @@ AudioDecoder::emit (shared_ptr<const Film> film, AudioStreamPtr stream, shared_p
 	}
 
 	shared_ptr<Resampler> resampler;
-	ResamplerMap::iterator i = _resamplers.find(stream);
-	if (i != _resamplers.end ()) {
+	auto i = _resamplers.find(stream);
+	if (i != _resamplers.end()) {
 		resampler = i->second;
 	} else {
 		if (stream->frame_rate() != resampled_rate) {
@@ -108,7 +112,7 @@ AudioDecoder::emit (shared_ptr<const Film> film, AudioStreamPtr stream, shared_p
 				stream->channels()
 				);
 
-			resampler.reset (new Resampler(stream->frame_rate(), resampled_rate, stream->channels()));
+			resampler = make_shared<Resampler>(stream->frame_rate(), resampled_rate, stream->channels());
 			if (_fast) {
 				resampler->set_fast ();
 			}
@@ -117,7 +121,7 @@ AudioDecoder::emit (shared_ptr<const Film> film, AudioStreamPtr stream, shared_p
 	}
 
 	if (resampler) {
-		shared_ptr<const AudioBuffers> ro = resampler->run (data);
+		auto ro = resampler->run (data);
 		if (ro->frames() == 0) {
 			return;
 		}
@@ -128,21 +132,23 @@ AudioDecoder::emit (shared_ptr<const Film> film, AudioStreamPtr stream, shared_p
 	_positions[stream] += data->frames();
 }
 
+
 /** @return Time just after the last thing that was emitted from a given stream */
 ContentTime
 AudioDecoder::stream_position (shared_ptr<const Film> film, AudioStreamPtr stream) const
 {
-	PositionMap::const_iterator i = _positions.find (stream);
+	auto i = _positions.find (stream);
 	DCPOMATIC_ASSERT (i != _positions.end ());
 	return ContentTime::from_frames (i->second, _content->resampled_frame_rate(film));
 }
 
+
 boost::optional<ContentTime>
 AudioDecoder::position (shared_ptr<const Film> film) const
 {
 	optional<ContentTime> p;
-	for (PositionMap::const_iterator i = _positions.begin(); i != _positions.end(); ++i) {
-		ContentTime const ct = stream_position (film, i->first);
+	for (auto i: _positions) {
+		auto const ct = stream_position (film, i.first);
 		if (!p || ct < *p) {
 			p = ct;
 		}
@@ -151,27 +157,29 @@ AudioDecoder::position (shared_ptr<const Film> film) const
 	return p;
 }
 
+
 void
 AudioDecoder::seek ()
 {
-	for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
-		i->second->flush ();
-		i->second->reset ();
+	for (auto i: _resamplers) {
+		i.second->flush ();
+		i.second->reset ();
 	}
 
-	for (PositionMap::iterator i = _positions.begin(); i != _positions.end(); ++i) {
-		i->second = 0;
+	for (auto& i: _positions) {
+		i.second = 0;
 	}
 }
 
+
 void
 AudioDecoder::flush ()
 {
-	for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
-		shared_ptr<const AudioBuffers> ro = i->second->flush ();
+	for (auto const& i: _resamplers) {
+		auto ro = i.second->flush ();
 		if (ro->frames() > 0) {
-			Data (i->first, ContentAudio (ro, _positions[i->first]));
-			_positions[i->first] += ro->frames();
+			Data (i.first, ContentAudio (ro, _positions[i.first]));
+			_positions[i.first] += ro->frames();
 		}
 	}
 
@@ -181,12 +189,13 @@ AudioDecoder::flush ()
 	}
 }
 
+
 void
 AudioDecoder::silence (int milliseconds)
 {
-	BOOST_FOREACH (AudioStreamPtr i, _content->streams ()) {
+	for (auto i: _content->streams()) {
 		int const samples = ContentTime::from_seconds(milliseconds / 1000.0).frames_round(i->frame_rate());
-		shared_ptr<AudioBuffers> silence (new AudioBuffers (i->channels(), samples));
+		auto silence = make_shared<AudioBuffers>(i->channels(), samples);
 		silence->make_silent ();
 		Data (i, ContentAudio (silence, _positions[i]));
 	}