diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-08 15:43:32 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-08 15:43:32 -0400 |
| commit | f7b140b9184a918c25aff82fb557d1ad51495230 (patch) | |
| tree | d7f9f01b9c61a28ee1f0a92e085b11a6b6abef1c | |
| parent | 741154e6913114fdbc9c372e0e8bad76f40d36fb (diff) | |
final fixes for somewhat botched merge with master
| -rw-r--r-- | gtk2_ardour/generic_pluginui.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/level_meter.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 971dfc0e9b..0d5b6a48c4 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -679,8 +679,8 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat 0xcccc00ff, 0xcccc00ff, 0xffaa00ff, 0xffaa00ff, 0xff0000ff, - ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get(), - ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get() + ARDOUR_UI::config()->get_canvasvar_MeterBackgroundBot(), + ARDOUR_UI::config()->get_canvasvar_MeterBackgroundTop() ); info->min_unbound = desc.min_unbound; diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index c389fe0778..255b499f0d 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -267,8 +267,8 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width) uint32_t b[4]; float stp[4]; int styleflags = Config->get_meter_style_led() ? 3 : 1; - b[0] = ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get(); - b[1] = ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get(); + b[0] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundBot(); + b[1] = ARDOUR_UI::config()->get_canvasvar_MeterBackgroundTop(); b[2] = 0x991122ff; // red highlight gradient Bot b[3] = 0x551111ff; // red highlight gradient Top if (n < nmidi) { |