Basics of making loop do something.

4 files changed, 46 insertions, 50 deletions

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 0b9f86988..427afb6e8 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -890,8 +890,8 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::DCP_VIDEO_FRAME_RATE);
 	film_changed (Film::DCP_AUDIO_CHANNELS);
 
-	if (!_film->content().empty ()) {
-		set_selection (_film->content().front ());
+	if (!_film->content_without_loop().empty ()) {
+		set_selection (_film->content_without_loop().front ());
 	}
 
 	wxListEvent ev;
@@ -1152,7 +1152,7 @@ FilmEditor::setup_content ()
 	
 	_content->DeleteAllItems ();
 
-	Playlist::ContentList content = _film->content ();
+	Playlist::ContentList content = _film->content_without_loop ();
 	for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 		int const t = _content->GetItemCount ();
 		_content->InsertItem (t, std_to_wx ((*i)->summary ()));
@@ -1260,7 +1260,7 @@ FilmEditor::selected_content ()
 		return shared_ptr<Content> ();
 	}
 
-	Playlist::ContentList c = _film->content ();
+	Playlist::ContentList c = _film->content_without_loop ();
 	if (s < 0 || size_t (s) >= c.size ()) {
 		return shared_ptr<Content> ();
 	}
@@ -1510,7 +1510,7 @@ FilmEditor::length_changed ()
 void
 FilmEditor::set_selection (weak_ptr<Content> wc)
 {
-	Playlist::ContentList content = _film->content ();
+	Playlist::ContentList content = _film->content_without_loop ();
 	for (size_t i = 0; i < content.size(); ++i) {
 		if (content[i] == wc.lock ()) {
 			_content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 1fa7bdb91..d00a582e5 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -164,8 +164,10 @@ FilmViewer::timer (wxTimerEvent &)
 	
 	fetch_next_frame ();
 
-	if (_film->length()) {
-		int const new_slider_position = 4096 * _player->video_position() / _film->length();
+	Time const len = _film->length_with_loop ();
+
+	if (len) {
+		int const new_slider_position = 4096 * _player->video_position() / len;
 		if (new_slider_position != _slider->GetValue()) {
 			_slider->SetValue (new_slider_position);
 		}
@@ -211,7 +213,7 @@ void
 FilmViewer::slider_moved (wxScrollEvent &)
 {
 	if (_film && _player) {
-		_player->seek (_slider->GetValue() * _film->length() / 4096, false);
+		_player->seek (_slider->GetValue() * _film->length_with_loop() / 4096, false);
 		fetch_next_frame ();
 	}
 }
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index d525fe38b..b8d97cb59 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -50,8 +50,8 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 	_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
 	table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
 
-	_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->time_to_video_frames (_film->length()))));
-	double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length() / (TIME_HZ * 1073741824.0f);
+	_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->time_to_video_frames (_film->length_with_loop()))));
+	double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length_with_loop() / (TIME_HZ * 1073741824.0f);
 	stringstream s;
 	s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
 	_disk->SetLabel (std_to_wx (s.str ()));
@@ -78,9 +78,9 @@ PropertiesDialog::frames_already_encoded () const
 		return "";
 	}
 	
-	if (_film->length()) {
+	if (_film->length_with_loop()) {
 		/* XXX: encoded_frames() should check which frames have been encoded */
-		u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length())) << "%)";
+		u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length_with_loop())) << "%)";
 	}
 	return u.str ();
 }
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index ff10b7d91..c50b89f6e 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -34,7 +34,7 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
 
-class View
+class View : public boost::noncopyable
 {
 public:
 	View (Timeline& t)
@@ -45,6 +45,7 @@ public:
 		
 	void paint (wxGraphicsContext* g)
 	{
+		cout << "base paint " << this << "\n";
 		_last_paint_bbox = bbox ();
 		do_paint (g);
 	}
@@ -86,15 +87,14 @@ public:
 	dcpomatic::Rect<int> bbox () const
 	{
 		shared_ptr<const Film> film = _timeline.film ();
-		shared_ptr<const Content> content = _content.lock ();
-		if (!film || !content) {
+		if (!film) {
 			return dcpomatic::Rect<int> ();
 		}
 		
 		return dcpomatic::Rect<int> (
-			time_x (content->start ()) - 8,
+			time_x (_content->start ()) - 8,
 			y_pos (_track) - 8,
-			content->length () * _timeline.pixels_per_time_unit() + 16,
+			_content->length () * _timeline.pixels_per_time_unit() + 16,
 			_timeline.track_height() + 16
 			);
 	}
@@ -108,7 +108,7 @@ public:
 		return _selected;
 	}
 
-	weak_ptr<Content> content () const {
+	shared_ptr<Content> content () const {
 		return _content;
 	}
 
@@ -128,13 +128,12 @@ private:
 	void do_paint (wxGraphicsContext* gc)
 	{
 		shared_ptr<const Film> film = _timeline.film ();
-		shared_ptr<const Content> content = _content.lock ();
-		if (!film || !content) {
+		if (!film) {
 			return;
 		}
 
-		Time const start = content->start ();
-		Time const len = content->length ();
+		Time const start = _content->start ();
+		Time const len = _content->length ();
 
 		wxColour selected (colour().Red() / 2, colour().Green() / 2, colour().Blue() / 2);
 
@@ -146,6 +145,8 @@ private:
 		} else {
 			gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (colour(), wxBRUSHSTYLE_SOLID));
 		}
+
+		cout << "paint " << static_cast<View*> (this) << " " << _content.get() << " @ " << time_x (start) << "\n";
 		
 		wxGraphicsPath path = gc->CreatePath ();
 		path.MoveToPoint    (time_x (start),	   y_pos (_track) + 4);
@@ -156,7 +157,7 @@ private:
 		gc->StrokePath (path);
 		gc->FillPath (path);
 
-		wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (content->file().filename().string()).data(), type().data());
+		wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (_content->file().filename().string()).data(), type().data());
 		wxDouble name_width;
 		wxDouble name_height;
 		wxDouble name_descent;
