diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-20 00:53:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-20 00:53:40 +0100 |
| commit | 0da7c88a1afb221f97e2e96c159b1a984e4e2f71 (patch) | |
| tree | 558590d5ad0a2ced262c2142915b738d898ddbf0 /src/wx | |
| parent | 4a677ee9e750efc330c29df69f19dae27f09aa4d (diff) | |
| parent | da38ed791a5a46a97b26947409cf837b7939fd54 (diff) | |
Merge master; fix destruction of Server; some test cleanups.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/about_dialog.cc | 1 | ||||
| -rw-r--r-- | src/wx/audio_mapping_view.cc | 3 | ||||
| -rw-r--r-- | src/wx/config_dialog.cc | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index bd4a39811..dd80e94cb 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -159,6 +159,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 c65eadd5a..8e92400bd 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -25,6 +25,7 @@ #include <wx/renderer.h> #include <wx/grid.h> #include <dcp/types.h> +#include <dcp/raw_convert.h> #include "lib/audio_mapping.h" #include "lib/util.h" #include "audio_mapping_view.h" @@ -246,7 +247,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<dcp::Channel> (j - 1))))); + _grid->SetCellValue (i, j, std_to_wx (dcp::raw_convert<string> (_map.get (i, static_cast<dcp::Channel> (j - 1))))); } } diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 68fbc3f1b..b447e0eee 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -35,6 +35,7 @@ #include "lib/filter.h" #include "lib/dcp_content_type.h" #include "lib/colour_conversion.h" +#include "lib/log.h" #include "config_dialog.h" #include "wx_util.h" #include "editable_list.h" |