projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First go at configurable config.xml location.
[dcpomatic.git]
/
src
/
lib
/
text_subtitle.cc
diff --git
a/src/lib/text_subtitle.cc
b/src/lib/text_subtitle.cc
index 7faecb459b4f2b6f7f6f20a2007ea4d77da8fcd3..0f5e055cfc781180069506e8c05fe0ecdf8e3e37 100644
(file)
--- a/
src/lib/text_subtitle.cc
+++ b/
src/lib/text_subtitle.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2016 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/>.
*/
*/
@@
-68,15
+69,20
@@
TextSubtitle::TextSubtitle (shared_ptr<const TextSubtitleContent> content)
sub::Reader* reader = 0;
sub::Reader* reader = 0;
- if (content->path(0).extension() == ".srt" || content->path(0).extension() == ".SRT") {
+ string ext = content->path(0).extension().string();
+ transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
+
+ if (ext == ".srt") {
reader = new sub::SubripReader (utf8.get());
reader = new sub::SubripReader (utf8.get());
- } else if (
content->path(0).extension() == ".ssa" || content->path(0).extension() == ".SSA
") {
+ } else if (
ext == ".ssa" || ext == ".ass
") {
reader = new sub::SSAReader (utf8.get());
}
if (reader) {
_subtitles = sub::collect<vector<sub::Subtitle> > (reader->subtitles ());
}
reader = new sub::SSAReader (utf8.get());
}
if (reader) {
_subtitles = sub::collect<vector<sub::Subtitle> > (reader->subtitles ());
}
+
+ delete reader;
}
ContentTime
}
ContentTime