Remove old looping method.

8 files changed, 19 insertions, 89 deletions

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 9a9116690..2848c1ed7 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -68,14 +68,14 @@ AnalyseAudioJob::run ()
 	
 	player->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1, _2));
 
-	_samples_per_point = max (int64_t (1), _film->time_to_audio_frames (_film->length_without_loop()) / _num_points);
+	_samples_per_point = max (int64_t (1), _film->time_to_audio_frames (_film->length()) / _num_points);
 
 	_current.resize (_film->dcp_audio_channels ());
 	_analysis.reset (new AudioAnalysis (_film->dcp_audio_channels ()));
 
 	_done = 0;
 	while (!player->pass ()) {
-		set_progress (double (_film->audio_frames_to_time (_done)) / _film->length_without_loop ());
+		set_progress (double (_film->audio_frames_to_time (_done)) / _film->length ());
 	}
 
 	_analysis->write (content->audio_analysis_path ());
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
 {
diff --git a/src/lib/film.h b/src/lib/film.h
index 1f3899885..497320c5e 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -106,16 +106,12 @@ public:
 
 	/* Proxies for some Playlist methods */
 
-	Playlist::ContentList content_without_loop () const;
+	Playlist::ContentList content () const;
 
-	Time length_with_loop () const;
-	Time length_without_loop () const;
+	Time length () const;
 	bool has_subtitles () const;
 	OutputVideoFrame best_dcp_video_frame_rate () const;
 
-	void set_loop (int);
-	int loop () const;
-
 	void set_sequence_video (bool);
 
 	/** Identifiers for the parts of our state;
@@ -127,7 +123,6 @@ public:
 		USE_DCI_NAME,
 		/** The playlist's content list has changed (i.e. content has been added, moved around or removed) */
 		CONTENT,
-		LOOP,
 		DCP_CONTENT_TYPE,
 		CONTAINER,
 		RESOLUTION,
diff --git a/src/lib/player.cc b/src/lib/player.cc
index f5212f8d0..ec20892ef 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -401,7 +401,7 @@ Player::setup_pieces ()
 
 	_pieces.clear ();
 
-	Playlist::ContentList content = _playlist->content_with_loop ();
+	Playlist::ContentList content = _playlist->content ();
 	sort (content.begin(), content.end(), ContentSorter ());
 
 	for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) {
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 172b6fbb9..c70c79972 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -49,8 +49,7 @@ using boost::dynamic_pointer_cast;
 using boost::lexical_cast;
 
 Playlist::Playlist ()
-	: _loop (1)
-	, _sequence_video (true)
+	: _sequence_video (true)
 	, _sequencing_video (false)
 {
 
@@ -109,8 +108,6 @@ Playlist::video_identifier () const
 		}
 	}
 
-	t += lexical_cast<string> (_loop);
-
 	return md5_digest (t.c_str(), t.length());
 }
 
@@ -124,7 +121,6 @@ Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node
 	}
 
 	reconnect ();
-	_loop = node->number_child<int> ("Loop");
 	_sequence_video = node->bool_child ("SequenceVideo");
 }
 
@@ -136,7 +132,6 @@ Playlist::as_xml (xmlpp::Node* node)
 		(*i)->as_xml (node->add_child ("Content"));
 	}
 
-	node->add_child("Loop")->add_child_text(lexical_cast<string> (_loop));
 	node->add_child("SequenceVideo")->add_child_text(_sequence_video ? "1" : "0");
 }
 
@@ -162,13 +157,6 @@ Playlist::remove (shared_ptr<Content> c)
 	}
 }
 
-void
-Playlist::set_loop (int l)
-{
-	_loop = l;
-	Changed ();
-}
-
 bool
 Playlist::has_subtitles () const
 {
@@ -246,7 +234,7 @@ Playlist::best_dcp_frame_rate () const
 }
 
 Time
-Playlist::length_without_loop () const
+Playlist::length () const
 {
 	Time len = 0;
 	for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
@@ -256,12 +244,6 @@ Playlist::length_without_loop () const
 	return len;
 }
 
-Time
-Playlist::length_with_loop () const
-{
-	return length_without_loop() * _loop;
-}
-
 void
 Playlist::reconnect ()
 {
@@ -301,29 +283,9 @@ ContentSorter::operator() (shared_ptr<Content> a, shared_ptr<Content> b)
 	return a->start() < b->start();
 }
 
-/** @return content in an undefined order, not taking looping into account */
+/** @return content in an undefined order */
 Playlist::ContentList
-Playlist::content_without_loop () const
+Playlist::content () const
 {
 	return _content;
 }
-
-/** @return content in an undefined order, taking looping into account */
-Playlist::ContentList
-Playlist::content_with_loop () const
-{
-	ContentList looped = _content;
-	Time const length = length_without_loop ();
-
-	Time offset = length;
-	for (int i = 1; i < _loop; ++i) {
-		for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-			shared_ptr<Content> copy = (*i)->clone ();
-			copy->set_start (copy->start() + offset);
-			looped.push_back (copy);
-		}
-		offset += length;
-	}
-	
-	return looped;
-}
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 330681c56..735ef7a43 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -65,19 +65,11 @@ public:
 
 	typedef std::vector<boost::shared_ptr<Content> > ContentList;
 
-	ContentList content_without_loop () const;
-	ContentList content_with_loop () const;
+	ContentList content () const;
 
 	std::string video_identifier () const;
 
-	int loop () const {
-		return _loop;
-	}
-	
-	void set_loop (int l);
-
-	Time length_without_loop () const;
-	Time length_with_loop () const;
+	Time length () const;
 	
 	int best_dcp_frame_rate () const;
 	Time video_end () const;
@@ -94,7 +86,6 @@ private:
 	void reconnect ();
 
 	ContentList _content;
-	int _loop;
 	bool _sequence_video;
 	bool _sequencing_video;
 	std::list<boost::signals2::connection> _content_connections;
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index f0faf7c63..6d5edd7c0 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -111,6 +111,6 @@ TranscodeJob::remaining_time () const
 	}
 
 	/* Compute approximate proposed length here, as it's only here that we need it */
-	OutputVideoFrame const left = _film->time_to_video_frames (_film->length_with_loop ()) - _transcoder->video_frames_out();
+	OutputVideoFrame const left = _film->time_to_video_frames (_film->length ()) - _transcoder->video_frames_out();
 	return left / fps;
 }
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index b3d2fdb1c..c5360a122 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -204,9 +204,9 @@ try
 			}
 			lock.lock ();
 			
-			if (_film->length_with_loop()) {
+			if (_film->length()) {
 				_job->set_progress (
-					float (_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length_with_loop())
+					float (_full_written + _fake_written + _repeat_written) / _film->time_to_video_frames (_film->length())
 					);
 			}