projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop crashing when running the hints check on films with silent/black gaps.
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle_content.h
diff --git
a/src/lib/dcp_subtitle_content.h
b/src/lib/dcp_subtitle_content.h
index 5794b59516e6767f586cc5d0a33663b2ed9ef376..5ff4095469cbba0c70d7df749dff868363f78776 100644
(file)
--- a/
src/lib/dcp_subtitle_content.h
+++ b/
src/lib/dcp_subtitle_content.h
@@
-1,43
+1,39
@@
/*
/*
- Copyright (C) 2014 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/>.
*/
*/
-#include "subtitle_content.h"
+#include "dcp_subtitle.h"
+#include "content.h"
-class DCPSubtitleContent : public
Subtitle
Content
+class DCPSubtitleContent : public
DCPSubtitle, public
Content
{
public:
{
public:
- DCPSubtitleContent (boost::
shared_ptr<const Film>, boost::
filesystem::path);
- DCPSubtitleContent (
boost::shared_ptr<const Film>,
cxml::ConstNodePtr, int);
+ DCPSubtitleContent (boost::filesystem::path);
+ DCPSubtitleContent (cxml::ConstNodePtr, int);
- /* Content */
- void examine (boost::shared_ptr<Job>);
+ void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
std::string summary () const;
std::string technical_summary () const;
std::string summary () const;
std::string technical_summary () const;
- std::string information () const;
- void as_xml (xmlpp::Node *) const;
- DCPTime full_length () const;
-
- /* SubtitleContent */
- bool has_subtitles () const {
- return true;
- }
+ void as_xml (xmlpp::Node *, bool with_paths) const;
+ dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+ dcpomatic::DCPTime approximate_length () const;
private:
private:
-
DCP
Time _length;
+
dcpomatic::Content
Time _length;
};
};