projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix destruction of Server; some test cleanups.
[dcpomatic.git]
/
src
/
wx
/
audio_mapping_view.cc
diff --git
a/src/wx/audio_mapping_view.cc
b/src/wx/audio_mapping_view.cc
index c65eadd5a0676c9122ee968b8f902fe774a399ff..8e92400bdb956ffd7b58205dccf5626bf9015be7 100644
(file)
--- 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 <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"
#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, 0, wxString::Format (wxT("%d"), i + 1));
for (int j = 1; j < _grid->GetNumberCols(); ++j) {
- _grid->SetCellValue (i, j, std_to_wx (
lexical_cas
t<string> (_map.get (i, static_cast<dcp::Channel> (j - 1)))));
+ _grid->SetCellValue (i, j, std_to_wx (
dcp::raw_conver
t<string> (_map.get (i, static_cast<dcp::Channel> (j - 1)))));
}
}
}
}