Merge master.
[dcpomatic.git] / src / lib / render_subtitles.h
index 22648387ef2312a5f2f81c731f43f58cbbb3e2d5..743339bafc80b109be05e25d5c04549176ea509f 100644 (file)
 
 */
 
-#include <libdcp/subtitle_asset.h>
-#include <libdcp/util.h>
+#include <dcp/subtitle_string.h>
+#include <dcp/util.h>
 #include "position.h"
 
 class Image;
 
 void
-render_subtitles (std::list<libdcp::Subtitle>, libdcp::Size, boost::shared_ptr<Image> &, Position<int> &);
+render_subtitles (std::list<dcp::SubtitleString>, dcp::Size, boost::shared_ptr<Image> &, Position<int> &);