summaryrefslogtreecommitdiff
path: root/src/lib/film.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/film.cc')
-rw-r--r--src/lib/film.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 1b5779f2d..37af4cb20 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -317,7 +317,7 @@ Film::make_dcp ()
throw MissingSettingError (_("format"));
}
- if (_playlist->regions().empty ()) {
+ if (_playlist->content().empty ()) {
throw StringError (_("You must add some content to the DCP before creating it"));
}
@@ -697,11 +697,11 @@ Film::set_trust_content_headers (bool t)
signal_changed (TRUST_CONTENT_HEADERS);
- Playlist::RegionList regions = _playlist->regions ();
- if (!_trust_content_headers && !regions.empty()) {
+ Playlist::ContentList content = _playlist->content ();
+ if (!_trust_content_headers && !content.empty()) {
/* We just said that we don't trust the content's header */
- for (Playlist::RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
- examine_content ((*i)->content);
+ for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) {
+ examine_content (*i);
}
}
}
@@ -1040,10 +1040,10 @@ Film::playlist () const
return _playlist;
}
-Playlist::RegionList
-Film::regions () const
+Playlist::ContentList
+Film::content () const
{
- return _playlist->regions ();
+ return _playlist->content ();
}
void