diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-02 14:19:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-02 14:19:21 +0100 |
| commit | 712f8144f1992364d79a80b2b586248423f7ac11 (patch) | |
| tree | 09a26e5ae303a3ae3e9cc44d0da0fbb3ae7c455a /src/wx/subtitle_view.cc | |
| parent | bc9458cbe39a24d22c199c82efab524208dc347d (diff) | |
Rearrange Player subtitle handling a bit.
Diffstat (limited to 'src/wx/subtitle_view.cc')
| -rw-r--r-- | src/wx/subtitle_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc index e4604ccde..e65d9abc0 100644 --- a/src/wx/subtitle_view.cc +++ b/src/wx/subtitle_view.cc @@ -66,15 +66,15 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr< } shared_ptr<SubRipDecoder> decoder (new SubRipDecoder (content)); - list<shared_ptr<ContentTextSubtitle> > subs = decoder->get_text_subtitles (ContentTimePeriod (ContentTime(), ContentTime::max ())); + list<ContentTextSubtitle> subs = decoder->get_text_subtitles (ContentTimePeriod (ContentTime(), ContentTime::max ())); FrameRateChange const frc = film->active_frame_rate_change (content->position ()); int n = 0; - for (list<shared_ptr<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) { + 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) { wxListItem list_item; list_item.SetId (n); _list->InsertItem (list_item); - ContentTimePeriod const p = (*i)->period (); + ContentTimePeriod const p = i->period (); _list->SetItem (n, 0, std_to_wx (p.from.timecode (frc.source))); _list->SetItem (n, 1, std_to_wx (p.to.timecode (frc.source))); _list->SetItem (n, 2, std_to_wx (j->text ())); |