fix: lint
This commit is contained in:
parent
31e4c9023e
commit
fc632f50ec
|
@ -83,7 +83,9 @@ Mpris::Mpris(const std::string& id, const Json::Value& config)
|
||||||
// "dynamic-priority" has been kept for backward compatibility
|
// "dynamic-priority" has been kept for backward compatibility
|
||||||
if (config_["dynamic-importance-order"].isArray() || config_["dynamic-priority"].isArray()) {
|
if (config_["dynamic-importance-order"].isArray() || config_["dynamic-priority"].isArray()) {
|
||||||
dynamic_prio_.clear();
|
dynamic_prio_.clear();
|
||||||
const auto& dynamic_priority = config_["dynamic-importance-order"].isArray() ? config_["dynamic-importance-order"] : config_["dynamic-priority"];
|
const auto& dynamic_priority = config_["dynamic-importance-order"].isArray()
|
||||||
|
? config_["dynamic-importance-order"]
|
||||||
|
: config_["dynamic-priority"];
|
||||||
for (const auto& value : dynamic_priority) {
|
for (const auto& value : dynamic_priority) {
|
||||||
if (value.isString()) {
|
if (value.isString()) {
|
||||||
dynamic_prio_.push_back(value.asString());
|
dynamic_prio_.push_back(value.asString());
|
||||||
|
@ -361,12 +363,9 @@ auto Mpris::getDynamicStr(const PlayerInfo& info, bool truncated, bool html) ->
|
||||||
std::string previousOrder = "";
|
std::string previousOrder = "";
|
||||||
|
|
||||||
for (const std::string& order : dynamic_order_) {
|
for (const std::string& order : dynamic_order_) {
|
||||||
if ((order == "artist" && showArtist) ||
|
if ((order == "artist" && showArtist) || (order == "album" && showAlbum) ||
|
||||||
(order == "album" && showAlbum) ||
|
|
||||||
(order == "title" && showTitle)) {
|
(order == "title" && showTitle)) {
|
||||||
if (previousShown &&
|
if (previousShown && previousOrder != "length" && previousOrder != "position") {
|
||||||
previousOrder != "length" &&
|
|
||||||
previousOrder != "position") {
|
|
||||||
dynamic << dynamic_separator_;
|
dynamic << dynamic_separator_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue