From ce95400c73db6ece7ef34e0171e7e04b72f9ca03 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 27 Jun 2014 13:22:42 +0100 Subject: Fix incorrect behaviour of Playlist::move_later. --- src/lib/playlist.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 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 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 ()); } -- cgit v1.2.3 From 70cda1727416878992fd7b728d7a77f609330d8d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 27 Jun 2014 13:23:09 +0100 Subject: Fix the up/down buttons in the content list. Reported-by: Daniel Chauvet --- ChangeLog | 4 ++++ src/wx/film_editor.cc | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6be780b4b..80ab67b6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-27 Carl Hetherington + + * Fix up/down buttons in content list. + 2014-06-26 Carl Hetherington * Version 1.70.0 released. 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) { -- cgit v1.2.3 From ba37b5c74fbeb7fbda5359e2e4de4e0466a4c2eb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 27 Jun 2014 13:25:44 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80ab67b6b..65bfbe538 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-27 Carl Hetherington + + * Version 1.71.0 released. + 2014-06-27 Carl Hetherington * Fix up/down buttons in content list. diff --git a/debian/changelog b/debian/changelog index 7d30201ca..872bd18ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.70.0-1) UNRELEASED; urgency=low +dcpomatic (1.71.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -162,8 +162,9 @@ dcpomatic (1.70.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 26 Jun 2014 10:26:32 +0100 + -- Carl Hetherington Fri, 27 Jun 2014 13:25:44 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 64bc5ab61..8320de48f 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.70.0' +VERSION = '1.71.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From f357af9220d2b890a64ccd8b81bfe02b69a0450d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 27 Jun 2014 13:25:45 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 8320de48f..29713eb5f 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.71.0' +VERSION = '1.71.0devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 615511a21c22066592efaf6297773f077fc83508 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 27 Jun 2014 15:37:44 +0100 Subject: Support building with wxWidgets 3.0.x. --- src/wx/wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wx/wscript b/src/wx/wscript index de256bf60..f26a91cbc 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -71,8 +71,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: -- cgit v1.2.3 From fd5567a6bbecf6f7e213e25284b3baf01f7a96e2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 28 Jun 2014 00:39:02 +0100 Subject: Fix crash on analysing audio (and possibly DCP creation) with resampled content. Reported-by: Matthias Damm --- ChangeLog | 5 +++++ src/lib/player.cc | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a417575e5..a8b91ec63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-06-28 Carl Hetherington + + * Fix crash on analysing audio (and possibly DCP creation) with + resampled content. + 2014-06-27 Carl Hetherington * Version 1.71.0 released. diff --git a/src/lib/player.cc b/src/lib/player.cc index 7bf78c905..2d2977606 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -150,7 +150,12 @@ Player::pass () if (re) { shared_ptr b = re->flush (); if (b->frames ()) { - process_audio (earliest, b, ac->audio_length (), true); + process_audio ( + earliest, + b, + ac->audio_length() * ac->output_audio_frame_rate() / ac->content_audio_frame_rate(), + true + ); } } } -- cgit v1.2.3 From 2a49c354ef9037ef15ad4e4305e749758a97d7b6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 28 Jun 2014 00:53:18 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 10 ++++------ wscript | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8b91ec63..9dfed5d60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-28 Carl Hetherington + + * Version 1.71.1 released. + 2014-06-28 Carl Hetherington * Fix crash on analysing audio (and possibly DCP creation) with diff --git a/debian/changelog b/debian/changelog index 2cb6795fa..b69567a2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.71.0-1) UNRELEASED; urgency=low +dcpomatic (1.71.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -164,11 +164,9 @@ dcpomatic (1.71.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. -<<<<<<< HEAD - -- Carl Hetherington Thu, 26 Jun 2014 19:30:39 +0100 -======= - -- Carl Hetherington Fri, 27 Jun 2014 13:25:44 +0100 ->>>>>>> 1.70.0-hotfix +<<<<<<< HEAD * New upstream release. + + -- Carl Hetherington Sat, 28 Jun 2014 00:53:18 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 9612821a1..c497c9371 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.71.0devel' +VERSION = '1.71.1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 28568281aec2086f928c3799ecb18841daa69477 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 28 Jun 2014 00:53:18 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index c497c9371..e89eedbe7 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.71.1' +VERSION = '1.71.1devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6bcf76cc22ff0ed9c5598e1d92b05f93f37a510a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 28 Jun 2014 00:53:41 +0100 Subject: Fix merge. --- debian/changelog | 4 ---- 1 file changed, 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2cb6795fa..17f8b311a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -164,11 +164,7 @@ dcpomatic (1.71.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. -<<<<<<< HEAD -- Carl Hetherington Thu, 26 Jun 2014 19:30:39 +0100 -======= - -- Carl Hetherington Fri, 27 Jun 2014 13:25:44 +0100 ->>>>>>> 1.70.0-hotfix dcpomatic (0.87-1) UNRELEASED; urgency=low -- cgit v1.2.3 From 8e2437a0dc086b20fc1866b6f05c2889759d0708 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 28 Jun 2014 00:54:23 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9dfed5d60..46b8be088 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-28 Carl Hetherington + + * Version 1.71.2 released. + 2014-06-28 Carl Hetherington * Version 1.71.1 released. diff --git a/debian/changelog b/debian/changelog index 6538c05ec..224e44da3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.71.1-1) UNRELEASED; urgency=low +dcpomatic (1.71.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -163,8 +163,9 @@ dcpomatic (1.71.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 26 Jun 2014 19:30:39 +0100 + -- Carl Hetherington Sat, 28 Jun 2014 00:54:23 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index e89eedbe7..722e7b5e8 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.71.1devel' +VERSION = '1.71.2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 8b20f2a068d1ddd94c7b68a990aab6a8d9e5b2f5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 28 Jun 2014 00:54:23 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 722e7b5e8..cbd2e4640 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.71.2' +VERSION = '1.71.2devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From b09104bd67b66ed8a9dd24c63001d5fa19744dd6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 30 Jun 2014 10:43:16 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46b8be088..67a818f3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-30 Carl Hetherington + + * Version 1.72.0 released. + 2014-06-28 Carl Hetherington * Version 1.71.2 released. diff --git a/debian/changelog b/debian/changelog index 224e44da3..69508cb10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.71.2-1) UNRELEASED; urgency=low +dcpomatic (1.72.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -164,8 +164,9 @@ dcpomatic (1.71.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 28 Jun 2014 00:54:23 +0100 + -- Carl Hetherington Mon, 30 Jun 2014 10:43:16 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index cbd2e4640..668667c5f 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.71.2devel' +VERSION = '1.72.0' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 7d93aa13507094e87bc9086986b36edd96a613b0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 30 Jun 2014 10:43:17 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 668667c5f..404782b3c 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.0' +VERSION = '1.72.0devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3