FFmpegContent does not need audio_length().

[dcpomatic.git] / src / lib / font.h

diff --git a/src/lib/font.h b/src/lib/font.h
index 7a26eefc9227f0f11554a9c9d9b5cfa4aa182fe7..8021ab5bc662e59bc918a48fdf3bea18631637cd 100644 (file)
--- a/src/lib/font.h
+++ b/src/lib/font.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
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_FONT_H
+#define DCPOMATIC_FONT_H
+
 #include <libcxml/cxml.h>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
@@ -25,8 +28,6 @@
 class Font
 {
 public:
-       Font () {}
-
        Font (std::string id_)
                : id (id_) {}
 
@@ -34,10 +35,12 @@ public:
 
        void as_xml (xmlpp::Node* node);
        
-       /** Font ID, or empty for the default font */
-       boost::optional<std::string> id;
+       /** Font ID, used to describe it in the subtitle content */
+       std::string id;
        boost::optional<boost::filesystem::path> file;
 };
 
 bool
 operator!= (Font const & a, Font const & b);
+
+#endif