projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calcu...
[dcpomatic.git]
/
src
/
lib
/
subrip_content.h
diff --git
a/src/lib/subrip_content.h
b/src/lib/subrip_content.h
index d2dcdee00b09cce5e1b014dba924fd0b09bea8ff..e6352617972e31fcfd089911964446abcab60173 100644
(file)
--- a/
src/lib/subrip_content.h
+++ b/
src/lib/subrip_content.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2015
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-33,7
+33,6
@@
public:
void examine (boost::shared_ptr<Job>);
std::string summary () const;
std::string technical_summary () const;
void examine (boost::shared_ptr<Job>);
std::string summary () const;
std::string technical_summary () const;
- std::string information () const;
void as_xml (xmlpp::Node *) const;
DCPTime full_length () const;
void as_xml (xmlpp::Node *) const;
DCPTime full_length () const;
@@
-42,6
+41,8
@@
public:
return true;
}
return true;
}
+ static std::string const font_id;
+
private:
DCPTime _length;
};
private:
DCPTime _length;
};