Cleanup: fix more comments/guards (and add check script).

[libdcp.git] / src / interop_subtitle_asset.h

diff --git a/src/interop_subtitle_asset.h b/src/interop_subtitle_asset.h
index 23cf0b492fc51aac6b06baf83ecab7016bbc3fb3..ad1c68a7a7286a2a0ea3d0f6495f02ce5ecec527 100644 (file)
--- a/src/interop_subtitle_asset.h
+++ b/src/interop_subtitle_asset.h
@@ -37,8 +37,8 @@
  */
 
 
-#ifndef DCP_INTEROP_SUBTITLE_ASSET_H
-#define DCP_INTEROP_SUBTITLE_ASSET_H
+#ifndef LIBDCP_INTEROP_SUBTITLE_ASSET_H
+#define LIBDCP_INTEROP_SUBTITLE_ASSET_H
 
 
 #include "subtitle_asset.h"
@@ -65,7 +65,7 @@ public:
 
        bool equals (
                std::shared_ptr<const Asset>,
-               EqualityOptions,
+               EqualityOptions const&,
                NoteHandler note
                ) const override;
 
@@ -82,8 +82,15 @@ public:
        void write (boost::filesystem::path path) const override;
 
        void resolve_fonts (std::vector<std::shared_ptr<Asset>> assets);
-       void add_font_assets (std::vector<std::shared_ptr<Asset>>& assets);
        void set_font_file (std::string load_id, boost::filesystem::path file);
+       std::vector<std::shared_ptr<Asset>> font_assets();
+       std::vector<std::shared_ptr<const Asset>> font_assets() const;
+
+       /** @return the <LoadFont> IDs of fonts for which we have not (yet) found a font asset.
+        *  This could be because resolve_fonts() has not yet been called, or because there is
+        *  a missing font file.
+        */
+       std::vector<std::string> unresolved_fonts() const;
 
        /** Set the reel number or sub-element identifier
         *  of these subtitles.