{
for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
if (boost::filesystem::is_regular_file (i->path())) {
- _paths.push_back (i->path());
+ add_path (i->path());
} else if (boost::filesystem::is_directory (i->path ())) {
read_directory (i->path());
}
string const old_name = name ();
int const old_texts = text.size ();
- ContentChange cc_texts (this, DCPContentProperty::TEXTS);
- ContentChange cc_assets (this, DCPContentProperty::NEEDS_ASSETS);
- ContentChange cc_kdm (this, DCPContentProperty::NEEDS_KDM);
- ContentChange cc_name (this, DCPContentProperty::NAME);
- ContentChange cc_streams (this, AudioContentProperty::STREAMS);
+ ChangeSignaller<Content> cc_texts (this, DCPContentProperty::TEXTS);
+ ChangeSignaller<Content> cc_assets (this, DCPContentProperty::NEEDS_ASSETS);
+ ChangeSignaller<Content> cc_kdm (this, DCPContentProperty::NEEDS_KDM);
+ ChangeSignaller<Content> cc_name (this, DCPContentProperty::NAME);
+ ChangeSignaller<Content> cc_streams (this, AudioContentProperty::STREAMS);
if (job) {
job->set_progress_unknown ();
}
if (examiner->has_audio()) {
- ContentChange cc (this, AudioContentProperty::STREAMS);
+ ChangeSignaller<Content> cc (this, AudioContentProperty::STREAMS);
{
boost::mutex::scoped_lock lm (_mutex);
audio.reset (new AudioContent (this));
void
DCPContent::set_reference_video (bool r)
{
- ContentChange cc (this, DCPContentProperty::REFERENCE_VIDEO);
+ ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_VIDEO);
{
boost::mutex::scoped_lock lm (_mutex);
void
DCPContent::set_reference_audio (bool r)
{
- ContentChange cc (this, DCPContentProperty::REFERENCE_AUDIO);
+ ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_AUDIO);
{
boost::mutex::scoped_lock lm (_mutex);
void
DCPContent::set_reference_text (TextType type, bool r)
{
- ContentChange cc (this, DCPContentProperty::REFERENCE_TEXT);
+ ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_TEXT);
{
boost::mutex::scoped_lock lm (_mutex);
{
return !c->text.empty();
}
+
bool
DCPContent::can_reference_text (TextType type, string& why_not) const
{
why_not = _("it does not have open subtitles in all its reels.");
return false;
}
- if (type == TEXT_CLOSED_CAPTION && !i->closed_caption()) {
+ if (type == TEXT_CLOSED_CAPTION && i->closed_captions().empty()) {
/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
why_not = _("it does not have closed captions in all its reels.");
return false;
void
DCPContent::set_cpl (string id)
{
- ContentChange cc (this, DCPContentProperty::CPL);
+ ChangeSignaller<Content> cc (this, DCPContentProperty::CPL);
{
boost::mutex::scoped_lock lm (_mutex);
_cpl = id;
}
}
+
+bool
+DCPContent::kdm_timing_window_valid () const
+{
+ if (!_kdm) {
+ return true;
+ }
+
+ dcp::LocalTime now;
+ return _kdm->not_valid_before() < now && now < _kdm->not_valid_after();
+}