smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 20:55:48 +01:00
Code Issues Projects Releases Wiki Activity

NO-OP: Plugin Tag/Status indent and const'ness

Browse source
This commit is contained in:
Robin Gareus 2020-06-24 02:33:00 +02:00
parent 2ca1f55d6b
commit 40aac796e9
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

74
libs/ardour/ardour/plugin_manager.h
View file

@ -82,12 +82,10 @@ public:
};
std::string user_plugin_metadata_dir () const;
void load_statuses ();
void save_statuses ();
void set_status (ARDOUR::PluginType type, std::string unique_id, PluginStatusType status);
PluginStatusType get_status (const PluginInfoPtr&) const;
void load_tags ();
void save_tags ();
bool load_plugin_order_file (XMLNode &n) const; //returns TRUE if the passed-in node has valid info
@ -123,56 +121,53 @@ public:
private:
struct PluginTag {
ARDOUR::PluginType type;
std::string unique_id;
std::string tags;
std::string name;
TagType tagtype;
PluginType const type;
std::string const unique_id;
std::string const name;
std::string tags;
TagType tagtype;
PluginTag (ARDOUR::PluginType t, std::string id, std::string tag, std::string n, TagType tt)
: type (t), unique_id (id), tags (tag), name(n), tagtype (tt) {}
PluginTag (ARDOUR::PluginType t, std::string const& id, std::string const& tag, std::string const& n, TagType tt)
: type (t), unique_id (id), name(n), tags (tag), tagtype (tt) {}
bool operator== (PluginTag const& other) const {
return other.type == type && other.unique_id == unique_id;
}
bool operator< (PluginTag const& other) const {
if (other.type < type) {
return true;
} else if (other.type == type && other.unique_id < unique_id) {
return true;
if (other.type == type) {
return other.unique_id < unique_id;
}
return false;
return other.type < type;
}
};
struct PluginStatus {
PluginType const type;
std::string const unique_id;
PluginStatusType const status;
PluginStatus (ARDOUR::PluginType t, std::string const& id, PluginStatusType s = Normal)
: type (t), unique_id (id), status (s) {}
bool operator==(const PluginStatus& other) const {
return other.type == type && other.unique_id == unique_id;
}
bool operator<(const PluginStatus& other) const {
if (other.type == type) {
return other.unique_id < unique_id;
}
return other.type < type;
}
};
typedef std::set<PluginTag> PluginTagList;
PluginTagList ptags;
PluginTagList ftags; /* factory-file defaults */
std::string sanitize_tag (const std::string) const;
struct PluginStatus {
ARDOUR::PluginType type;
std::string unique_id;
PluginStatusType status;
PluginStatus (ARDOUR::PluginType t, std::string id, PluginStatusType s = Normal)
: type (t), unique_id (id), status (s) {}
bool operator==(const PluginStatus& other) const {
return other.type == type && other.unique_id == unique_id;
}
bool operator<(const PluginStatus& other) const {
if (other.type < type) {
return true;
} else if (other.type == type && other.unique_id < unique_id) {
return true;
}
return false;
}
};
typedef std::set<PluginStatus> PluginStatusList;
PluginStatusList statuses;
@ -196,6 +191,11 @@ private:
void detect_name_ambiguities (ARDOUR::PluginInfoList*);
void detect_type_ambiguities (ARDOUR::PluginInfoList&);
void load_statuses ();
void load_tags ();
std::string sanitize_tag (const std::string) const;
void ladspa_refresh ();
void lua_refresh ();
void lua_refresh_cb ();

3
libs/ardour/plugin_manager.cc
View file

@ -1784,7 +1784,8 @@ PluginManager::reset_tags (PluginInfoPtr const& pi)
PluginTagList::const_iterator j = find (ftags.begin(), ftags.end(), ps);
if (j != ftags.end()) {
ps = *j;
ps.tags = j->tags;
ps.tagtype = j->tagtype;
}
PluginTagList::const_iterator i = find (ptags.begin(), ptags.end(), ps);