projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove a couple of uses of ofstream.
[dcpomatic.git]
/
src
/
lib
/
film.cc
diff --git
a/src/lib/film.cc
b/src/lib/film.cc
index f869289d5700fbab7fca1de7e5785d58a3775d29..a3720c458b1afc8f4dbcf054e7da657de10402f4 100644
(file)
--- a/
src/lib/film.cc
+++ b/
src/lib/film.cc
@@
-65,7
+65,6
@@
using std::pair;
using std::map;
using std::vector;
using std::ifstream;
using std::map;
using std::vector;
using std::ifstream;
-using std::ofstream;
using std::setfill;
using std::min;
using std::make_pair;
using std::setfill;
using std::min;
using std::make_pair;
@@
-151,6
+150,12
@@
Film::video_identifier () const
<< "_" << scaler()->id()
<< "_" << j2k_bandwidth();
<< "_" << scaler()->id()
<< "_" << j2k_bandwidth();
+ if (encrypted ()) {
+ s << "_E";
+ } else {
+ s << "_P";
+ }
+
if (_interop) {
s << "_I";
} else {
if (_interop) {
s << "_I";
} else {
@@
-844,6
+849,12
@@
Film::best_video_frame_rate () const
return _playlist->best_dcp_frame_rate ();
}
return _playlist->best_dcp_frame_rate ();
}
+bool
+Film::content_paths_valid () const
+{
+ return _playlist->content_paths_valid ();
+}
+
void
Film::playlist_content_changed (boost::weak_ptr<Content> c, int p)
{
void
Film::playlist_content_changed (boost::weak_ptr<Content> c, int p)
{