projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow assets() to silently ignore unresolved assets.
[libdcp.git]
/
src
/
dcp.h
diff --git
a/src/dcp.h
b/src/dcp.h
index 7c318622ae2a30478284334618f7b15de951561a..811f62f636dd459402c4c4d441cea0e4d0c45737 100644
(file)
--- a/
src/dcp.h
+++ b/
src/dcp.h
@@
-39,8
+39,10
@@
#define LIBDCP_DCP_H
#include "types.h"
#define LIBDCP_DCP_H
#include "types.h"
+#include "util.h"
#include "certificate.h"
#include "metadata.h"
#include "certificate.h"
#include "metadata.h"
+#include "name_format.h"
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <string>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <string>
@@
-102,7
+104,7
@@
public:
void add (boost::shared_ptr<CPL> cpl);
std::list<boost::shared_ptr<CPL> > cpls () const;
void add (boost::shared_ptr<CPL> cpl);
std::list<boost::shared_ptr<CPL> > cpls () const;
- std::list<boost::shared_ptr<Asset> > assets () const;
+ std::list<boost::shared_ptr<Asset> > assets (
bool ignore_unresolved = false
) const;
bool encrypted () const;
bool encrypted () const;
@@
-111,7
+113,8
@@
public:
void write_xml (
Standard standard,
XMLMetadata metadata = XMLMetadata (),
void write_xml (
Standard standard,
XMLMetadata metadata = XMLMetadata (),
- boost::shared_ptr<const CertificateChain> signer = boost::shared_ptr<const CertificateChain> ()
+ boost::shared_ptr<const CertificateChain> signer = boost::shared_ptr<const CertificateChain> (),
+ NameFormat name_format = NameFormat("%t")
);
void resolve_refs (std::list<boost::shared_ptr<Asset> > assets);
);
void resolve_refs (std::list<boost::shared_ptr<Asset> > assets);
@@
-121,12
+124,15
@@
public:
return _standard;
}
return _standard;
}
+ static std::vector<boost::filesystem::path> directories_from_files (std::vector<boost::filesystem::path> files);
+
private:
/** Write the PKL file.
* @param pkl_uuid UUID to use.
*/
boost::filesystem::path write_pkl (
private:
/** Write the PKL file.
* @param pkl_uuid UUID to use.
*/
boost::filesystem::path write_pkl (
+ std::string file,
Standard standard,
std::string pkl_uuid,
XMLMetadata metadata,
Standard standard,
std::string pkl_uuid,
XMLMetadata metadata,
@@
-137,9
+143,9
@@
private:
/** Write the ASSETMAP file.
* @param pkl_uuid UUID of our PKL.
/** Write the ASSETMAP file.
* @param pkl_uuid UUID of our PKL.
- * @param pkl_
length Length of our PKL in bytes
.
+ * @param pkl_
path Pathname of our PKL file
.
*/
*/
- void write_assetmap (Standard standard, std::string pkl_uuid,
int pkl_leng
th, XMLMetadata metadata) const;
+ void write_assetmap (Standard standard, std::string pkl_uuid,
boost::filesystem::path pkl_pa
th, XMLMetadata metadata) const;
/** the directory that we are writing to */
boost::filesystem::path _directory;
/** the directory that we are writing to */
boost::filesystem::path _directory;