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.cc28
1 files changed, 5 insertions, 23 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 2bb8b3155..172fd20ab 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -246,7 +246,7 @@ Film::make_dcp ()
throw MissingSettingError (_("container"));
}
- if (content_without_loop().empty()) {
+ if (content().empty()) {
throw StringError (_("You must add some content to the DCP before creating it"));
}
@@ -729,9 +729,9 @@ Film::playlist () const
}
Playlist::ContentList
-Film::content_without_loop () const
+Film::content () const
{
- return _playlist->content_without_loop ();
+ return _playlist->content ();
}
void
@@ -769,15 +769,9 @@ Film::remove_content (shared_ptr<Content> c)
}
Time
-Film::length_with_loop () const
+Film::length () const
{
- return _playlist->length_with_loop ();
-}
-
-Time
-Film::length_without_loop () const
-{
- return _playlist->length_without_loop ();
+ return _playlist->length ();
}
bool
@@ -810,18 +804,6 @@ Film::playlist_changed ()
signal_changed (CONTENT);
}
-int
-Film::loop () const
-{
- return _playlist->loop ();
-}
-
-void
-Film::set_loop (int c)
-{
- _playlist->set_loop (c);
-}
-
OutputAudioFrame
Film::time_to_audio_frames (Time t) const
{