From 19d813fa48ef6f808109969696321f9c902ee63b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 15 Jun 2014 23:52:41 +0100 Subject: Fix crash on changing audio gain in some locales. Reported-by: Daniel Chauvet --- src/wx/about_dialog.cc | 1 + src/wx/audio_mapping_view.cc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 751b453ed..63de45120 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -155,6 +155,7 @@ AboutDialog::AboutDialog (wxWindow* parent) tested_by.Add (wxT ("Mike Blakesley")); tested_by.Add (wxT ("David Booty")); tested_by.Add (wxT ("Roop Chand")); + tested_by.Add (wxT ("Daniel Chauvet")); tested_by.Add (wxT ("Adam Colt")); tested_by.Add (wxT ("John Convertino")); tested_by.Add (wxT ("Andreas Eli")); diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index d59c4ae07..6c1508aee 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -21,6 +21,7 @@ #include #include #include +#include #include "lib/audio_mapping.h" #include "lib/util.h" #include "audio_mapping_view.h" @@ -238,7 +239,7 @@ AudioMappingView::update_cells () _grid->SetCellValue (i, 0, wxString::Format (wxT("%d"), i + 1)); for (int j = 1; j < _grid->GetNumberCols(); ++j) { - _grid->SetCellValue (i, j, std_to_wx (lexical_cast (_map.get (i, static_cast (j - 1))))); + _grid->SetCellValue (i, j, std_to_wx (libdcp::raw_convert (_map.get (i, static_cast (j - 1))))); } } -- cgit v1.2.3 From aeb7d4f12386dcf93f458b1b641bddcf0facf2fb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 15 Jun 2014 23:53:46 +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 41713f4d2..e6bc2126c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-15 Carl Hetherington + + * Version 1.69.28 released. + 2014-06-12 Carl Hetherington * Version 1.69.27 released. diff --git a/debian/changelog b/debian/changelog index 41c9652c5..2a482b81d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.27-1) UNRELEASED; urgency=low +dcpomatic (1.69.28-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -151,8 +151,9 @@ dcpomatic (1.69.27-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Thu, 12 Jun 2014 16:51:24 +0100 + -- Carl Hetherington Sun, 15 Jun 2014 23:53:46 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 88669bb89..71258d049 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.27devel' +VERSION = '1.69.28' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From b1d5ecd2b990ec8316386037bcc2186b42837cd5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 15 Jun 2014 23:53:46 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 71258d049..8956d06c0 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.28' +VERSION = '1.69.28devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From c33fc4d10ee3a3b62ccc1b8122c791d4dfd61a60 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Jun 2014 13:29:43 +0100 Subject: Fix awful thinko causing Playlist::active_frame_rate_change to return the wrong thing sometimes. --- ChangeLog | 4 ++++ src/lib/playlist.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e6bc2126c..d0f8d7b3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-18 Carl Hetherington + + * Fix thinko causing incorrect audio sample rates in some cases. + 2014-06-15 Carl Hetherington * Version 1.69.28 released. diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 247c4837b..dc87fbfab 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -404,7 +404,7 @@ Playlist::active_frame_rate_change (Time t, int dcp_video_frame_rate) const for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { shared_ptr vc = dynamic_pointer_cast (*i); if (!vc) { - break; + continue; } if (vc->position() >= t && t < vc->end()) { -- cgit v1.2.3 From 720cb01758fadd957c37667556a9ef62b0fc80ae Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Jun 2014 13:31:03 +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 d0f8d7b3d..22e314e46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-18 Carl Hetherington + + * Version 1.69.29 released. + 2014-06-18 Carl Hetherington * Fix thinko causing incorrect audio sample rates in some cases. diff --git a/debian/changelog b/debian/changelog index 2a482b81d..fdd0cc20d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.28-1) UNRELEASED; urgency=low +dcpomatic (1.69.29-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -152,8 +152,9 @@ dcpomatic (1.69.28-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sun, 15 Jun 2014 23:53:46 +0100 + -- Carl Hetherington Wed, 18 Jun 2014 13:31:03 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 8956d06c0..297bf8479 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.28devel' +VERSION = '1.69.29' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From da38ed791a5a46a97b26947409cf837b7939fd54 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Jun 2014 13:31:03 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 297bf8479..167921fbe 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.29' +VERSION = '1.69.29devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3