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 be1bd67b9cd4d0a388f85e5030363352cf0d7cb3..8e92400bdb956ffd7b58205dccf5626bf9015be7 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -25,11 +25,13 @@
 #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 "wx_util.h"
 #include "audio_gain_dialog.h"
+#include <boost/lexical_cast.hpp>
 
 using std::cout;
 using std::list;
@@ -43,7 +45,7 @@ using boost::lexical_cast;
 enum {
        ID_off = 1,
        ID_full = 2,
-       ID_minus3dB = 3,
+       ID_minus6dB = 3,
        ID_edit = 4
 };
 
@@ -65,8 +67,6 @@ public:
 
        void Draw (wxGrid& grid, wxGridCellAttr &, wxDC& dc, const wxRect& rect, int row, int col, bool)
        {
-               LocaleGuard lg;
-       
                dc.SetPen (*wxThePenList->FindOrCreatePen (wxColour (255, 255, 255), 1, wxPENSTYLE_SOLID));
                dc.SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (255, 255, 255), wxBRUSHSTYLE_SOLID));
                dc.DrawRectangle (rect);
@@ -118,7 +118,7 @@ AudioMappingView::AudioMappingView (wxWindow* parent)
 {
        _grid = new wxGrid (this, wxID_ANY);
 
-       _grid->CreateGrid (0, MAX_AUDIO_CHANNELS + 1);
+       _grid->CreateGrid (0, MAX_DCP_AUDIO_CHANNELS + 1);
        _grid->HideRowLabels ();
        _grid->DisableDragRowSize ();
        _grid->DisableDragColSize ();
@@ -139,12 +139,12 @@ AudioMappingView::AudioMappingView (wxWindow* parent)
        _menu = new wxMenu;
        _menu->Append (ID_off, _("Off"));
        _menu->Append (ID_full, _("Full"));
-       _menu->Append (ID_minus3dB, _("-3dB"));
+       _menu->Append (ID_minus6dB, _("-6dB"));
        _menu->Append (ID_edit, _("Edit..."));
 
        Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::off, this), ID_off);
        Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::full, this), ID_full);
-       Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::minus3dB, this), ID_minus3dB);
+       Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::minus6dB, this), ID_minus6dB);
        Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&AudioMappingView::edit, this), ID_edit);
 }
 
@@ -201,9 +201,9 @@ AudioMappingView::full ()
 }
 
 void
-AudioMappingView::minus3dB ()
+AudioMappingView::minus6dB ()
 {
-       _map.set (_menu_row, static_cast<dcp::Channel> (_menu_column - 1), 1 / sqrt (2));
+       _map.set (_menu_row, static_cast<dcp::Channel> (_menu_column - 1), pow (10, -6.0 / 20));
        map_changed ();
 }
 
@@ -231,8 +231,6 @@ AudioMappingView::set (AudioMapping map)
 void
 AudioMappingView::update_cells ()
 {
-       LocaleGuard lg;
-       
        if (_grid->GetNumberRows ()) {
                _grid->DeleteRows (0, _grid->GetNumberRows ());
        }
@@ -240,7 +238,7 @@ AudioMappingView::update_cells ()
        _grid->InsertRows (0, _map.content_channels ());
 
        for (int i = 0; i < _map.content_channels(); ++i) {
-               for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) {
+               for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) {
                        _grid->SetCellRenderer (i, j + 1, new ValueRenderer);
                }
        }
@@ -249,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)))));
                }
        }
 
@@ -279,8 +277,8 @@ AudioMappingView::set_column_labels ()
        
        _grid->SetColLabelValue (0, _("Content"));
 
-#if MAX_AUDIO_CHANNELS != 12
-#warning AudioMappingView::set_column_labels() is expecting the wrong MAX_AUDIO_CHANNELS
+#if MAX_DCP_AUDIO_CHANNELS != 12
+#warning AudioMappingView::set_column_labels() is expecting the wrong MAX_DCP_AUDIO_CHANNELS
 #endif 
        
        if (c > 0) {