#include <inttypes.h>
#include <boost/thread/mutex.hpp>
#include <boost/thread.hpp>
+#include <boost/signals2.hpp>
+#include <boost/enable_shared_from_this.hpp>
extern "C" {
#include <libavcodec/avcodec.h>
}
#include "dcp_content_type.h"
#include "util.h"
#include "stream.h"
-#include "trim_action.h"
class Format;
class Job;
std::string thumb_file (int) const;
std::string thumb_base (int) const;
- int thumb_frame (int) const;
+ SourceFrame thumb_frame (int) const;
int target_audio_sample_rate () const;
void read_metadata ();
Size cropped_size (Size) const;
- int dcp_length () const;
+ boost::optional<SourceFrame> dcp_length () const;
std::string dci_name () const;
std::string dcp_name () const;
int audio_channels () const;
+ void set_dci_date_today ();
+
enum Property {
NONE,
NAME,
CROP,
FILTERS,
SCALER,
- DCP_FRAMES,
- DCP_TRIM_ACTION,
+ DCP_TRIM_START,
+ DCP_TRIM_END,
DCP_AB,
+ USE_SOURCE_AUDIO,
AUDIO_STREAM,
+ EXTERNAL_AUDIO,
AUDIO_GAIN,
AUDIO_DELAY,
STILL_DURATION,
/* GET */
std::string directory () const {
- boost::mutex::scoped_lock lm (_state_mutex);
+ boost::mutex::scoped_lock lm (_directory_mutex);
return _directory;
}
return _scaler;
}
- int dcp_frames () const {
+ SourceFrame dcp_trim_start () const {
boost::mutex::scoped_lock lm (_state_mutex);
- return _dcp_frames;
+ return _dcp_trim_start;
}
- TrimAction dcp_trim_action () const {
+ SourceFrame dcp_trim_end () const {
boost::mutex::scoped_lock lm (_state_mutex);
- return _dcp_trim_action;
+ return _dcp_trim_end;
}
-
+
bool dcp_ab () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _dcp_ab;
}
+ bool use_source_audio () const {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ return _use_source_audio;
+ }
+
int audio_stream_index () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _audio_stream;
assert (_audio_stream < int (_audio_streams.size()));
return _audio_streams[_audio_stream];
}
+
+ std::vector<std::string> external_audio () const {
+ boost::mutex::scoped_lock lm (_state_mutex);
+ return _external_audio;
+ }
float audio_gain () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _package_type;
}
- std::vector<int> thumbs () const {
+ std::vector<SourceFrame> thumbs () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _thumbs;
}
return _size;
}
- int length () const {
+ boost::optional<SourceFrame> length () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _length;
}
-
+
int audio_sample_rate () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _audio_sample_rate;
void set_bottom_crop (int);
void set_filters (std::vector<Filter const *>);
void set_scaler (Scaler const *);
- void set_dcp_frames (int);
- void set_dcp_trim_action (TrimAction);
+ void set_dcp_trim_start (int);
+ void set_dcp_trim_end (int);
void set_dcp_ab (bool);
+ void set_use_source_audio (bool);
void set_audio_stream (int);
+ void set_external_audio (std::vector<std::string>);
void set_audio_gain (float);
void set_audio_delay (int);
void set_still_duration (int);
void set_studio (std::string);
void set_facility (std::string);
void set_package_type (std::string);
- void set_thumbs (std::vector<int>);
+ void set_thumbs (std::vector<SourceFrame>);
void set_size (Size);
- void set_length (int);
+ void set_length (SourceFrame);
+ void unset_length ();
void set_audio_sample_rate (int);
void set_content_digest (std::string);
void set_has_subtitles (bool);
void set_frames_per_second (float);
/** Emitted when some property has changed */
- mutable sigc::signal1<void, Property> Changed;
+ mutable boost::signals2::signal<void (Property)> Changed;
private:
/** Any running ExamineContentJob, or 0 */
boost::shared_ptr<ExamineContentJob> _examine_content_job;
- std::string thumb_file_for_frame (int) const;
- std::string thumb_base_for_frame (int) const;
+ /** The date that we should use in a DCI name */
+ boost::gregorian::date _dci_date;
+
+ std::string thumb_file_for_frame (SourceFrame) const;
+ std::string thumb_base_for_frame (SourceFrame) const;
void signal_changed (Property);
- std::string file_locked (std::string) const;
void examine_content_finished ();
-
+
/** Complete path to directory containing the film metadata;
* must not be relative.
*/
std::string _directory;
+ /** Mutex for _directory */
+ mutable boost::mutex _directory_mutex;
+
/** Name for DVD-o-matic */
std::string _name;
/** True if a auto-generated DCI-compliant name should be used for our DCP */
std::vector<Filter const *> _filters;
/** Scaler algorithm to use */
Scaler const * _scaler;
- /** Number of frames to put in the DCP, or 0 for all */
- int _dcp_frames;
- /** What to do with audio when trimming DCPs */
- TrimAction _dcp_trim_action;
+ /** Frames to trim off the start of the source */
+ SourceFrame _dcp_trim_start;
+ /** Frames to trim off the end of the source */
+ SourceFrame _dcp_trim_end;
/** 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 _dcp_ab;
+ bool _use_source_audio;
/** An index into our _audio_streams vector for the stream to use for audio, or -1 if there is none */
int _audio_stream;
+ std::vector<std::string> _external_audio;
/** Gain to apply to audio in dB */
float _audio_gain;
/** Delay to apply to audio (positive moves audio later) in milliseconds */
/* Data which are cached to speed things up */
/** Vector of frame indices for each of our `thumbnails' */
- std::vector<int> _thumbs;
+ std::vector<SourceFrame> _thumbs;
/** Size, in pixels, of the source (ignoring cropping) */
Size _size;
- /** Length of the source in frames */
- int _length;
+ /** Actual length of the source (in video frames) from examining it */
+ boost::optional<SourceFrame> _length;
/** Sample rate of the source audio, in Hz */
int _audio_sample_rate;
/** MD5 digest of our content file */
mutable bool _dirty;
+ /** Mutex for all state except _directory */
mutable boost::mutex _state_mutex;
friend class paths_test;
projects / dcpomatic.git / blobdiff