diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-27 13:28:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-27 13:28:08 +0100 |
| commit | af2dfe1cbabaa3c1fb663063a1f9778858255818 (patch) | |
| tree | c9a4aa0f0db38bdbf8b0c44447ded3a9723b98c0 /src | |
| parent | 20fa26ea6ecfdbecea8bb1230c8388cce3fd521f (diff) | |
| parent | f357af9220d2b890a64ccd8b81bfe02b69a0450d (diff) | |
Merge 1.70.0-hotfix branch into master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/playlist.cc | 3 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index e847e623b..df3e63303 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -362,6 +362,7 @@ Playlist::move_earlier (shared_ptr<Content> c) if (previous == _content.end ()) { return; } + Time const p = (*previous)->position (); (*previous)->set_position (p + c->length_after_trim ()); @@ -390,7 +391,7 @@ Playlist::move_later (shared_ptr<Content> c) Time const p = (*next)->position (); (*next)->set_position (c->position ()); - c->set_position (p + c->length_after_trim ()); + c->set_position (c->position() + c->length_after_trim ()); sort (_content.begin(), _content.end(), ContentSorter ()); } diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 9c980b625..de215a0d2 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -532,6 +532,8 @@ FilmEditor::film_content_changed (int property) setup_dcp_name (); } else if (property == ContentProperty::PATH) { setup_content (); + } else if (property == ContentProperty::POSITION) { + setup_content (); } } @@ -753,6 +755,8 @@ FilmEditor::setup_content () _content->DeleteAllItems (); ContentList content = _film->content (); + sort (content.begin(), content.end(), ContentSorter ()); + for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { int const t = _content->GetItemCount (); bool const valid = (*i)->paths_valid (); @@ -761,7 +765,7 @@ FilmEditor::setup_content () if (!valid) { s = _("MISSING: ") + s; } - + _content->InsertItem (t, std_to_wx (s)); if ((*i)->summary() == selected_summary) { |