diff options
Diffstat (limited to 'rotord/src/rotor.h')
| -rwxr-xr-x | rotord/src/rotor.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h index b504e5f..310809f 100755 --- a/rotord/src/rotor.h +++ b/rotord/src/rotor.h @@ -85,9 +85,9 @@ namespace Rotor { b=(c&0xFF0000)>>16; } Colour(std::string s){ - r=(uint8_t)ofHexToChar(s.substr(0,2)); - g=(uint8_t)ofHexToChar(s.substr(2,2)); - b=(uint8_t)ofHexToChar(s.substr(4,2)); + r=(uint8_t)hexToChar(s.substr(0,2)); + g=(uint8_t)hexToChar(s.substr(2,2)); + b=(uint8_t)hexToChar(s.substr(4,2)); } float Rfloat(){ return ((float)r)/255.0f; @@ -193,8 +193,8 @@ namespace Rotor { string title; bool duplicate_inputs; string find_setting(map<string,string> &settings,string key,string def=""){ if (settings.find(key)!=settings.end()) return settings[key]; else return def;}; - float find_setting(map<string,string> &settings,string key,float def){ if (settings.find(key)!=settings.end()) return ofToFloat(settings[key]); else return def;}; - int find_setting(map<string,string> &settings,string key,int def){ if (settings.find(key)!=settings.end()) return ofToInt(settings[key]); else return def;}; + float find_setting(map<string,string> &settings,string key,float def){ if (settings.find(key)!=settings.end()) return toFloat(settings[key]); else return def;}; + int find_setting(map<string,string> &settings,string key,int def){ if (settings.find(key)!=settings.end()) return toInt(settings[key]); else return def;}; void base_settings(map<string,string> &settings) { description=find_setting(settings,"description"); type=find_setting(settings,"type"); @@ -219,7 +219,7 @@ namespace Rotor { } } void set_parameter(const std::string &key,const std::string &value){ - if (parameters.find(key)!=parameters.end()) parameters[key]->value=ofToFloat(value); + if (parameters.find(key)!=parameters.end()) parameters[key]->value=toFloat(value); }; }; class Signal_node: public Node{ |