projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 1.0 in.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 5aff6f0be31ef1c00176c1e67d7b2aa6de93953b..809eabdaa9a1257cae980be9ce68a2c0b78e8452 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-28,19
+28,21
@@
#include <string>
#include <vector>
#include <inttypes.h>
#include <string>
#include <vector>
#include <inttypes.h>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread.hpp>
#include <boost/signals2.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/signals2.hpp>
#include <boost/enable_shared_from_this.hpp>
+#include <boost/filesystem.hpp>
#include "util.h"
#include "types.h"
#include "util.h"
#include "types.h"
-#include "playlist.h"
#include "dci_metadata.h"
class DCPContentType;
class Log;
class Content;
class Player;
#include "dci_metadata.h"
class DCPContentType;
class Log;
class Content;
class Player;
+class Playlist;
+class AudioContent;
+class Scaler;
+class Screen;
/** @class Film
*
/** @class Film
*
@@
-52,7
+54,7
@@
class Player;
class Film : public boost::enable_shared_from_this<Film>, public boost::noncopyable
{
public:
class Film : public boost::enable_shared_from_this<Film>, public boost::noncopyable
{
public:
- Film (
std::string d
);
+ Film (
boost::filesystem::path
);
std::string info_dir () const;
std::string j2c_path (int, Eyes, bool) const;
std::string info_dir () const;
std::string j2c_path (int, Eyes, bool) const;
@@
-61,8
+63,8
@@
public:
std::string internal_video_mxf_filename () const;
boost::filesystem::path audio_analysis_path (boost::shared_ptr<const AudioContent>) const;
std::string internal_video_mxf_filename () const;
boost::filesystem::path audio_analysis_path (boost::shared_ptr<const AudioContent>) const;
- std::string
dcp_
video_mxf_filename () const;
- std::string
dcp_
audio_mxf_filename () const;
+ std::string video_mxf_filename () const;
+ std::string audio_mxf_filename () const;
void send_dcp_to_tms ();
void make_dcp ();
void send_dcp_to_tms ();
void make_dcp ();
@@
-97,7
+99,7
@@
public:
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;
- OutputAudioFrame
dcp_
audio_frame_rate () const;
+ OutputAudioFrame audio_frame_rate () const;
OutputAudioFrame time_to_audio_frames (Time) const;
OutputVideoFrame time_to_video_frames (Time) const;
OutputAudioFrame time_to_audio_frames (Time) const;
OutputVideoFrame time_to_video_frames (Time) const;
@@
-110,7
+112,14
@@
public:
Time length () const;
bool has_subtitles () const;
Time length () const;
bool has_subtitles () const;
- OutputVideoFrame best_dcp_video_frame_rate () const;
+ OutputVideoFrame best_video_frame_rate () const;
+
+ void make_kdms (
+ std::list<boost::shared_ptr<Screen> >,
+ boost::posix_time::ptime from,
+ boost::posix_time::ptime until,
+ std::string directory
+ ) const;
/** Identifiers for the parts of our state;
used for signalling changes.
/** Identifiers for the parts of our state;
used for signalling changes.
@@
-126,88
+135,84
@@
public:
RESOLUTION,
SCALER,
WITH_SUBTITLES,
RESOLUTION,
SCALER,
WITH_SUBTITLES,
+ ENCRYPTED,
J2K_BANDWIDTH,
DCI_METADATA,
J2K_BANDWIDTH,
DCI_METADATA,
-
DCP_
VIDEO_FRAME_RATE,
-
DCP_
AUDIO_CHANNELS,
- /** The setting of _
dcp_3
d has been changed */
-
DCP_3
D,
+ VIDEO_FRAME_RATE,
+ AUDIO_CHANNELS,
+ /** The setting of _
three_
d has been changed */
+
THREE_
D,
SEQUENCE_VIDEO,
SEQUENCE_VIDEO,
+ INTEROP,
};
/* GET */
std::string directory () const {
};
/* GET */
std::string directory () const {
- boost::mutex::scoped_lock lm (_directory_mutex);
return _directory;
}
std::string name () const {
return _directory;
}
std::string name () const {
- boost::mutex::scoped_lock lm (_state_mutex);
return _name;
}
bool use_dci_name () const {
return _name;
}
bool use_dci_name () const {
- boost::mutex::scoped_lock lm (_state_mutex);
return _use_dci_name;
}
DCPContentType const * dcp_content_type () const {
return _use_dci_name;
}
DCPContentType const * dcp_content_type () const {
- boost::mutex::scoped_lock lm (_state_mutex);
return _dcp_content_type;
}
Ratio const * container () const {
return _dcp_content_type;
}
Ratio const * container () const {
- boost::mutex::scoped_lock lm (_state_mutex);
return _container;
}
Resolution resolution () const {
return _container;
}
Resolution resolution () const {
- boost::mutex::scoped_lock lm (_state_mutex);
return _resolution;
}
Scaler const * scaler () const {
return _resolution;
}
Scaler const * scaler () const {
- boost::mutex::scoped_lock lm (_state_mutex);
return _scaler;
}
bool with_subtitles () const {
return _scaler;
}
bool with_subtitles () const {
- boost::mutex::scoped_lock lm (_state_mutex);
return _with_subtitles;
}
return _with_subtitles;
}
+ bool encrypted () const {
+ return _encrypted;
+ }
+
int j2k_bandwidth () const {
int j2k_bandwidth () const {
- boost::mutex::scoped_lock lm (_state_mutex);
return _j2k_bandwidth;
}
DCIMetadata dci_metadata () const {
return _j2k_bandwidth;
}
DCIMetadata dci_metadata () const {
- boost::mutex::scoped_lock lm (_state_mutex);
return _dci_metadata;
}
return _dci_metadata;
}
- /* XXX: -> "video_frame_rate" */
- int dcp_video_frame_rate () const {
- boost::mutex::scoped_lock lm (_state_mutex);
- return _dcp_video_frame_rate;
+ /** @return The frame rate of the DCP */
+ int video_frame_rate () const {
+ return _video_frame_rate;
}
}
- int dcp_audio_channels () const {
- boost::mutex::scoped_lock lm (_state_mutex);
- return _dcp_audio_channels;
+ int audio_channels () const {
+ return _audio_channels;
}
}
- bool dcp_3d () const {
- boost::mutex::scoped_lock lm (_state_mutex);
- return _dcp_3d;
+ bool three_d () const {
+ return _three_d;
}
bool sequence_video () const {
}
bool sequence_video () const {
- boost::mutex::scoped_lock lm (_state_mutex);
return _sequence_video;
}
return _sequence_video;
}
+
+ bool interop () const {
+ return _interop;
+ }
/* SET */
/* SET */
@@
-223,13
+228,15
@@
public:
void set_resolution (Resolution);
void set_scaler (Scaler const *);
void set_with_subtitles (bool);
void set_resolution (Resolution);
void set_scaler (Scaler const *);
void set_with_subtitles (bool);
+ void set_encrypted (bool);
void set_j2k_bandwidth (int);
void set_dci_metadata (DCIMetadata);
void set_j2k_bandwidth (int);
void set_dci_metadata (DCIMetadata);
- void set_
dcp_
video_frame_rate (int);
- void set_
dcp_
audio_channels (int);
- void set_
dcp_3
d (bool);
+ void set_video_frame_rate (int);
+ void set_audio_channels (int);
+ void set_
three_
d (bool);
void set_dci_date_today ();
void set_sequence_video (bool);
void set_dci_date_today ();
void set_sequence_video (bool);
+ void set_interop (bool);
/** Emitted when some property has of the Film has changed */
mutable boost::signals2::signal<void (Property)> Changed;
/** Emitted when some property has of the Film has changed */
mutable boost::signals2::signal<void (Property)> Changed;
@@
-257,8
+264,6
@@
private:
* must not be relative.
*/
std::string _directory;
* must not be relative.
*/
std::string _directory;
- /** Mutex for _directory */
- mutable boost::mutex _directory_mutex;
/** Name for DCP-o-matic */
std::string _name;
/** Name for DCP-o-matic */
std::string _name;
@@
-274,27
+279,27
@@
private:
Scaler const * _scaler;
/** True if subtitles should be shown for this film */
bool _with_subtitles;
Scaler const * _scaler;
/** True if subtitles should be shown for this film */
bool _with_subtitles;
+ bool _encrypted;
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
/** DCI naming stuff */
DCIMetadata _dci_metadata;
/** Frames per second to run our DCP at */
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
/** DCI naming stuff */
DCIMetadata _dci_metadata;
/** Frames per second to run our DCP at */
- int _
dcp_
video_frame_rate;
+ int _video_frame_rate;
/** The date that we should use in a DCI name */
boost::gregorian::date _dci_date;
/** The date that we should use in a DCI name */
boost::gregorian::date _dci_date;
- int _dcp_audio_channels;
+ /** Number of audio channels to put in the DCP */
+ int _audio_channels;
/** If true, the DCP will be written in 3D mode; otherwise in 2D.
This will be regardless of what content is on the playlist.
*/
/** If true, the DCP will be written in 3D mode; otherwise in 2D.
This will be regardless of what content is on the playlist.
*/
- bool _
dcp_3
d;
+ bool _
three_
d;
bool _sequence_video;
bool _sequence_video;
+ bool _interop;
/** true if our state has changed since we last saved it */
mutable bool _dirty;
/** true if our state has changed since we last saved it */
mutable bool _dirty;
- /** Mutex for all state except _directory */
- mutable boost::mutex _state_mutex;
-
friend class paths_test;
friend class film_metadata_test;
};
friend class paths_test;
friend class film_metadata_test;
};