Merge master.

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

diff --git a/src/lib/format.h b/src/lib/format.h
index e953062329d9b583a0cfd078159499fb991320dc..29347a3fd8894caca6930f650542b45bd31d558c 100644 (file)
--- a/src/lib/format.h
+++ b/src/lib/format.h
@@ -24,7 +24,7 @@
 
 #include <string>
 #include <vector>
-#include "util.h"
+#include <libdcp/util.h>
 
 class Film;
 
@@ -41,7 +41,7 @@ public:
        /** @return the ratio of the container (including any padding) */
        float container_ratio () const;
 
-       int dcp_padding (boost::shared_ptr<const Film> f) const;
+       int dcp_padding (boost::shared_ptr<const Film>) const;
 
        /** @return size in pixels of the images that we should
         *  put in a DCP for this ratio.  This size will not correspond
@@ -67,10 +67,7 @@ public:
                return _dci_name;
        }
 
-       std::string as_metadata () const;
-
        static Format const * from_nickname (std::string n);
-       static Format const * from_metadata (std::string m);
        static Format const * from_id (std::string i);
        static std::vector<Format const *> all ();
        static void setup_formats ();