From 19d813fa48ef6f808109969696321f9c902ee63b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
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(-)

(limited to 'src')

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 <wx/renderer.h>
 #include <wx/grid.h>
 #include <libdcp/types.h>
+#include <libdcp/raw_convert.h>
 #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<string> (_map.get (i, static_cast<libdcp::Channel> (j - 1)))));
+			_grid->SetCellValue (i, j, std_to_wx (libdcp::raw_convert<string> (_map.get (i, static_cast<libdcp::Channel> (j - 1)))));
 		}
 	}
 
-- 
cgit v1.2.3


From c33fc4d10ee3a3b62ccc1b8122c791d4dfd61a60 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
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(-)

(limited to 'src')

diff --git a/ChangeLog b/ChangeLog
index e6bc2126c..d0f8d7b3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-18  Carl Hetherington  <cth@carlh.net>
+
+	* Fix thinko causing incorrect audio sample rates in some cases.
+
 2014-06-15  Carl Hetherington  <cth@carlh.net>
 
 	* 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<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
 		if (!vc) {
-			break;
+			continue;
 		}
 
 		if (vc->position() >= t && t < vc->end()) {
-- 
cgit v1.2.3