@@ -180,7 +181,11 @@ private:
 		}
 	}
 
-	boost::weak_ptr<Content> _content;
+	/* This must be a shared_ptr, not a weak_ptr, as in the looped case this
+	   will be the only remaining pointer to the looped content that we get
+	   from the playlist.
+	*/
+	boost::shared_ptr<Content> _content;
 	int _track;
 	bool _selected;
 
@@ -352,6 +357,7 @@ Timeline::paint (wxPaintEvent &)
 
 	gc->SetFont (gc->CreateFont (*wxNORMAL_FONT));
 
+	cout << "painting " << _views.size() << "\n";
 	for (list<shared_ptr<View> >::iterator i = _views.begin(); i != _views.end(); ++i) {
 		(*i)->paint (gc);
 	}
@@ -367,9 +373,10 @@ Timeline::playlist_changed ()
 		return;
 	}
 
+	cout << "clearing views.\n";
 	_views.clear ();
 
-	Playlist::ContentList content = fl->playlist()->content ();
+	Playlist::ContentList content = fl->playlist()->content_with_loop ();
 
 	for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 		if (dynamic_pointer_cast<VideoContent> (*i)) {
@@ -401,8 +408,7 @@ Timeline::assign_tracks ()
 			continue;
 		}
 	
-		shared_ptr<Content> acv_content = acv->content().lock ();
-		assert (acv_content);
+		shared_ptr<Content> acv_content = acv->content();
 		
 		int t = 1;
 		while (1) {
@@ -414,12 +420,11 @@ Timeline::assign_tracks ()
 					continue;
 				}
 				
-				shared_ptr<Content> test_content = test->content().lock ();
-				assert (test_content);
+				shared_ptr<Content> test_content = test->content();
 					
 				if (test && test->track() == t) {
-					if ((acv_content->start() <= test_content->start() && test_content->start() <= acv_content->end()) ||
-					    (acv_content->start() <= test_content->end()   && test_content->end()   <= acv_content->end())) {
+					if ((acv_content->start() < test_content->start() && test_content->start() < acv_content->end()) ||
+					    (acv_content->start() < test_content->end()   && test_content->end()   < acv_content->end())) {
 						/* we have an overlap on track `t' */
 						++t;
 						break;
@@ -456,7 +461,7 @@ Timeline::setup_pixels_per_time_unit ()
 		return;
 	}
 
-	_pixels_per_time_unit = static_cast<double>(width() - x_offset() * 2) / film->length();
+	_pixels_per_time_unit = static_cast<double>(width() - x_offset() * 2) / film->length_with_loop();
 }
 
 void
@@ -474,9 +479,7 @@ Timeline::left_down (wxMouseEvent& ev)
 		shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
 		if (cv) {
 			_down_view = cv;
-			shared_ptr<Content> c = cv->content().lock();
-			assert (c);
-			_down_view_start = c->start ();
+			_down_view_start = cv->content()->start ();
 		}
 	}
 
@@ -495,10 +498,7 @@ Timeline::left_down (wxMouseEvent& ev)
 	_first_move = false;
 
 	if (_down_view) {
-		shared_ptr<Content> c = _down_view->content().lock ();
-		if (c) {
-			c->set_change_signals_frequent (true);
-		}
+		_down_view->content()->set_change_signals_frequent (true);
 	}
 }
 
@@ -508,10 +508,7 @@ Timeline::left_up (wxMouseEvent& ev)
 	_left_down = false;
 
 	if (_down_view) {
-		shared_ptr<Content> c = _down_view->content().lock ();
-		if (c) {
-			c->set_change_signals_frequent (false);
-		}
+		_down_view->content()->set_change_signals_frequent (false);
 	}
 
 	set_start_from_event (ev);
@@ -542,14 +539,11 @@ Timeline::set_start_from_event (wxMouseEvent& ev)
 
 	Time const time_diff = (p.x - _down_point.x) / _pixels_per_time_unit;
 	if (_down_view) {
-		shared_ptr<Content> c = _down_view->content().lock();
-		if (c) {
-			c->set_start (max (static_cast<Time> (0), _down_view_start + time_diff));
+		_down_view->content()->set_start (max (static_cast<Time> (0), _down_view_start + time_diff));
 
-			shared_ptr<Film> film = _film.lock ();
-			assert (film);
-			film->set_sequence_video (false);
-		}
+		shared_ptr<Film> film = _film.lock ();
+		assert (film);
+		film->set_sequence_video (false);
 	}
 }