projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename SubRip -> TextSubtitle.
[dcpomatic.git]
/
src
/
wx
/
subtitle_view.cc
diff --git
a/src/wx/subtitle_view.cc
b/src/wx/subtitle_view.cc
index f6fbd9a9abfbf1f49e1e99e327fa16462bd6ffe6..916f1eedcdf39ea1afedba5b0ceca5a0399e25f9 100644
(file)
--- a/
src/wx/subtitle_view.cc
+++ b/
src/wx/subtitle_view.cc
@@
-17,16
+17,19
@@
*/
*/
-#include "lib/subrip_decoder.h"
-#include "lib/decoded.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 "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
)
- : 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);
{
_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,35
+58,28
@@
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<ContentTextSubtitle> subs = decoder->get_text_subtitles (ContentTimePeriod (ContentTime(), ContentTime::max ()), true, true);
+ FrameRateChange const frc = film->active_frame_rate_change (position);
int n = 0;
int n = 0;
- while (1) {
- shared_ptr<Decoded> dec = decoder->peek ();
- if (!dec) {
- break;
- }
-
- shared_ptr<DecodedTextSubtitle> sub = dynamic_pointer_cast<DecodedTextSubtitle> (dec);
- assert (sub);
-
- for (list<dcp::SubtitleString>::const_iterator i = sub->subs.begin(); i != sub->subs.end(); ++i) {
+ 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, i->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;
}
-
- decoder->consume ();
}
SetSizerAndFit (sizer);
}
}
SetSizerAndFit (sizer);
}
-