diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-10 11:27:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-10 11:27:26 +0100 |
| commit | bde76c3341775bd02da59932d285e14eade64ae0 (patch) | |
| tree | 7f0922faf1e64e74c029037afe8857c63f25e51a /src/wx/subtitle_view.cc | |
| parent | c7b68d663ac3db10dcf2bfcc11009dce46f820dc (diff) | |
Basics of DCP subtitle import.
Diffstat (limited to 'src/wx/subtitle_view.cc')
| -rw-r--r-- | src/wx/subtitle_view.cc | 5 |
1 files changed, 2 insertions, 3 deletions
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> film, shared_ptr<SubRipContent> content) +SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<SubtitleDecoder> 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> film, shared_ptr< sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } - shared_ptr<SubRipDecoder> decoder (new SubRipDecoder (content)); list<ContentTextSubtitle> 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<ContentTextSubtitle>::const_iterator i = subs.begin(); i != subs.end(); ++i) { for (list<dcp::SubtitleString>::const_iterator j = i->subs.begin(); j != i->subs.end(); ++j) { |