projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
wx
/
subtitle_view.cc
diff --git
a/src/wx/subtitle_view.cc
b/src/wx/subtitle_view.cc
index adbc4a62585eb7d8e2f842b36dd39c978e6cf688..33ef7cfda14817326ca1de8a3f75011df7aa4026 100644
(file)
--- a/
src/wx/subtitle_view.cc
+++ b/
src/wx/subtitle_view.cc
@@
-19,13
+19,16
@@
#include "lib/subrip_decoder.h"
#include "lib/content_subtitle.h"
#include "lib/subrip_decoder.h"
#include "lib/content_subtitle.h"
+#include "lib/film.h"
+#include "lib/subrip_content.h"
#include "subtitle_view.h"
#include "subtitle_view.h"
+#include "wx_util.h"
using std::list;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using std::list;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
-SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<
SubRipContent> content
)
+SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<
Film> film, shared_ptr<SubtitleDecoder> decoder, DCPTime position
)
: wxDialog (parent, wxID_ANY, _("Subtitles"))
{
_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL);
: wxDialog (parent, wxID_ANY, _("Subtitles"))
{
_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);
ip.SetText (_("End"));
ip.SetWidth (100);
_list->InsertColumn (1, ip);
- }
+ }
{
wxListItem ip;
{
wxListItem ip;
@@
-55,22
+58,25
@@
SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<SubRipContent> content)
}
wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
}
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());
}
if (buttons) {
sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
}
-
shared_ptr<SubRipDecoder> decoder (new SubRipDecoder (content)
);
-
list<shared_ptr<ContentTextSubtitle> > subs = decoder->get_text_subtitles (ContentTime(), ContentTime::max ()
);
+
list<ContentTextSubtitle> subs = decoder->get_text_subtitles (ContentTimePeriod (ContentTime(), ContentTime::max ()), true
);
+
FrameRateChange const frc = film->active_frame_rate_change (position
);
int n = 0;
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);
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;
}
}
++n;
}
}