X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_view.cc;h=e3aaffdfcf811a71e29f08a8d9d463b18277858d;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=e4604ccde18584b0a9951c671aaf394e727d359b;hpb=74fe68e5895654e27a7cf8097917c1e95fa89519;p=dcpomatic.git

diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc
index e4604ccde..e3aaffdfc 100644
--- a/src/wx/subtitle_view.cc
+++ b/src/wx/subtitle_view.cc
@@ -1,26 +1,27 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#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"
 
@@ -28,8 +29,8 @@ using std::list;
 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<Decoder> 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);
 
@@ -47,7 +48,7 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<
 		ip.SetText (_("End"));
 		ip.SetWidth (100);
 		_list->InsertColumn (1, ip);
-	}		
+	}
 
 	{
 		wxListItem ip;
@@ -58,23 +59,22 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<
 	}
 
 	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->subtitle->get_text (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 ()));
@@ -84,4 +84,3 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<
 
 	SetSizerAndFit (sizer);
 }
-