Support for keeping video in sequence when changing lengths; tie selection in timeline with that in the editor.

9 files changed, 114 insertions, 21 deletions

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index d036f318e..75867d1d5 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -222,7 +222,9 @@ FilmEditor::connect_to_widgets ()
 	_audio_delay->Connect            (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this);
 	_audio_stream->Connect           (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::audio_stream_changed), 0, this);
 	_subtitle_stream->Connect        (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::subtitle_stream_changed), 0, this);
-	_audio_mapping->Changed.connect  (bind (&FilmEditor::audio_mapping_changed, this, _1));
+	_audio_mapping->Changed.connect  (boost::bind (&FilmEditor::audio_mapping_changed, this, _1));
+	_start->Changed.connect          (boost::bind (&FilmEditor::start_changed, this));
+	_length->Changed.connect         (boost::bind (&FilmEditor::length_changed, this));
 }
 
 void
@@ -693,7 +695,12 @@ FilmEditor::film_content_changed (weak_ptr<Content> weak_content, int property)
 		} else {
 			_start->set (0, 24);
 		}
-
+	} else if (property == ContentProperty::LENGTH) {
+		if (content) {
+			_length->set (content->length (), _film->dcp_video_frame_rate ());
+		} else {
+			_length->set (0, 24);
+		}
 	} else if (property == VideoContentProperty::VIDEO_CROP) {
 		checked_set (_left_crop,   video_content ? video_content->crop().left :   0);
 		checked_set (_right_crop,  video_content ? video_content->crop().right :  0);
@@ -848,6 +855,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::DCP_VIDEO_FRAME_RATE);
 
 	film_content_changed (boost::shared_ptr<Content> (), ContentProperty::START);
+	film_content_changed (boost::shared_ptr<Content> (), ContentProperty::LENGTH);
 	film_content_changed (boost::shared_ptr<Content> (), VideoContentProperty::VIDEO_CROP);
 	film_content_changed (boost::shared_ptr<Content> (), AudioContentProperty::AUDIO_GAIN);
 	film_content_changed (boost::shared_ptr<Content> (), AudioContentProperty::AUDIO_DELAY);
@@ -872,7 +880,6 @@ FilmEditor::set_things_sensitive (bool s)
 	_edit_dci_button->Enable (s);
 	_format->Enable (s);
 	_content->Enable (s);
-	_content->Enable (s);
 	_left_crop->Enable (s);
 	_right_crop->Enable (s);
 	_top_crop->Enable (s);
@@ -1175,6 +1182,7 @@ FilmEditor::content_selection_changed (wxListEvent &)
         setup_content_sensitivity ();
 	shared_ptr<Content> s = selected_content ();
 	film_content_changed (s, ContentProperty::START);
+	film_content_changed (s, ContentProperty::LENGTH);
 	film_content_changed (s, VideoContentProperty::VIDEO_CROP);
 	film_content_changed (s, AudioContentProperty::AUDIO_GAIN);
 	film_content_changed (s, AudioContentProperty::AUDIO_DELAY);
@@ -1412,3 +1420,41 @@ FilmEditor::audio_mapping_changed (AudioMapping m)
 
 	ac->set_audio_mapping (m);
 }
+
+void
+FilmEditor::start_changed ()
+{
+	shared_ptr<Content> c = selected_content ();
+	if (!c) {
+		return;
+	}
+
+	c->set_start (_start->get (_film->dcp_video_frame_rate ()));
+}
+
+void
+FilmEditor::length_changed ()
+{
+	shared_ptr<Content> c = selected_content ();
+	if (!c) {
+		return;
+	}
+
+	shared_ptr<ImageMagickContent> ic = dynamic_pointer_cast<ImageMagickContent> (c);
+	if (ic) {
+		ic->set_video_length (_length->get(_film->dcp_video_frame_rate()) * ic->video_frame_rate() / TIME_HZ);
+	}
+}
+
+void
+FilmEditor::set_selection (weak_ptr<Content> wc)
+{
+	Playlist::ContentList content = _film->content ();
+	for (size_t i = 0; i < content.size(); ++i) {
+		if (content[i] == wc.lock ()) {
+			_content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+		} else {
+			_content->SetItemState (i, 0, wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED);
+		}
+	}
+}
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index b169aee7f..c34cd73e0 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -47,6 +47,7 @@ public:
 	FilmEditor (boost::shared_ptr<Film>, wxWindow *);
 
 	void set_film (boost::shared_ptr<Film>);
