X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_view.cc;h=dc41db2fa51e82fd49ac5ba9c2165f7149174301;hb=bde76c3341775bd02da59932d285e14eade64ae0;hp=25392c81ad3e8092e278a58198fde5b20a3ad806;hpb=c7b68d663ac3db10dcf2bfcc11009dce46f820dc;p=dcpomatic.git diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc index 25392c81a..dc41db2fa 100644 --- a/src/wx/subtitle_view.cc +++ b/src/wx/subtitle_view.cc @@ -28,7 +28,7 @@ using std::list; using boost::shared_ptr; using boost::dynamic_pointer_cast; -SubtitleView::SubtitleView (wxWindow* parent, shared_ptr film, shared_ptr content) +SubtitleView::SubtitleView (wxWindow* parent, shared_ptr film, shared_ptr decoder, DCPTime position) : wxDialog (parent, wxID_ANY, _("Subtitles")) { _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL); @@ -65,9 +65,8 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr film, shared_ptr< sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } - shared_ptr decoder (new SubRipDecoder (content)); list subs = decoder->get_text_subtitles (ContentTimePeriod (ContentTime(), ContentTime::max ()), true); - FrameRateChange const frc = film->active_frame_rate_change (content->position ()); + FrameRateChange const frc = film->active_frame_rate_change (position); int n = 0; for (list::const_iterator i = subs.begin(); i != subs.end(); ++i) { for (list::const_iterator j = i->subs.begin(); j != i->subs.end(); ++j) {