X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=d0a898b18f645d3d469c997b039f88ed138f78ed;hb=ff40ecd114547a2fc07bc49403c993c3fa5d40cc;hp=2e90b3a81c4ea0f8326cb8f2b09bdf0f2ea8b370;hpb=870a574324d28d4b2a4574e33de5c690a0ed55ad;p=dcpomatic.git

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 2e90b3a81..d0a898b18 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -25,7 +25,7 @@
 #include "timeline_labels_view.h"
 #include "timeline_video_content_view.h"
 #include "timeline_audio_content_view.h"
-#include "timeline_subtitle_content_view.h"
+#include "timeline_text_content_view.h"
 #include "timeline_atmos_content_view.h"
 #include "content_panel.h"
 #include "wx_util.h"
@@ -34,13 +34,14 @@
 #include "lib/image_content.h"
 #include "lib/timer.h"
 #include "lib/audio_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
 #include "lib/video_content.h"
 #include "lib/atmos_mxf_content.h"
 #include <wx/graphics.h>
 #include <boost/weak_ptr.hpp>
 #include <boost/foreach.hpp>
 #include <list>
+#include <iterator>
 #include <iostream>
 
 using std::list;
@@ -228,7 +229,7 @@ Timeline::recreate_views ()
 		}
 
 		if (i->subtitle) {
-			_views.push_back (shared_ptr<TimelineView> (new TimelineSubtitleContentView (*this, i)));
+			_views.push_back (shared_ptr<TimelineView> (new TimelineTextContentView (*this, i)));
 		}
 
 		if (dynamic_pointer_cast<AtmosMXFContent> (i)) {
@@ -315,13 +316,13 @@ struct AudioMappingComparator {
 		shared_ptr<TimelineAudioContentView> cva = dynamic_pointer_cast<TimelineAudioContentView>(a);
 		if (cva) {
 			list<int> oc = cva->content()->audio->mapping().mapped_output_channels();
-			la = *min_element(begin(oc), end(oc));
+			la = *min_element(boost::begin(oc), boost::end(oc));
 		}
 		int lb = -1;
 		shared_ptr<TimelineAudioContentView> cvb = dynamic_pointer_cast<TimelineAudioContentView>(b);
 		if (cvb) {
 			list<int> oc = cvb->content()->audio->mapping().mapped_output_channels();
-			lb = *min_element(begin(oc), end(oc));
+			lb = *min_element(boost::begin(oc), boost::end(oc));
 		}
 		return la < lb;
 	}
@@ -374,7 +375,7 @@ Timeline::assign_tracks ()
 
 	/* Subtitle */
 
-	int const subtitle_tracks = place<TimelineSubtitleContentView> (_views, _tracks);
+	int const subtitle_tracks = place<TimelineTextContentView> (_views, _tracks);
 
 	/* Atmos */