#include <boost/signals2.hpp>
#include <boost/enable_shared_from_this.hpp>
#include "util.h"
-#include "dci_metadata.h"
#include "types.h"
-#include "ffmpeg_content.h"
#include "playlist.h"
+#include "dci_metadata.h"
class DCPContentType;
-class Job;
-class Filter;
class Log;
-class ExamineContentJob;
-class AnalyseAudioJob;
-class ExternalAudioStream;
class Content;
class Player;
/** @class Film
+ *
* @brief A representation of some audio and video content, and details of
* how they should be presented in a DCP.
+ *
+ * The content of a Film is held in a Playlist (created and managed by the Film).
*/
-class Film : public boost::enable_shared_from_this<Film>
+class Film : public boost::enable_shared_from_this<Film>, public boost::noncopyable
{
public:
Film (std::string d);
- Film (Film const &);
std::string info_dir () const;
std::string j2c_path (int f, bool t) const;
bool have_dcp () const;
- boost::shared_ptr<Player> player () const;
+ boost::shared_ptr<Player> make_player () const;
boost::shared_ptr<Playlist> playlist () const;
OutputAudioFrame dcp_audio_frame_rate () const;
/* Proxies for some Playlist methods */
- Playlist::ContentList content () const;
+ Playlist::ContentList content_without_loop () const;
- Time length () const;
+ Time length_with_loop () const;
+ Time length_without_loop () const;
bool has_subtitles () const;
OutputVideoFrame best_dcp_video_frame_rate () const;
LOOP,
DCP_CONTENT_TYPE,
CONTAINER,
+ RESOLUTION,
SCALER,
WITH_SUBTITLES,
- COLOUR_LUT,
J2K_BANDWIDTH,
DCI_METADATA,
DCP_VIDEO_FRAME_RATE,
return _container;
}
+ Resolution resolution () const {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ return _resolution;
+ }
+
Scaler const * scaler () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _scaler;
return _with_subtitles;
}
- int colour_lut () const {
- boost::mutex::scoped_lock lm (_state_mutex);
- return _colour_lut;
- }
-
int j2k_bandwidth () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _j2k_bandwidth;
void remove_content (boost::shared_ptr<Content>);
void set_dcp_content_type (DCPContentType const *);
void set_container (Ratio const *);
+ void set_resolution (Resolution);
void set_scaler (Scaler const *);
void set_with_subtitles (bool);
- void set_colour_lut (int);
void set_j2k_bandwidth (int);
void set_dci_metadata (DCIMetadata);
void set_dcp_video_frame_rate (int);
static int const state_version;
private:
-
+
void signal_changed (Property);
- std::string video_state_identifier () const;
+ std::string video_identifier () const;
void playlist_changed ();
void playlist_content_changed (boost::weak_ptr<Content>, int);
std::string filename_safe_name () const;
DCPContentType const * _dcp_content_type;
/** The container to put this Film in (flat, scope, etc.) */
Ratio const * _container;
+ /** DCP resolution (2K or 4K) */
+ Resolution _resolution;
/** Scaler algorithm to use */
Scaler const * _scaler;
/** True if subtitles should be shown for this film */
bool _with_subtitles;
- /** index of colour LUT to use when converting RGB to XYZ.
- * 0: sRGB
- * 1: Rec 709
- */
- int _colour_lut;
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
/** DCI naming stuff */