Tidying.

[libdcp.git] / src / font_asset.h

diff --git a/src/font_asset.h b/src/font_asset.h
index 13333777461e10773fbc8cc22654733d3e64eb04..d39a6b244cd57c002675a1fce3d2bd4c6ec531ed 100644 (file)
--- a/src/font_asset.h
+++ b/src/font_asset.h
@@ -1,40 +1,63 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp 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
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
+
 /** @file  src/font_asset.h
- *  @brief FontAsset class.
+ *  @brief FontAsset class
  */
 
+
 #include "asset.h"
 
+
 namespace dcp {
 
+
 /** @class FontAsset
  *  @brief A (truetype) font asset for subtitles in an Interop DCP.
  */
 class FontAsset : public Asset
 {
 public:
-       FontAsset (boost::filesystem::path file);
-       
+       FontAsset (std::string id, boost::filesystem::path file);
+
+       static std::string static_pkl_type (Standard standard);
+
 private:
-       std::string pkl_type (Standard standard) const;
+       std::string pkl_type (Standard standard) const {
+               return static_pkl_type (standard);
+       }
 };
 
+
 }