projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Untested audio delay.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 84f0b0233ac6247634a9499b94b2c0cc30f8a934..2bf1a0e901b6bc15cc150eeffdec81b1815f86ce 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-39,7
+39,6
@@
#include "playlist.h"
class DCPContentType;
#include "playlist.h"
class DCPContentType;
-class Container;
class Job;
class Filter;
class Log;
class Job;
class Filter;
class Log;
@@
-64,13
+63,11
@@
public:
std::string info_path (int f) const;
std::string internal_video_mxf_dir () const;
std::string internal_video_mxf_filename () const;
std::string info_path (int f) const;
std::string internal_video_mxf_dir () const;
std::string internal_video_mxf_filename () const;
-
std::string audio_analysis_path (
) const;
+
boost::filesystem::path audio_analysis_path (boost::shared_ptr<const AudioContent>
) const;
- void examine_content (boost::shared_ptr<Content>);
std::string dcp_video_mxf_filename () const;
std::string dcp_audio_mxf_filename () const;
std::string dcp_video_mxf_filename () const;
std::string dcp_audio_mxf_filename () const;
- void analyse_audio ();
void send_dcp_to_tms ();
void make_dcp ();
void send_dcp_to_tms ();
void make_dcp ();
@@
-97,6
+94,8
@@
public:
return _dirty;
}
return _dirty;
}
+ libdcp::Size full_frame () const;
+
bool have_dcp () const;
boost::shared_ptr<Player> player () const;
bool have_dcp () const;
boost::shared_ptr<Player> player () const;
@@
-120,6
+119,8
@@
public:
void set_loop (int);
int loop () const;
void set_loop (int);
int loop () const;
+ void set_sequence_video (bool);
+
/** Identifiers for the parts of our state;
used for signalling changes.
*/
/** Identifiers for the parts of our state;
used for signalling changes.
*/
@@
-133,14
+134,12
@@
public:
DCP_CONTENT_TYPE,
CONTAINER,
SCALER,
DCP_CONTENT_TYPE,
CONTAINER,
SCALER,
- AB,
WITH_SUBTITLES,
WITH_SUBTITLES,
- SUBTITLE_OFFSET,
- SUBTITLE_SCALE,
COLOUR_LUT,
J2K_BANDWIDTH,
DCI_METADATA,
DCP_VIDEO_FRAME_RATE,
COLOUR_LUT,
J2K_BANDWIDTH,
DCI_METADATA,
DCP_VIDEO_FRAME_RATE,
+ DCP_AUDIO_CHANNELS
};
};
@@
-166,7
+165,7
@@
public:
return _dcp_content_type;
}
return _dcp_content_type;
}
-
Container
const * container () const {
+
Ratio
const * container () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _container;
}
boost::mutex::scoped_lock lm (_state_mutex);
return _container;
}
@@
-176,26
+175,11
@@
public:
return _scaler;
}
return _scaler;
}
- bool ab () const {
- boost::mutex::scoped_lock lm (_state_mutex);
- return _ab;
- }
-
bool with_subtitles () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _with_subtitles;
}
bool with_subtitles () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _with_subtitles;
}
- int subtitle_offset () const {
- boost::mutex::scoped_lock lm (_state_mutex);
- return _subtitle_offset;
- }
-
- float subtitle_scale () const {
- boost::mutex::scoped_lock lm (_state_mutex);
- return _subtitle_scale;
- }
-
int colour_lut () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _colour_lut;
int colour_lut () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _colour_lut;
@@
-227,19
+211,18
@@
public:
void set_directory (std::string);
void set_name (std::string);
void set_use_dci_name (bool);
void set_directory (std::string);
void set_name (std::string);
void set_use_dci_name (bool);
+ void examine_and_add_content (boost::shared_ptr<Content>);
void add_content (boost::shared_ptr<Content>);
void remove_content (boost::shared_ptr<Content>);
void set_dcp_content_type (DCPContentType const *);
void add_content (boost::shared_ptr<Content>);
void remove_content (boost::shared_ptr<Content>);
void set_dcp_content_type (DCPContentType const *);
- void set_container (
Container
const *);
+ void set_container (
Ratio
const *);
void set_scaler (Scaler const *);
void set_scaler (Scaler const *);
- void set_ab (bool);
void set_with_subtitles (bool);
void set_with_subtitles (bool);
- void set_subtitle_offset (int);
- void set_subtitle_scale (float);
void set_colour_lut (int);
void set_j2k_bandwidth (int);
void set_dci_metadata (DCIMetadata);
void set_dcp_video_frame_rate (int);
void set_colour_lut (int);
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_dci_date_today ();
/** Emitted when some property has of the Film has changed */
void set_dci_date_today ();
/** Emitted when some property has of the Film has changed */
@@
-248,24
+231,20
@@
public:
/** Emitted when some property of our content has changed */
mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
/** Emitted when some property of our content has changed */
mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
- boost::signals2::signal<void ()> AudioAnalysisSucceeded;
-
/** Current version number of the state file */
static int const state_version;
private:
void signal_changed (Property);
/** Current version number of the state file */
static int const state_version;
private:
void signal_changed (Property);
- void analyse_audio_finished ();
std::string video_state_identifier () const;
void playlist_changed ();
void playlist_content_changed (boost::weak_ptr<Content>, int);
std::string filename_safe_name () const;
std::string video_state_identifier () const;
void playlist_changed ();
void playlist_content_changed (boost::weak_ptr<Content>, int);
std::string filename_safe_name () const;
+ void add_content_weak (boost::weak_ptr<Content>);
/** Log to write to */
boost::shared_ptr<Log> _log;
/** Log to write to */
boost::shared_ptr<Log> _log;
- /** Any running AnalyseAudioJob, or 0 */
- boost::shared_ptr<AnalyseAudioJob> _analyse_audio_job;
boost::shared_ptr<Playlist> _playlist;
/** Complete path to directory containing the film metadata;
boost::shared_ptr<Playlist> _playlist;
/** Complete path to directory containing the film metadata;
@@
-282,22
+261,11
@@
private:
/** The type of content that this Film represents (feature, trailer etc.) */
DCPContentType const * _dcp_content_type;
/** The container to put this Film in (flat, scope, etc.) */
/** The type of content that this Film represents (feature, trailer etc.) */
DCPContentType const * _dcp_content_type;
/** The container to put this Film in (flat, scope, etc.) */
-
Container
const * _container;
+
Ratio
const * _container;
/** Scaler algorithm to use */
Scaler const * _scaler;
/** Scaler algorithm to use */
Scaler const * _scaler;
- /** true to create an A/B comparison DCP, where the left half of the image
- is the video without any filters or post-processing, and the right half
- has the specified filters and post-processing.
- */
- bool _ab;
/** True if subtitles should be shown for this film */
bool _with_subtitles;
/** True if subtitles should be shown for this film */
bool _with_subtitles;
- /** y offset for placing subtitles, in source pixels; +ve is further down
- the frame, -ve is further up.
- */
- int _subtitle_offset;
- /** scale factor to apply to subtitles */
- float _subtitle_scale;
/** index of colour LUT to use when converting RGB to XYZ.
* 0: sRGB
* 1: Rec 709
/** index of colour LUT to use when converting RGB to XYZ.
* 0: sRGB
* 1: Rec 709