diff options
| author | Robin Gareus <robin@gareus.org> | 2014-06-25 21:03:47 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-06-25 21:47:54 +0200 |
| commit | 1bd4e448defb93c879bf25167cf42b6d8534eb73 (patch) | |
| tree | 82621fe56dfc74aa5f97bef1138b78062617f806 /gtk2_ardour | |
| parent | 4da2fadb9e9ea273593064ab140beccfdaa30d31 (diff) | |
namespace libardour utils
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 2 | ||||
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/session_dialog.h | 2 | ||||
| -rw-r--r-- | gtk2_ardour/volume_controller.cc | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index dfb2b72a1e..1c637a436d 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -507,7 +507,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr struct RecentSessionsSorter { bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const { - return cmp_nocase(a.first, b.first) == -1; + return ARDOUR::cmp_nocase(a.first, b.first) == -1; } }; diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 3da4dca38e..b50a1ffd60 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -1294,7 +1294,7 @@ EngineControl::set_state (const XMLNode& root) state->midi_devices.clear(); XMLNode* midinode; - if ((midinode = find_named_node (*grandchild, "MIDIDevices")) != 0) { + if ((midinode = ARDOUR::find_named_node (*grandchild, "MIDIDevices")) != 0) { const XMLNodeList mnc = midinode->children(); for (XMLNodeList::const_iterator n = mnc.begin(); n != mnc.end(); ++n) { if ((*n)->property (X_("name")) == 0 diff --git a/gtk2_ardour/session_dialog.h b/gtk2_ardour/session_dialog.h index 2178cfbe73..ef3717b778 100644 --- a/gtk2_ardour/session_dialog.h +++ b/gtk2_ardour/session_dialog.h @@ -104,7 +104,7 @@ class SessionDialog : public ArdourDialog { struct RecentSessionsSorter { bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const { - return cmp_nocase(a.first, b.first) == -1; + return ARDOUR::cmp_nocase(a.first, b.first) == -1; } }; diff --git a/gtk2_ardour/volume_controller.cc b/gtk2_ardour/volume_controller.cc index 6db3bc7d7a..007b623355 100644 --- a/gtk2_ardour/volume_controller.cc +++ b/gtk2_ardour/volume_controller.cc @@ -116,7 +116,7 @@ VolumeController::to_control_value (double display_value) if (_linear) { v = _controllable->lower() + ((_controllable->upper() - _controllable->lower()) * display_value); } else { - v = slider_position_to_gain_with_max (display_value, ARDOUR::Config->get_max_gain()); + v = ARDOUR::slider_position_to_gain_with_max (display_value, ARDOUR::Config->get_max_gain()); } return v; @@ -130,7 +130,7 @@ VolumeController::to_display_value (double control_value) if (_linear) { v = (control_value - _controllable->lower ()) / (_controllable->upper() - _controllable->lower()); } else { - v = gain_to_slider_position_with_max (control_value, _controllable->upper()); + v = ARDOUR::gain_to_slider_position_with_max (control_value, _controllable->upper()); } return v; @@ -151,13 +151,13 @@ VolumeController::adjust (double control_delta) */ #if 0 /* convert to linear/fractional slider position domain */ - v = gain_to_slider_position_with_max (_controllable->get_value (), _controllable->upper()); + v = ARDOUR::gain_to_slider_position_with_max (_controllable->get_value (), _controllable->upper()); /* increment in this domain */ v += control_delta; /* clamp to appropriate range for linear/fractional slider domain */ v = std::max (0.0, std::min (1.0, v)); /* convert back to gain coefficient domain */ - v = slider_position_to_gain_with_max (v, _controllable->upper()); + v = ARDOUR::slider_position_to_gain_with_max (v, _controllable->upper()); /* clamp in controller domain */ v = std::max (_controllable->lower(), std::min (_controllable->upper(), v)); /* convert to dB domain */ |