*/
-#include "lib/subrip_decoder.h"
+#include "lib/text_subtitle_decoder.h"
#include "lib/content_subtitle.h"
#include "lib/film.h"
-#include "lib/subrip_content.h"
+#include "lib/text_subtitle_content.h"
#include "subtitle_view.h"
#include "wx_util.h"
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
-SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<SubRipContent> content)
- : wxDialog (parent, wxID_ANY, _("Subtitles"))
+SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<SubtitleDecoder> decoder, DCPTime position)
+ : wxDialog (parent, wxID_ANY, _("Subtitles"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
{
_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL);
ip.SetText (_("End"));
ip.SetWidth (100);
_list->InsertColumn (1, ip);
- }
+ }
{
wxListItem ip;
}
wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
- sizer->Add (_list, 1, wxEXPAND);
+ sizer->Add (_list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP);
wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
if (buttons) {
sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
}
- shared_ptr<SubRipDecoder> decoder (new SubRipDecoder (content));
- list<shared_ptr<ContentTextSubtitle> > subs = decoder->get_text_subtitles (ContentTimePeriod (ContentTime(), ContentTime::max ()));
- FrameRateChange const frc = film->active_frame_rate_change (content->position ());
+ list<ContentTextSubtitle> subs = decoder->get_text_subtitles (ContentTimePeriod (ContentTime(), ContentTime::max ()), true, true);
+ FrameRateChange const frc = film->active_frame_rate_change (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 ()));
SetSizerAndFit (sizer);
}
-