Subsonic API: added replayGain field in Song
This commit is contained in:
@@ -16,6 +16,7 @@ add_library(lmssubsonic SHARED
|
|||||||
impl/responses/DiscTitle.cpp
|
impl/responses/DiscTitle.cpp
|
||||||
impl/responses/Genre.cpp
|
impl/responses/Genre.cpp
|
||||||
impl/responses/Playlist.cpp
|
impl/responses/Playlist.cpp
|
||||||
|
impl/responses/ReplayGain.cpp
|
||||||
impl/responses/Song.cpp
|
impl/responses/Song.cpp
|
||||||
impl/responses/User.cpp
|
impl/responses/User.cpp
|
||||||
impl/ProtocolVersion.cpp
|
impl/ProtocolVersion.cpp
|
||||||
|
|||||||
@@ -195,6 +195,8 @@ namespace API::Subsonic
|
|||||||
res.put("<xmlattr>." + itAttribute.first, std::get<std::string>(itAttribute.second));
|
res.put("<xmlattr>." + itAttribute.first, std::get<std::string>(itAttribute.second));
|
||||||
else if (std::holds_alternative<bool>(itAttribute.second))
|
else if (std::holds_alternative<bool>(itAttribute.second))
|
||||||
res.put("<xmlattr>." + itAttribute.first, std::get<bool>(itAttribute.second));
|
res.put("<xmlattr>." + itAttribute.first, std::get<bool>(itAttribute.second));
|
||||||
|
else if (std::holds_alternative<float>(itAttribute.second))
|
||||||
|
res.put("<xmlattr>." + itAttribute.first, std::get<float>(itAttribute.second));
|
||||||
else if (std::holds_alternative<long long>(itAttribute.second))
|
else if (std::holds_alternative<long long>(itAttribute.second))
|
||||||
res.put("<xmlattr>." + itAttribute.first, std::get<long long>(itAttribute.second));
|
res.put("<xmlattr>." + itAttribute.first, std::get<long long>(itAttribute.second));
|
||||||
}
|
}
|
||||||
@@ -248,6 +250,8 @@ namespace API::Subsonic
|
|||||||
return Json::Value {std::get<std::string>(value)};
|
return Json::Value {std::get<std::string>(value)};
|
||||||
else if (std::holds_alternative<bool>(value))
|
else if (std::holds_alternative<bool>(value))
|
||||||
return Json::Value {std::get<bool>(value)};
|
return Json::Value {std::get<bool>(value)};
|
||||||
|
else if (std::holds_alternative<float>(value))
|
||||||
|
return Json::Value{ std::get<float>(value) };
|
||||||
else if (std::holds_alternative<long long>(value))
|
else if (std::holds_alternative<long long>(value))
|
||||||
return Json::Value {std::get<long long>(value)};
|
return Json::Value {std::get<long long>(value)};
|
||||||
|
|
||||||
|
|||||||
@@ -198,8 +198,12 @@ namespace API::Subsonic
|
|||||||
{
|
{
|
||||||
if constexpr (std::is_same<bool, T>::value)
|
if constexpr (std::is_same<bool, T>::value)
|
||||||
_attributes[std::string{ key }] = value;
|
_attributes[std::string{ key }] = value;
|
||||||
else
|
else if constexpr (std::is_floating_point<T>::value)
|
||||||
|
_attributes[std::string{ key }] = static_cast<float>(value);
|
||||||
|
else if constexpr (std::is_integral<T>::value)
|
||||||
_attributes[std::string{ key }] = static_cast<long long>(value);
|
_attributes[std::string{ key }] = static_cast<long long>(value);
|
||||||
|
else
|
||||||
|
static_assert("Unhandled type");
|
||||||
}
|
}
|
||||||
|
|
||||||
// A Node has either a single value or an array of values or some children
|
// A Node has either a single value or an array of values or some children
|
||||||
@@ -218,7 +222,7 @@ namespace API::Subsonic
|
|||||||
void setVersionAttribute(ProtocolVersion version);
|
void setVersionAttribute(ProtocolVersion version);
|
||||||
|
|
||||||
friend class Response;
|
friend class Response;
|
||||||
using ValueType = std::variant<std::string, bool, long long>;
|
using ValueType = std::variant<std::string, bool, float, long long>;
|
||||||
std::map<std::string, ValueType> _attributes;
|
std::map<std::string, ValueType> _attributes;
|
||||||
std::optional<ValueType> _value;
|
std::optional<ValueType> _value;
|
||||||
std::map<std::string, std::vector<Node>> _children;
|
std::map<std::string, std::vector<Node>> _children;
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 Emeric Poupon
|
||||||
|
*
|
||||||
|
* This file is part of LMS.
|
||||||
|
*
|
||||||
|
* LMS is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* LMS is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "responses/ReplayGain.hpp"
|
||||||
|
|
||||||
|
#include "services/database/Track.hpp"
|
||||||
|
|
||||||
|
namespace API::Subsonic
|
||||||
|
{
|
||||||
|
Response::Node createReplayGainNode(const Database::ObjectPtr<Database::Track>& track)
|
||||||
|
{
|
||||||
|
Response::Node replayGainNode;
|
||||||
|
|
||||||
|
if (const auto trackReplayGain{ track->getTrackReplayGain() })
|
||||||
|
replayGainNode.setAttribute("trackGain", *trackReplayGain);
|
||||||
|
|
||||||
|
if (const auto releaseReplayGain{ track->getReleaseReplayGain() })
|
||||||
|
replayGainNode.setAttribute("albumGain", *releaseReplayGain);
|
||||||
|
|
||||||
|
return replayGainNode;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 Emeric Poupon
|
||||||
|
*
|
||||||
|
* This file is part of LMS.
|
||||||
|
*
|
||||||
|
* LMS is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* LMS is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "services/database/Object.hpp"
|
||||||
|
#include "SubsonicResponse.hpp"
|
||||||
|
|
||||||
|
namespace Database
|
||||||
|
{
|
||||||
|
class Track;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace API::Subsonic
|
||||||
|
{
|
||||||
|
Response::Node createReplayGainNode(const Database::ObjectPtr<Database::Track>& track);
|
||||||
|
}
|
||||||
@@ -32,6 +32,7 @@
|
|||||||
#include "utils/String.hpp"
|
#include "utils/String.hpp"
|
||||||
#include "responses/Artist.hpp"
|
#include "responses/Artist.hpp"
|
||||||
#include "responses/Contributor.hpp"
|
#include "responses/Contributor.hpp"
|
||||||
|
#include "responses/ReplayGain.hpp"
|
||||||
#include "SubsonicId.hpp"
|
#include "SubsonicId.hpp"
|
||||||
#include "Utils.hpp"
|
#include "Utils.hpp"
|
||||||
|
|
||||||
@@ -217,6 +218,8 @@ namespace API::Subsonic
|
|||||||
addClusters("genres", "GENRE");
|
addClusters("genres", "GENRE");
|
||||||
addClusters("moods", "MOOD");
|
addClusters("moods", "MOOD");
|
||||||
|
|
||||||
|
trackResponse.addChild("replayGain", createReplayGainNode(track));
|
||||||
|
|
||||||
return trackResponse;
|
return trackResponse;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user