projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 51e272faa2379c778736a3cb984c862415f7c62e..d9d7e82fd2140a4cbf9fae20c69ea9e6badd4db6 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-32,7
+32,8
@@
#include <boost/enable_shared_from_this.hpp>
#include <boost/filesystem.hpp>
#include <dcp/key.h>
#include <boost/enable_shared_from_this.hpp>
#include <boost/filesystem.hpp>
#include <dcp/key.h>
-#include <dcp/kdm.h>
+#include <dcp/decrypted_kdm.h>
+#include <dcp/encrypted_kdm.h>
#include "util.h"
#include "types.h"
#include "dci_metadata.h"
#include "util.h"
#include "types.h"
#include "dci_metadata.h"
@@
-63,7
+64,7
@@
public:
boost::filesystem::path info_path (int, Eyes) const;
boost::filesystem::path internal_video_mxf_dir () const;
boost::filesystem::path internal_video_mxf_filename () const;
boost::filesystem::path info_path (int, Eyes) const;
boost::filesystem::path internal_video_mxf_dir () const;
boost::filesystem::path internal_video_mxf_filename () const;
- boost::filesystem::path audio_analysis_
path (boost::shared_ptr<const AudioContent>
) const;
+ boost::filesystem::path audio_analysis_
dir (
) const;
boost::filesystem::path video_mxf_filename () const;
boost::filesystem::path audio_mxf_filename () const;
boost::filesystem::path video_mxf_filename () const;
boost::filesystem::path audio_mxf_filename () const;
@@
-83,7
+84,7
@@
public:
boost::filesystem::path file (boost::filesystem::path f) const;
boost::filesystem::path dir (boost::filesystem::path d) const;
boost::filesystem::path file (boost::filesystem::path f) const;
boost::filesystem::path dir (boost::filesystem::path d) const;
-
void
read_metadata ();
+
std::list<std::string>
read_metadata ();
void write_metadata () const;
boost::shared_ptr<xmlpp::Document> metadata () const;
void write_metadata () const;
boost::shared_ptr<xmlpp::Document> metadata () const;
@@
-96,18
+97,14
@@
public:
}
dcp::Size full_frame () const;
}
dcp::Size full_frame () const;
+ dcp::Size frame_size () const;
- std::
list<boost::filesystem::path> dcp
s () const;
+ std::
vector<CPLSummary> cpl
s () const;
boost::shared_ptr<Player> make_player () const;
boost::shared_ptr<Playlist> playlist () const;
boost::shared_ptr<Player> make_player () const;
boost::shared_ptr<Playlist> playlist () const;
- AudioFrame audio_frame_rate () const;
-
- AudioFrame time_to_audio_frames (DCPTime) const;
- VideoFrame time_to_video_frames (DCPTime) const;
- DCPTime video_frames_to_time (VideoFrame) const;
- DCPTime audio_frames_to_time (AudioFrame) const;
+ int audio_frame_rate () const;
uint64_t required_disk_space () const;
bool should_be_enough_disk_space (double &, double &) const;
uint64_t required_disk_space () const;
bool should_be_enough_disk_space (double &, double &) const;
@@
-117,22
+114,22
@@
public:
ContentList content () const;
DCPTime length () const;
bool has_subtitles () const;
ContentList content () const;
DCPTime length () const;
bool has_subtitles () const;
-
VideoFrame
best_video_frame_rate () const;
+
int
best_video_frame_rate () const;
FrameRateChange active_frame_rate_change (DCPTime) const;
FrameRateChange active_frame_rate_change (DCPTime) const;
- dcp::KDM
+ dcp::
Encrypted
KDM
make_kdm (
boost::shared_ptr<dcp::Certificate> target,
make_kdm (
boost::shared_ptr<dcp::Certificate> target,
- boost::filesystem::path
dcp
,
-
boost::posix_time::pt
ime from,
-
boost::posix_time::pt
ime until
+ boost::filesystem::path
cpl_file
,
+
dcp::LocalT
ime from,
+
dcp::LocalT
ime until
) const;
) const;
- std::list<dcp::KDM> make_kdms (
+ std::list<dcp::
Encrypted
KDM> make_kdms (
std::list<boost::shared_ptr<Screen> >,
std::list<boost::shared_ptr<Screen> >,
- boost::filesystem::path
dcp
,
-
boost::posix_time::pt
ime from,
-
boost::posix_time::pt
ime until
+ boost::filesystem::path
cpl_file
,
+
dcp::LocalT
ime from,
+
dcp::LocalT
ime until
) const;
dcp::Key key () const {
) const;
dcp::Key key () const {