Switch to testing on Ubuntu 16.04 and 22.04.

[libdcp.git] / src / subtitle_asset.cc

diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index b7e75419d1d3dd4bc7c4bbb475623f1541acff94..4deb366aa4921cf2bbfdb8c9b2a6f5d8e2287b0d 100644 (file)
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -37,17 +37,17 @@
  */
 
 
-#include "raw_convert.h"
 #include "compose.hpp"
+#include "dcp_assert.h"
+#include "load_font_node.h"
+#include "raw_convert.h"
+#include "reel_asset.h"
 #include "subtitle_asset.h"
 #include "subtitle_asset_internal.h"
+#include "subtitle_image.h"
+#include "subtitle_string.h"
 #include "util.h"
 #include "xml.h"
-#include "subtitle_string.h"
-#include "subtitle_image.h"
-#include "dcp_assert.h"
-#include "load_font_node.h"
-#include "reel_asset.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_util.h>
 #include <libxml++/nodes/element.h>
@@ -499,26 +499,6 @@ SubtitleAsset::subtitles_during (Time from, Time to, bool starting) const
 }
 
 
-/* XXX: this needs a test */
-vector<shared_ptr<const Subtitle>>
-SubtitleAsset::subtitles_in_reel (shared_ptr<const dcp::ReelAsset> asset) const
-{
-       auto frame_rate = asset->edit_rate().as_float();
-       auto start = dcp::Time(asset->entry_point().get_value_or(0), frame_rate, time_code_rate());
-       auto during = subtitles_during (start, start + dcp::Time(asset->intrinsic_duration(), frame_rate, time_code_rate()), false);
-
-       vector<shared_ptr<const dcp::Subtitle>> corrected;
-       for (auto i: during) {
-               auto c = make_shared<dcp::Subtitle>(*i);
-               c->set_in (c->in() - start);
-               c->set_out (c->out() - start);
-               corrected.push_back (c);
-       }
-
-       return corrected;
-}
-
-
 void
 SubtitleAsset::add (shared_ptr<Subtitle> s)
 {