diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-30 13:57:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-30 13:57:52 +0100 |
| commit | 74fe68e5895654e27a7cf8097917c1e95fa89519 (patch) | |
| tree | 8afd88ce9f43293798dfb8018d024adac09388c2 /src | |
| parent | 3c2a72e6e1d4fa47490155a0d6f5e9c5a3a17f68 (diff) | |
| parent | 7d93aa13507094e87bc9086986b36edd96a613b0 (diff) | |
Merge master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/playlist.cc | 3 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 6 | ||||
| -rw-r--r-- | src/wx/wscript | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 710b9cc09..1c65d1326 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -366,6 +366,7 @@ Playlist::move_earlier (shared_ptr<Content> c) if (previous == _content.end ()) { return; } + DCPTime const p = (*previous)->position (); (*previous)->set_position (p + c->length_after_trim ()); @@ -394,6 +395,6 @@ Playlist::move_later (shared_ptr<Content> c) DCPTime 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 002f89604..0c70d4b3e 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -529,6 +529,8 @@ FilmEditor::film_content_changed (int property) setup_dcp_name (); } else if (property == ContentProperty::PATH) { setup_content (); + } else if (property == ContentProperty::POSITION) { + setup_content (); } } @@ -749,6 +751,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 (); @@ -757,7 +761,7 @@ FilmEditor::setup_content () if (!valid) { s = _("MISSING: ") + s; } - + _content->InsertItem (t, std_to_wx (s)); if ((*i)->summary() == selected_summary) { diff --git a/src/wx/wscript b/src/wx/wscript index bc21f9d81..bb5309894 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -72,8 +72,8 @@ def configure(conf): conf.in_msg = 1 wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip() conf.im_msg = 0 - if wx_version != '3.0.0': - conf.fatal('wxwidgets version 3.0.0 is required; %s found' % wx_version) + if not wx_version.startswith('3.0.'): + conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version) def build(bld): if bld.env.BUILD_STATIC: |