+	void set_selection (boost::weak_ptr<Content>);
 
 	boost::signals2::signal<void (std::string)> FileChanged;
 
@@ -93,6 +94,8 @@ private:
 	void audio_stream_changed (wxCommandEvent &);
 	void subtitle_stream_changed (wxCommandEvent &);
 	void audio_mapping_changed (AudioMapping);
+	void start_changed ();
+	void length_changed ();
 
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 4b1fb442e..97185ca94 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -464,7 +464,7 @@ FilmViewer::active_jobs_changed (bool a)
 void
 FilmViewer::film_content_changed (weak_ptr<Content>, int p)
 {
-	if (p == VideoContentProperty::VIDEO_LENGTH) {
+	if (p == ContentProperty::LENGTH) {
 		/* Force an update to our frame */
 		wxScrollEvent ev;
 		slider_moved (ev);
diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 460f7423b..f8cdccbe2 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -22,10 +22,12 @@
 #include "wx_util.h"
 
 using std::string;
+using std::cout;
 using boost::lexical_cast;
 
 Timecode::Timecode (wxWindow* parent)
 	: wxPanel (parent)
+	, _in_set (false)
 {
 	wxClientDC dc (parent);
 	wxSize size = dc.GetTextExtent (wxT ("9999"));
@@ -58,12 +60,19 @@ Timecode::Timecode (wxWindow* parent)
 	_frames->SetMaxLength (2);
 	sizer->Add (_frames);
 
+	_hours->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this);
+	_minutes->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this);
+	_seconds->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this);
+	_frames->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this);
+
 	SetSizerAndFit (sizer);
 }
 
 void
 Timecode::set (Time t, int fps)
 {
+	_in_set = true;
+	
 	int const h = t / (3600 * TIME_HZ);
 	t -= h * 3600 * TIME_HZ;
 	int const m = t / (60 * TIME_HZ);
@@ -72,19 +81,35 @@ Timecode::set (Time t, int fps)
 	t -= s * TIME_HZ;
 	int const f = t * fps / TIME_HZ;
 
-	_hours->SetValue (wxString::Format ("%02d", h));
-	_minutes->SetValue (wxString::Format ("%02d", m));
-	_seconds->SetValue (wxString::Format ("%02d", s));
-	_frames->SetValue (wxString::Format ("%02d", f));
+	_hours->SetValue (wxString::Format (wxT ("%d"), h));
+	_minutes->SetValue (wxString::Format (wxT ("%d"), m));
+	_seconds->SetValue (wxString::Format (wxT ("%d"), s));
+	_frames->SetValue (wxString::Format (wxT ("%d"), f));
+
+	_in_set = false;
 }
 
 Time
 Timecode::get (int fps) const
 {
 	Time t = 0;
-	t += lexical_cast<int> (wx_to_std (_hours->GetValue())) * 3600 * TIME_HZ;
-	t += lexical_cast<int> (wx_to_std (_minutes->GetValue())) * 60 * TIME_HZ;
-	t += lexical_cast<int> (wx_to_std (_seconds->GetValue())) * TIME_HZ;
-	t += lexical_cast<int> (wx_to_std (_frames->GetValue())) * TIME_HZ / fps;
+	string const h = wx_to_std (_hours->GetValue ());
+	t += lexical_cast<int> (h.empty() ? "0" : h) * 3600 * TIME_HZ;
+	string const m = wx_to_std (_minutes->GetValue());
+	t += lexical_cast<int> (m.empty() ? "0" : m) * 60 * TIME_HZ;
+	string const s = wx_to_std (_seconds->GetValue());
+	t += lexical_cast<int> (s.empty() ? "0" : s) * TIME_HZ;
+	string const f = wx_to_std (_frames->GetValue());
+	t += lexical_cast<int> (f.empty() ? "0" : f) * TIME_HZ / fps;
 	return t;
 }
