projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak formatting.
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle.h
diff --git
a/src/lib/dcp_subtitle.h
b/src/lib/dcp_subtitle.h
index 4b4d4c92a9822f19ac31c7e91e5ea5c8e53b918c..2011759aa13082ab7e39485e03638d08bfb155e4 100644
(file)
--- a/
src/lib/dcp_subtitle.h
+++ b/
src/lib/dcp_subtitle.h
@@
-1,36
+1,41
@@
/*
/*
- Copyright (C) 2014-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
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/>.
*/
*/
-#ifndef DCPOMATIC_SRC_LIB_DCP_SUBTITLE_H
-#define DCPOMATIC_SRC_LIB_DCP_SUBTITLE_H
-#include <boost/shared_ptr.hpp>
+#ifndef DCPOMATIC_DCP_SUBTITLE_H
+#define DCPOMATIC_DCP_SUBTITLE_H
+
+
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
+
namespace dcp {
class SubtitleAsset;
}
namespace dcp {
class SubtitleAsset;
}
+
class DCPSubtitle
{
protected:
class DCPSubtitle
{
protected:
-
boost
::shared_ptr<dcp::SubtitleAsset> load (boost::filesystem::path) const;
+
std
::shared_ptr<dcp::SubtitleAsset> load (boost::filesystem::path) const;
};
};
+
#endif
#endif