projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set 'i' earlier in name_values.
[dcpomatic.git]
/
src
/
lib
/
kdm_with_metadata.h
diff --git
a/src/lib/kdm_with_metadata.h
b/src/lib/kdm_with_metadata.h
index c2a13fced480489534e09399041158abbbd63f88..e7b3c23bafa8675cf7e33c9a11fe1c56a72bac1a 100644
(file)
--- a/
src/lib/kdm_with_metadata.h
+++ b/
src/lib/kdm_with_metadata.h
@@
-42,7
+42,6
@@
public:
virtual std::string kdm_as_xml () const = 0;
virtual void kdm_as_xml (boost::filesystem::path out) const = 0;
virtual std::string kdm_as_xml () const = 0;
virtual void kdm_as_xml (boost::filesystem::path out) const = 0;
- virtual std::string kdm_id () const = 0;
dcp::NameFormat::Map const& name_values () const {
return _name_values;
dcp::NameFormat::Map const& name_values () const {
return _name_values;
@@
-121,10
+120,6
@@
public:
return kdm.as_xml (out);
}
return kdm.as_xml (out);
}
- std::string kdm_id () const {
- return kdm.cpl_id ();
- }
-
dcp::EncryptedKDM kdm;
};
dcp::EncryptedKDM kdm;
};
@@
-145,10
+140,6
@@
public:
return kdm.as_xml (out);
}
return kdm.as_xml (out);
}
- std::string kdm_id () const {
- return kdm.id ();
- }
-
EncryptedECinemaKDM kdm;
};
#endif
EncryptedECinemaKDM kdm;
};
#endif