+
+void
+Timecode::changed (wxCommandEvent &)
+{
+	if (_in_set) {
+		return;
+	}
+	
+	Changed ();
+}
diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index f243ee0b8..9b6fe6654 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -17,6 +17,7 @@
 
 */
 
+#include <boost/signals2.hpp>
 #include <wx/wx.h>
 #include "lib/types.h"
 
@@ -28,9 +29,15 @@ public:
 	void set (Time, int);
 	Time get (int) const;
 
+	boost::signals2::signal<void ()> Changed;
+
 private:
+	void changed (wxCommandEvent &);
+	
 	wxTextCtrl* _hours;
 	wxTextCtrl* _minutes;
 	wxTextCtrl* _seconds;
 	wxTextCtrl* _frames;
+
+	bool _in_set;
 };
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 54f3d75cf..42f489c2f 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -21,9 +21,10 @@
 #include <wx/graphics.h>
 #include <boost/weak_ptr.hpp>
 #include "film.h"
+#include "film_editor.h"
 #include "timeline.h"
 #include "wx_util.h"
-#include "playlist.h"
+#include "lib/playlist.h"
 
 using std::list;
 using std::cout;
@@ -183,7 +184,7 @@ private:
 
 	void content_changed (int p)
 	{
-		if (p == ContentProperty::START || p == VideoContentProperty::VIDEO_LENGTH) {
+		if (p == ContentProperty::START || p == ContentProperty::LENGTH) {
 			force_redraw ();
 		}
 	}
@@ -312,8 +313,9 @@ private:
 	int _y;
 };
 
-Timeline::Timeline (wxWindow* parent, shared_ptr<const Film> film)
+Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> film)
 	: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
+	, _film_editor (ed)
 	, _film (film)
 	, _tracks (0)
 	, _pixels_per_time_unit (0)
@@ -482,6 +484,9 @@ Timeline::left_down (wxMouseEvent& ev)
 		shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*j);
 		if (cv) {
 			cv->set_selected (i == j);
+			if (i == j) {
+				_film_editor->set_selection (cv->content ());
+			}
 		}
 	}
 
@@ -518,6 +523,10 @@ Timeline::mouse_moved (wxMouseEvent& ev)
 		shared_ptr<Content> c = _down_view->content().lock();
 		if (c) {
 			c->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);
 		}
 	}
 }
diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 566ca060a..348286db8 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -26,11 +26,12 @@
 class Film;
 class View;
 class ContentView;
+class FilmEditor;
 
 class Timeline : public wxPanel
 {
 public:
-	Timeline (wxWindow *, boost::shared_ptr<const Film>);
+	Timeline (wxWindow *, FilmEditor *, boost::shared_ptr<Film>);
 
 	boost::shared_ptr<const Film> film () const;
 
@@ -68,7 +69,8 @@ private:
 	void resized (wxSizeEvent &);
 	void assign_tracks ();
 
-	boost::weak_ptr<const Film> _film;
+	FilmEditor* _film_editor;
+	boost::weak_ptr<Film> _film;
 	std::list<boost::shared_ptr<View> > _views;
 	int _tracks;
 	double _pixels_per_time_unit;
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 91d1f7b07..35d5eec21 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -19,6 +19,7 @@
 
 #include <list>
 #include <wx/graphics.h>
+#include "film_editor.h"
 #include "timeline_dialog.h"
 #include "wx_util.h"
 #include "playlist.h"
@@ -27,9 +28,9 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 
-TimelineDialog::TimelineDialog (wxWindow* parent, shared_ptr<const Film> film)
-	: wxDialog (parent, wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
-	, _timeline (this, film)
+TimelineDialog::TimelineDialog (FilmEditor* ed, shared_ptr<Film> film)
+	: wxDialog (ed, wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
+	, _timeline (this, ed, film)
 {
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 	
diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index bc6b83eb5..17ca22c49 100644
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -27,7 +27,7 @@ class Playlist;
 class TimelineDialog : public wxDialog
 {
 public:
-	TimelineDialog (wxWindow *, boost::shared_ptr<const Film>);
+	TimelineDialog (FilmEditor *, boost::shared_ptr<Film>);
 
 private:
 	Timeline _timeline;