Fix tm_to_string to use local timezone on all platforms. Some comments.

[libdcp.git] / src / mxf_asset.h

diff --git a/src/mxf_asset.h b/src/mxf_asset.h
index 684454259e73aeef174f6937367c574fd7ce71b3..4eafdcba935b37b714b0baa70c7f634957944e69 100644 (file)
--- a/src/mxf_asset.h
+++ b/src/mxf_asset.h
@@ -30,6 +30,10 @@ namespace ASDCP {
        class AESDecContext;
 }
 
+/* Undefine some stuff that the OS X 10.5 SDK defines */
+#undef Key
+#undef set_key
+
 namespace libdcp
 {
 
@@ -50,15 +54,13 @@ public:
        ~MXFAsset ();
 
        virtual bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
-       virtual void write_to_cpl (xmlpp::Element *, bool interop) const;
+       virtual void write_to_cpl (xmlpp::Element *) const;
        virtual std::string key_type () const = 0;
        
        /** Fill in a ADSCP::WriteInfo struct.
         *  @param w struct to fill in.
-        *  @param uuid uuid to use.
-        *  @param true to label as interop, false for SMPTE.
         */
-       void fill_writer_info (ASDCP::WriterInfo* w, std::string uuid, bool interop, MXFMetadata const & metadata);
+       void fill_writer_info (ASDCP::WriterInfo* w);
 
        void set_progress (boost::signals2::signal<void (float)>* progress) {
                _progress = progress;
@@ -107,7 +109,7 @@ public:
 
 protected:
        virtual std::string cpl_node_name () const = 0;
-       virtual std::pair<std::string, std::string> cpl_node_attribute (bool) const {
+       virtual std::pair<std::string, std::string> cpl_node_attribute () const {
                return std::make_pair ("", "");
        }