#include "audio_gain_dialog.h"
#include "lib/audio_mapping.h"
#include "lib/util.h"
+#include "lib/warnings.h"
#include <dcp/locale_convert.h>
#include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/renderer.h>
#include <wx/grid.h>
#include <wx/graphics.h>
-#include <boost/foreach.hpp>
+DCPOMATIC_ENABLE_WARNINGS
#include <iostream>
using std::cout;
using std::vector;
using std::pair;
using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::locale_convert;
#define INDICATOR_SIZE 20
}
void
-AudioMappingView::paint_static (wxDC& dc, wxGraphicsContext* gc)
+AudioMappingView::paint_static (wxDC& dc)
{
- gc->SetAntialiasMode (wxANTIALIAS_DEFAULT);
dc.SetFont (wxSWISS_FONT->Bold());
wxCoord label_width;
wxCoord label_height;
);
dc.SetFont (*wxSWISS_FONT);
- gc->SetPen (*wxBLACK_PEN);
}
void
-AudioMappingView::paint_column_labels (wxDC& dc, wxGraphicsContext* gc)
+AudioMappingView::paint_column_labels (wxDC& dc)
{
wxCoord label_width;
wxCoord label_height;
int N = 0;
- BOOST_FOREACH (string i, _output_channels) {
- dc.GetTextExtent (std_to_wx(i), &label_width, &label_height);
- dc.DrawText (std_to_wx(i), LEFT_WIDTH + GRID_SPACING * N + (GRID_SPACING - label_width) / 2, GRID_SPACING + (GRID_SPACING - label_height) / 2);
+ for (auto const& i: _output_channels) {
+ dc.GetTextExtent (std_to_wx(i.name), &label_width, &label_height);
+ dc.DrawText (std_to_wx(i.name), LEFT_WIDTH + GRID_SPACING * N + (GRID_SPACING - label_width) / 2, GRID_SPACING + (GRID_SPACING - label_height) / 2);
++N;
}
- wxGraphicsPath lines = gc->CreatePath ();
- lines.MoveToPoint (LEFT_WIDTH, GRID_SPACING);
- lines.AddLineToPoint (LEFT_WIDTH + _output_channels.size() * GRID_SPACING, GRID_SPACING);
- lines.MoveToPoint (LEFT_WIDTH, GRID_SPACING * 2);
- lines.AddLineToPoint (LEFT_WIDTH + _output_channels.size() * GRID_SPACING, GRID_SPACING * 2);
- gc->StrokePath (lines);
+ dc.DrawLine(wxPoint(LEFT_WIDTH, GRID_SPACING), wxPoint(LEFT_WIDTH + _output_channels.size() * GRID_SPACING, GRID_SPACING));
+ dc.DrawLine(wxPoint(LEFT_WIDTH, GRID_SPACING * 2), wxPoint(LEFT_WIDTH + _output_channels.size() * GRID_SPACING, GRID_SPACING * 2));
}
void
-AudioMappingView::paint_column_lines (wxGraphicsContext* gc)
+AudioMappingView::paint_column_lines (wxDC& dc)
{
- wxGraphicsPath lines = gc->CreatePath ();
for (size_t i = 0; i < _output_channels.size(); ++i) {
- lines.MoveToPoint (LEFT_WIDTH + GRID_SPACING * i, GRID_SPACING);
- lines.AddLineToPoint (LEFT_WIDTH + GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING);
+ dc.DrawLine (
+ wxPoint(LEFT_WIDTH + GRID_SPACING * i, GRID_SPACING),
+ wxPoint(LEFT_WIDTH + GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING)
+ );
}
- lines.MoveToPoint (LEFT_WIDTH + GRID_SPACING * _output_channels.size(), GRID_SPACING);
- lines.AddLineToPoint (LEFT_WIDTH + GRID_SPACING * _output_channels.size(), TOP_HEIGHT + _input_channels.size() * GRID_SPACING);
- gc->StrokePath (lines);
+
+ dc.DrawLine (
+ wxPoint(LEFT_WIDTH + GRID_SPACING * _output_channels.size(), GRID_SPACING),
+ wxPoint(LEFT_WIDTH + GRID_SPACING * _output_channels.size(), TOP_HEIGHT + _input_channels.size() * GRID_SPACING)
+ );
}
void
-AudioMappingView::paint_row_labels (wxDC& dc, wxGraphicsContext* gc)
+AudioMappingView::paint_row_labels (wxDC& dc)
{
wxCoord label_width;
wxCoord label_height;
- wxGraphicsPath lines = gc->CreatePath ();
/* Row channel labels */
int N = 0;
- BOOST_FOREACH (string i, _input_channels) {
- dc.GetTextExtent (std_to_wx(i), &label_width, &label_height);
- dc.DrawText (std_to_wx(i), GRID_SPACING * 2 + (GRID_SPACING - label_width) / 2, TOP_HEIGHT + GRID_SPACING * N + (GRID_SPACING - label_height) / 2);
+ for (auto const& i: _input_channels) {
+ dc.GetTextExtent (std_to_wx(i.name), &label_width, &label_height);
+ dc.DrawText (std_to_wx(i.name), GRID_SPACING * 2 + (GRID_SPACING - label_width) / 2, TOP_HEIGHT + GRID_SPACING * N + (GRID_SPACING - label_height) / 2);
++N;
}
/* Vertical lines on the left */
for (int i = 1; i < 3; ++i) {
- lines.MoveToPoint (GRID_SPACING * i, TOP_HEIGHT);
- lines.AddLineToPoint (GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING);
+ dc.DrawLine (
+ wxPoint(GRID_SPACING * i, TOP_HEIGHT),
+ wxPoint(GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING)
+ );
}
/* Group labels and lines */
int y = TOP_HEIGHT;
- BOOST_FOREACH (Group i, _input_groups) {
+ for (auto i: _input_groups) {
int const height = (i.to - i.from + 1) * GRID_SPACING;
dc.GetTextExtent (std_to_wx(i.name), &label_width, &label_height);
if (label_width > height) {
}
{
+ wxDCClipper clip (dc, wxRect(GRID_SPACING, y, GRID_SPACING, height));
int yp = y;
if ((yp - 2 * GRID_SPACING) < dc.GetLogicalOrigin().y) {
yp += dc.GetLogicalOrigin().y;
);
}
- lines.MoveToPoint (GRID_SPACING, y);
- lines.AddLineToPoint (GRID_SPACING * 2, y);
+ dc.DrawLine (wxPoint(GRID_SPACING, y), wxPoint(GRID_SPACING * 2, y));
y += height;
}
- lines.MoveToPoint (GRID_SPACING, y);
- lines.AddLineToPoint (GRID_SPACING * 2, y);
-
- gc->StrokePath (lines);
+ dc.DrawLine (wxPoint(GRID_SPACING, y), wxPoint(GRID_SPACING * 2, y));
}
void
-AudioMappingView::paint_row_lines (wxGraphicsContext* gc)
+AudioMappingView::paint_row_lines (wxDC& dc)
{
- wxGraphicsPath lines = gc->CreatePath ();
for (size_t i = 0; i < _input_channels.size(); ++i) {
- lines.MoveToPoint (GRID_SPACING * 2, TOP_HEIGHT + GRID_SPACING * i);
- lines.AddLineToPoint (LEFT_WIDTH + _output_channels.size() * GRID_SPACING, TOP_HEIGHT + GRID_SPACING * i);
+ dc.DrawLine (
+ wxPoint(GRID_SPACING * 2, TOP_HEIGHT + GRID_SPACING * i),
+ wxPoint(LEFT_WIDTH + _output_channels.size() * GRID_SPACING, TOP_HEIGHT + GRID_SPACING * i)
+ );
}
- lines.MoveToPoint (GRID_SPACING * 2, TOP_HEIGHT + GRID_SPACING * _input_channels.size());
- lines.AddLineToPoint (LEFT_WIDTH + _output_channels.size() * GRID_SPACING, TOP_HEIGHT + GRID_SPACING * _input_channels.size());
- gc->StrokePath (lines);
+ dc.DrawLine (
+ wxPoint(GRID_SPACING * 2, TOP_HEIGHT + GRID_SPACING * _input_channels.size()),
+ wxPoint(LEFT_WIDTH + _output_channels.size() * GRID_SPACING, TOP_HEIGHT + GRID_SPACING * _input_channels.size())
+ );
}
void
)
);
- float const value_dB = linear_to_db(_map.get(y, x));
+ float const value_dB = linear_to_db(_map.get(_input_channels[y].index, _output_channels[x].index));
wxColour const colour = value_dB <= 0 ? wxColour(0, 255, 0) : wxColour(255, 150, 0);
int const range = 18;
int height = 0;
}
static
-void clip (wxDC& dc, wxGraphicsContext* gc, int x, int y, int w, int h)
+void clip (wxDC& dc, int x, int y, int w, int h)
{
dc.SetClippingRegion (x, y, w, h);
- gc->Clip (x, y, w, h);
}
static
-void translate (wxDC& dc, wxGraphicsContext* gc, int x, int y)
+void translate (wxDC& dc, int x, int y)
{
- gc->PushState ();
- gc->Translate (-x, -y);
dc.SetLogicalOrigin (x, y);
}
static
-void restore (wxDC& dc, wxGraphicsContext* gc)
+void restore (wxDC& dc)
{
dc.SetLogicalOrigin (0, 0);
- gc->PopState ();
dc.DestroyClippingRegion ();
- gc->ResetClip ();
}
void
{
wxPaintDC dc (_body);
- wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
- if (!gc) {
- return;
- }
-
int const hs = _horizontal_scroll->GetThumbPosition ();
int const vs = _vertical_scroll->GetThumbPosition ();
- paint_static (dc, gc);
+ paint_static (dc);
clip (
- dc, gc,
+ dc,
LEFT_WIDTH,
0,
GRID_SPACING * _output_channels.size(),
GRID_SPACING * (2 + _input_channels.size())
);
- translate (dc, gc, hs, 0);
- paint_column_labels (dc, gc);
- restore (dc, gc);
+ translate (dc, hs, 0);
+ paint_column_labels (dc);
+ restore (dc);
clip (
- dc, gc,
+ dc,
0,
TOP_HEIGHT,
GRID_SPACING * 3,
min(int(GRID_SPACING * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT)
);
- translate (dc, gc, 0, vs);
- paint_row_labels (dc, gc);
- restore (dc, gc);
+ translate (dc, 0, vs);
+ paint_row_labels (dc);
+ restore (dc);
clip (
- dc, gc,
+ dc,
GRID_SPACING * 2,
TOP_HEIGHT,
GRID_SPACING * (1 + _output_channels.size()),
min(int(GRID_SPACING * (2 + _input_channels.size())), GetSize().GetHeight() - TOP_HEIGHT)
);
- translate (dc, gc, hs, vs);
- paint_row_lines (gc);
- restore (dc, gc);
+ translate (dc, hs, vs);
+ paint_row_lines (dc);
+ restore (dc);
clip (
- dc, gc,
+ dc,
LEFT_WIDTH,
GRID_SPACING,
GRID_SPACING * (1 + _output_channels.size()),
min(int(GRID_SPACING * (1 + _input_channels.size())), GetSize().GetHeight() - GRID_SPACING)
);
- translate (dc, gc, hs, vs);
- paint_column_lines (gc);
- restore (dc, gc);
+ translate (dc, hs, vs);
+ paint_column_lines (dc);
+ restore (dc);
clip (
- dc, gc,
+ dc,
LEFT_WIDTH,
TOP_HEIGHT,
GRID_SPACING * _output_channels.size(),
min(int(GRID_SPACING * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT)
);
- translate (dc, gc, hs, vs);
+ translate (dc, hs, vs);
paint_indicators (dc);
- restore (dc, gc);
-
- delete gc;
+ restore (dc);
}
-optional<pair<int, int> >
+optional<pair<NamedChannel, NamedChannel> >
AudioMappingView::mouse_event_to_channels (wxMouseEvent& ev) const
{
int const x = ev.GetX() + _horizontal_scroll->GetThumbPosition();
int const y = ev.GetY() + _vertical_scroll->GetThumbPosition();
if (x <= LEFT_WIDTH || y < TOP_HEIGHT) {
- return optional<pair<int, int> >();
+ return optional<pair<NamedChannel, NamedChannel> >();
}
int const input = (y - TOP_HEIGHT) / GRID_SPACING;
int const output = (x - LEFT_WIDTH) / GRID_SPACING;
if (input >= int(_input_channels.size()) || output >= int(_output_channels.size())) {
- return optional<pair<int, int> >();
+ return optional<pair<NamedChannel, NamedChannel> >();
}
- return make_pair (input, output);
+ return make_pair (_input_channels[input], _output_channels[output]);
}
optional<string>
}
int y = (ev.GetY() + _vertical_scroll->GetThumbPosition() - (GRID_SPACING * 2)) / GRID_SPACING;
- BOOST_FOREACH (Group i, _input_groups) {
+ for (auto i: _input_groups) {
if (i.from <= y && y <= i.to) {
return i.name;
}
void
AudioMappingView::left_down (wxMouseEvent& ev)
{
- optional<pair<int, int> > channels = mouse_event_to_channels (ev);
+ optional<pair<NamedChannel, NamedChannel> > channels = mouse_event_to_channels (ev);
if (!channels) {
return;
}
- if (_map.get(channels->first, channels->second) > 0) {
- _map.set (channels->first, channels->second, 0);
+ if (_map.get(channels->first.index, channels->second.index) > 0) {
+ _map.set (channels->first.index, channels->second.index, 0);
} else {
- _map.set (channels->first, channels->second, 1);
+ _map.set (channels->first.index, channels->second.index, 1);
}
map_values_changed ();
void
AudioMappingView::right_down (wxMouseEvent& ev)
{
- optional<pair<int, int> > channels = mouse_event_to_channels (ev);
+ optional<pair<NamedChannel, NamedChannel> > channels = mouse_event_to_channels (ev);
if (!channels) {
return;
}
- _menu_input = channels->first;
- _menu_output = channels->second;
+ _menu_input = channels->first.index;
+ _menu_output = channels->second.index;
PopupMenu (_menu, ev.GetPosition());
}
AudioMappingView::map_values_changed ()
{
Changed (_map);
- _last_tooltip_channels = optional<pair<int, int> >();
+ _last_tooltip_channels = optional<pair<NamedChannel, NamedChannel> >();
Refresh ();
}
}
void
-AudioMappingView::set_input_channels (vector<string> const & names)
+AudioMappingView::set_input_channels (vector<NamedChannel> const& channels)
{
- _input_channels = names;
+ _input_channels = channels;
setup ();
Refresh ();
}
void
-AudioMappingView::set_output_channels (vector<string> const & names)
+AudioMappingView::set_output_channels (vector<NamedChannel> const & channels)
{
- _output_channels = names;
+ _output_channels = channels;
setup ();
Refresh ();
}
+
wxString
-AudioMappingView::safe_input_channel_name (int n) const
+AudioMappingView::input_channel_name_with_group (NamedChannel const& n) const
{
- if (n >= int(_input_channels.size())) {
- return wxString::Format ("%d", n + 1);
- }
-
optional<wxString> group;
- BOOST_FOREACH (Group i, _input_groups) {
- if (i.from <= n && n <= i.to) {
+ for (auto i: _input_groups) {
+ if (i.from <= n.index && n.index <= i.to) {
group = std_to_wx (i.name);
}
}
if (group && !group->IsEmpty()) {
- return wxString::Format ("%s/%s", group->data(), std_to_wx(_input_channels[n]).data());
+ return wxString::Format ("%s/%s", group->data(), std_to_wx(n.name).data());
}
- return std_to_wx(_input_channels[n]);
+ return std_to_wx(n.name);
}
-wxString
-AudioMappingView::safe_output_channel_name (int n) const
-{
- if (n >= int(_output_channels.size())) {
- return wxString::Format ("%d", n + 1);
- }
-
- return std_to_wx(_output_channels[n]);
-}
void
AudioMappingView::motion (wxMouseEvent& ev)
{
- optional<pair<int, int> > channels = mouse_event_to_channels (ev);
+ optional<pair<NamedChannel, NamedChannel> > channels = mouse_event_to_channels (ev);
if (channels) {
if (channels != _last_tooltip_channels) {
wxString s;
- float const gain = _map.get(channels->first, channels->second);
+ float const gain = _map.get(channels->first.index, channels->second.index);
if (gain == 0) {
s = wxString::Format (
_("No audio will be passed from %s channel '%s' to %s channel '%s'."),
_from,
- safe_input_channel_name(channels->first),
+ input_channel_name_with_group(channels->first),
_to,
- safe_output_channel_name(channels->second)
+ std_to_wx(channels->second.name)
);
} else if (gain == 1) {
s = wxString::Format (
_("Audio will be passed from %s channel %s to %s channel %s unaltered."),
_from,
- safe_input_channel_name(channels->first),
+ input_channel_name_with_group(channels->first),
_to,
- safe_output_channel_name(channels->second)
+ std_to_wx(channels->second.name)
);
} else {
float const dB = linear_to_db(gain);
s = wxString::Format (
_("Audio will be passed from %s channel %s to %s channel %s with gain %.1fdB."),
_from,
- safe_input_channel_name(channels->first),
+ input_channel_name_with_group(channels->first),
_to,
- safe_output_channel_name(channels->second),
+ std_to_wx(channels->second.name),
dB
);
}
projects / dcpomatic.git / blobdiff