projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use dcp::File in DCP-o-matic (#2231).
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index d42eb5626b71dad5050e3fa5335002611f59edf1..5318d6a12aa837229d4e4ea6ff94ffe1a958fdb8 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-37,6
+37,7
@@
#include "types.h"
#include "util.h"
#include <dcp/encrypted_kdm.h>
#include "types.h"
#include "util.h"
#include <dcp/encrypted_kdm.h>
+#include <dcp/file.h>
#include <dcp/key.h>
#include <dcp/language_tag.h>
#include <dcp/rating.h>
#include <dcp/key.h>
#include <dcp/language_tag.h>
#include <dcp/rating.h>
@@
-75,13
+76,8
@@
class InfoFileHandle
{
public:
InfoFileHandle (boost::mutex& mutex, boost::filesystem::path file, bool read);
{
public:
InfoFileHandle (boost::mutex& mutex, boost::filesystem::path file, bool read);
- ~InfoFileHandle ();
- FILE* get () const {
- return _handle;
- }
-
- boost::filesystem::path file () const {
+ dcp::File& get () {
return _file;
}
return _file;
}
@@
-89,10
+85,10
@@
private:
friend class Film;
boost::mutex::scoped_lock _lock;
friend class Film;
boost::mutex::scoped_lock _lock;
- FILE* _handle;
- boost::filesystem::path _file;
+ dcp::File _file;
};
};
+
/** @class Film
*
* @brief A representation of some audio, video, subtitle and closed-caption content,
/** @class Film
*
* @brief A representation of some audio, video, subtitle and closed-caption content,