projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic grunt-work, untested and unfinished, but it compiles.
[dcpomatic.git]
/
src
/
wx
/
subtitle_view.cc
diff --git
a/src/wx/subtitle_view.cc
b/src/wx/subtitle_view.cc
index a33a401df2fb087617709a3daa055d84d566b01d..6ec71fce5e91634a2495b4a8ddf33fb7f78312e7 100644
(file)
--- a/
src/wx/subtitle_view.cc
+++ b/
src/wx/subtitle_view.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
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.
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
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/>.
*/
*/
@@
-65,7
+66,10
@@
SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<
sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
}
sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
}
- list<ContentTextSubtitle> subs = decoder->subtitle->get_text_subtitles (ContentTimePeriod (ContentTime(), ContentTime::max ()), true, true);
+#if 0
+ XXX
+
+ 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<ContentTextSubtitle>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
FrameRateChange const frc = film->active_frame_rate_change (position);
int n = 0;
for (list<ContentTextSubtitle>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
@@
-80,6
+84,7
@@
SubtitleView::SubtitleView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<
++n;
}
}
++n;
}
}
+#endif
SetSizerAndFit (sizer);
}
SetSizerAndFit (sizer);
}