fix visual focus indication in IOSelector; import pays attention to audio file embedd...

[ardour.git] / libs / ardour / ardour / configuration_variable.h

diff --git a/libs/ardour/ardour/configuration_variable.h b/libs/ardour/ardour/configuration_variable.h
index 4eba3101a230ec8d10696532f6a50bc62370edbd..6f0a8a35718ff80a3002a98b488ffba8369316fc 100644 (file)
--- a/libs/ardour/ardour/configuration_variable.h
+++ b/libs/ardour/ardour/configuration_variable.h
@@ -11,11 +11,11 @@ namespace ARDOUR {
 class ConfigVariableBase {
   public:
        enum Owner {
-               Default,
-               System,
-               Config,
-               Session,
-               Interface
+               Default = 0x1,
+               System = 0x2,
+               Config = 0x4,
+               Session = 0x8,
+               Interface = 0x10
        };
 
        ConfigVariableBase (std::string str) : _name (str), _owner (Default) {}
@@ -44,7 +44,7 @@ class ConfigVariable : public ConfigVariableBase
                        return false;
                }
                value = val;
-               _owner = owner;
+               _owner = (ConfigVariableBase::Owner)(_owner |owner);
                return true;
        }
 
@@ -85,7 +85,7 @@ class ConfigVariable : public ConfigVariableBase
                                                                std::stringstream ss;
                                                                ss << prop->value();
                                                                ss >> value;
-                                                               _owner = owner;
+                                                               _owner = (ConfigVariableBase::Owner)(_owner |owner);
                                                                return true;
                                                        }
                                                }
@@ -113,7 +113,7 @@ class ConfigVariable : public ConfigVariableBase
                                                std::stringstream ss;
                                                ss << opt_prop->value();
                                                ss >> value;
-                                               _owner = owner;
+                                               _owner = (ConfigVariableBase::Owner)(_owner |owner);
                                                return true;
                                        }
                                }