ardour/livetrax
13
0
Fork 0
Code

Partially revert commit #23feb0491e

Browse Source 
For MSVC, the 'using std::' statements are needed when building anything which #includes 'pbd/controllable.h' (never quite figured out why...)
This commit is contained in:
John Emmas 2020-06-18 12:46:05 +01:00
parent aa564efa86
commit 3b5546cfce
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/pbd/pbd/controllable.h
View File

@ -34,6 +34,9 @@
#include "pbd/statefuldestructible.h" #include "pbd/statefuldestructible.h"
using std::min;
using std::max;
class XMLNode; class XMLNode;
namespace PBD { namespace PBD {
@ -132,7 +135,7 @@ public:
virtual float get_interface(bool rotary=false) const { return (internal_to_interface(get_value(), rotary)); } virtual float get_interface(bool rotary=false) const { return (internal_to_interface(get_value(), rotary)); }
virtual void set_interface (float fraction, bool rotary=false, GroupControlDisposition gcd = NoGroup) { virtual void set_interface (float fraction, bool rotary=false, GroupControlDisposition gcd = NoGroup) {
fraction = std::min (std::max (0.0f, fraction), 1.0f); fraction = min (max (0.0f, fraction), 1.0f);
set_value (interface_to_internal (fraction, rotary), gcd); set_value (interface_to_internal (fraction, rotary), gcd);
} }