X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_view.cc;h=b2e74eb88b56d985e706f8cf4051a9d1eadaa15c;hp=dc41db2fa51e82fd49ac5ba9c2165f7149174301;hb=507a389e9c5f84ec1d51e7566e38fbf42f658537;hpb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab

diff --git a/src/wx/subtitle_view.cc b/src/wx/subtitle_view.cc
index dc41db2fa..b2e74eb88 100644
--- a/src/wx/subtitle_view.cc
+++ b/src/wx/subtitle_view.cc
@@ -1,35 +1,44 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 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/content_subtitle.h"
+#include "lib/plain_text_file_decoder.h"
+#include "lib/content_text.h"
+#include "lib/video_decoder.h"
+#include "lib/audio_decoder.h"
 #include "lib/film.h"
-#include "lib/subrip_content.h"
+#include "lib/config.h"
+#include "lib/plain_text_file_content.h"
+#include "lib/text_decoder.h"
 #include "subtitle_view.h"
+#include "film_viewer.h"
 #include "wx_util.h"
 
 using std::list;
 using boost::shared_ptr;
+using boost::bind;
 using boost::dynamic_pointer_cast;
 
-SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<SubtitleDecoder> decoder, DCPTime position)
-	: wxDialog (parent, wxID_ANY, _("Subtitles"))
+SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content, shared_ptr<Decoder> decoder, FilmViewer* viewer)
+	: wxDialog (parent, wxID_ANY, _("Subtitles"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+	, _content (content)
+	, _film_viewer (viewer)
 {
 	_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL);
 
@@ -47,7 +56,7 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<
 		ip.SetText (_("End"));
 		ip.SetWidth (100);
 		_list->InsertColumn (1, ip);
-	}		
+	}
 
 	{
 		wxListItem ip;
@@ -58,29 +67,67 @@ 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);
+
+	_list->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&SubtitleView::subtitle_selected, this, _1));
 
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
 		sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
 
-	list<ContentTextSubtitle> subs = decoder->get_text_subtitles (ContentTimePeriod (ContentTime(), ContentTime::max ()), true);
-	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) {
-			wxListItem list_item;
-			list_item.SetId (n);
-			_list->InsertItem (list_item);
-			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;
-		}
+	if (decoder->video) {
+		decoder->video->set_ignore (true);
+	}
+	if (decoder->audio) {
+		decoder->audio->set_ignore (true);
 	}
 
+	_subs = 0;
+	_frc = film->active_frame_rate_change (content->position());
+	decoder->subtitle->PlainStart.connect (bind (&SubtitleView::data_start, this, _1));
+	decoder->subtitle->Stop.connect (bind (&SubtitleView::data_stop, this, _1));
+	while (!decoder->pass ()) {}
 	SetSizerAndFit (sizer);
 }
 
+void
+SubtitleView::data_start (ContentPlainText cts)
+{
+	BOOST_FOREACH (dcp::SubtitleString const & i, cts.subs) {
+		wxListItem list_item;
+		list_item.SetId (_subs);
+		_list->InsertItem (list_item);
+		_list->SetItem (_subs, 0, std_to_wx (cts.from().timecode (_frc->source)));
+		_list->SetItem (_subs, 2, std_to_wx (i.text ()));
+		_start_times.push_back (cts.from ());
+		++_subs;
+	}
+
+	_last_count = cts.subs.size ();
+}
+
+void
+SubtitleView::data_stop (ContentTime time)
+{
+	if (!_last_count) {
+		return;
+	}
+
+	for (int i = _subs - *_last_count; i < _subs; ++i) {
+		_list->SetItem (i, 1, std_to_wx (time.timecode (_frc->source)));
+	}
+}
+
+void
+SubtitleView::subtitle_selected (wxListEvent& ev)
+{
+	if (!Config::instance()->jump_to_selected ()) {
+		return;
+	}
+
+	DCPOMATIC_ASSERT (ev.GetIndex() < int(_start_times.size()));
+	shared_ptr<Content> locked = _content.lock ();
+	DCPOMATIC_ASSERT (locked);
+	_film_viewer->set_position (locked, _start_times[ev.GetIndex()]);
+}