X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_view.cc;h=916f1eedcdf39ea1afedba5b0ceca5a0399e25f9;hb=80400212e939dc2f3b987cb6df57709929aa5178;hp=d14f260c9c8ba4098e39527ab960514a38ac3df0;hpb=d342a1befa88cb3f23c7e3fccfd1edaeea968fed;p=dcpomatic.git

diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc
index d14f260c9..916f1eedc 100644
--- a/src/wx/subtitle_view.cc
+++ b/src/wx/subtitle_view.cc
@@ -17,16 +17,19 @@
 
 */
 
-#include "lib/subrip_decoder.h"
+#include "lib/text_subtitle_decoder.h"
 #include "lib/content_subtitle.h"
+#include "lib/film.h"
+#include "lib/text_subtitle_content.h"
 #include "subtitle_view.h"
+#include "wx_util.h"
 
 using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
-SubtitleView::SubtitleView (wxWindow* parent, 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);
 
@@ -44,7 +47,7 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<SubRipContent> content)
 		ip.SetText (_("End"));
 		ip.SetWidth (100);
 		_list->InsertColumn (1, ip);
-	}		
+	}
 
 	{
 		wxListItem ip;
@@ -55,26 +58,28 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<SubRipContent> content)
 	}
 
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-	sizer->Add (_list, 1, wxEXPAND);
+	sizer->Add (_list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP);
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+	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 ()));
+	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);
-			_list->SetItem (n, 2, j->text ());
+			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 ()));
 			++n;
 		}
 	}
 
 	SetSizerAndFit (sizer);
 }
-