X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Factive_text.cc;h=1180ce7b0bc42f3c6b1deb7ef1fb0fdbb789eecd;hb=6cac49dc50dae6b173135df101d532f20031ca70;hp=2988c04a397e66aebb73d8198445e1986f9513f1;hpb=3a7b6acdb993864f319a6ceb3bc4c3fb7d4aaefd;p=dcpomatic.git

diff --git a/src/lib/active_text.cc b/src/lib/active_text.cc
index 2988c04a3..1180ce7b0 100644
--- a/src/lib/active_text.cc
+++ b/src/lib/active_text.cc
@@ -18,17 +18,18 @@
 
 */
 
+
 #include "active_text.h"
 #include "text_content.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+
 
 using std::list;
 using std::pair;
 using std::make_pair;
-using boost::weak_ptr;
-using boost::shared_ptr;
+using std::weak_ptr;
+using std::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 /** Get the open captions that should be burnt into a given period.
  *  @param period Period of interest.
@@ -53,7 +54,7 @@ ActiveText::get_burnt (DCPTimePeriod period, bool always_burn_captions) const
 			continue;
 		}
 
-		BOOST_FOREACH (Period j, i->second) {
+		for (auto j: i->second) {
 			DCPTimePeriod test (j.from, j.to.get_value_or(DCPTime::max()));
 			optional<DCPTimePeriod> overlap = period.overlap (test);
 			if (overlap && overlap->duration() > DCPTime(period.duration().get() / 2)) {
@@ -76,7 +77,7 @@ ActiveText::clear_before (DCPTime time)
 	Map updated;
 	for (Map::const_iterator i = _data.begin(); i != _data.end(); ++i) {
 		list<Period> as;
-		BOOST_FOREACH (Period j, i->second) {
+		for (auto j: i->second) {
 			if (!j.to || j.to.get() >= time) {
 				as.push_back (j);
 			}
@@ -118,7 +119,7 @@ ActiveText::add_to (weak_ptr<const TextContent> content, DCPTime to)
 
 	_data[content].back().to = to;
 
-	BOOST_FOREACH (StringText& i, _data[content].back().subs.string) {
+	for (auto& i: _data[content].back().subs.string) {
 		i.set_out (dcp::Time(to.seconds(), 1000));
 	}