Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

5 files changed, 9 insertions, 8 deletions

diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc
index 2ab8e187e..546abbb54 100644
--- a/src/lib/audio_buffers.cc
+++ b/src/lib/audio_buffers.cc
@@ -279,9 +279,10 @@ AudioBuffers::accumulate_frames (AudioBuffers const * from, int32_t read_offset,
 	DCPOMATIC_ASSERT (read_offset >= 0);
 	DCPOMATIC_ASSERT (write_offset >= 0);
 
+	float** from_data = from->data ();
 	for (int i = 0; i < _channels; ++i) {
 		for (int j = 0; j < frames; ++j) {
-			_data[i][j + write_offset] += from->data()[i][j + read_offset];
+			_data[i][j + write_offset] += from_data[i][j + read_offset];
 		}
 	}
 }
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index e7e88d319..c17b21a7f 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -116,9 +116,10 @@ DCPDecoder::pass (PassReason reason, bool)
 		int const channels = _dcp_content->audio->stream()->channels ();
 		int const frames = sf->size() / (3 * channels);
 		shared_ptr<AudioBuffers> data (new AudioBuffers (channels, frames));
+		float** data_data = data->data();
 		for (int i = 0; i < frames; ++i) {
 			for (int j = 0; j < channels; ++j) {
-				data->data()[j][i] = static_cast<int> ((from[0] << 8) | (from[1] << 16) | (from[2] << 24)) / static_cast<float> (INT_MAX - 256);
+				data_data[j][i] = static_cast<int> ((from[0] << 8) | (from[1] << 16) | (from[2] << 24)) / static_cast<float> (INT_MAX - 256);
 				from += 3;
 			}
 		}
diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index aafc0e381..368ff863d 100644
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -28,8 +28,8 @@
 using namespace std;
 using namespace boost;
 
-DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
-	: wxPanel (parent)
+DirPickerCtrl::DirPickerCtrl (wxWindow* parent, wxSize size)
+	: wxPanel (parent, wxID_ANY, wxDefaultPosition, size)
 {
 	_sizer = new wxBoxSizer (wxHORIZONTAL);
 
diff --git a/src/wx/dir_picker_ctrl.h b/src/wx/dir_picker_ctrl.h
index 2ab2a5714..383362f57 100644
--- a/src/wx/dir_picker_ctrl.h
+++ b/src/wx/dir_picker_ctrl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,7 +23,7 @@
 class DirPickerCtrl : public wxPanel
 {
 public:
-	DirPickerCtrl (wxWindow *);
+	DirPickerCtrl (wxWindow *, wxSize size = wxDefaultSize);
 
 	wxString GetPath () const;
 	void SetPath (wxString);
@@ -36,4 +36,3 @@ private:
 	wxString _path;
 	wxSizer* _sizer;
 };
-
diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index 04b9e1057..df5890f2c 100644
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -41,7 +41,7 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
 	add (_("Create in folder"), true);
 
 #ifdef DCPOMATIC_USE_OWN_PICKER
-	_folder = new DirPickerCtrl (this);
+	_folder = new DirPickerCtrl (this, wxSize (300, -1));
 #else
 	_folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
 #endif