Added a new transcoding mode: transcode if and only if the format is not handled by the browser. Made the subsonic API configurable again in conf file. Moved the subsonic's artist list mode in the per-user settings page. fixes #46

src/libs/database/impl/User.cpp

@@ -70,28 +70,11 @@ AuthToken::getByValue(Session& session, const std::string& value)
 static const std::string playedListName {"__played_tracks__"};
 static const std::string queuedListName {"__queued_tracks__"};
 
-const std::set<Bitrate>
-User::audioTranscodeAllowedBitrates =
-{
-	64000,
-	96000,
-	128000,
-	192000,
-	320000,
-};
-
-User::User()
-: _maxAudioTranscodeBitrate {static_cast<int>(*audioTranscodeAllowedBitrates.rbegin())}
-{
-
-}
-
 User::User(const std::string& loginName, const PasswordHash& passwordHash)
-: User()
+: _loginName {loginName}
+, _passwordSalt {passwordHash.salt}
+, _passwordHash {passwordHash.hash}
 {
-	_loginName = loginName;
-	_passwordHash = passwordHash.hash;
-	_passwordSalt  = passwordHash.salt;
 }
 
 std::vector<User::pointer>
@@ -141,27 +124,10 @@ User::getByLoginName(Session& session, const std::string& name)
 }
 
 void
-User::setAudioTranscodeBitrate(Bitrate bitrate)
+User::setSubsonicTranscodeBitrate(Bitrate bitrate)
 {
-	_audioTranscodeBitrate = std::min(bitrate, static_cast<Bitrate>(_maxAudioTranscodeBitrate));
-}
-
-void
-User::setMaxAudioTranscodeBitrate(Bitrate requestedBitrate)
-{
-	Bitrate bitrate {*audioTranscodeAllowedBitrates.begin()};
-
-	for (auto allowedBitrate : audioTranscodeAllowedBitrates)
-	{
-		if (requestedBitrate < allowedBitrate)
-			break;
-
-		bitrate = allowedBitrate;
-	}
-
-	_maxAudioTranscodeBitrate = bitrate;
-	if (_audioTranscodeBitrate > _maxAudioTranscodeBitrate)
-		_audioTranscodeBitrate = _maxAudioTranscodeBitrate;
+	assert(audioTranscodeAllowedBitrates.find(bitrate) != audioTranscodeAllowedBitrates.cend());
+	_subsonicTranscodeBitrate = bitrate;
 }
 
 void
@@ -170,18 +136,6 @@ User::clearAuthTokens()
 	_authTokens.clear();
 }
 
-Bitrate
-User::getAudioTranscodeBitrate(void) const
-{
-	return _audioTranscodeBitrate;
-}
-
-std::size_t
-User::getMaxAudioTranscodeBitrate(void) const
-{
-	return _maxAudioTranscodeBitrate;
-}
-
 Wt::Dbo::ptr<TrackList>
 User::getPlayedTrackList(Session& session) const
 {
@@ -283,16 +237,6 @@ User::getStarredTracks() const
 	return std::vector<Wt::Dbo::ptr<Track>>(_starredTracks.begin(), _starredTracks.end());
 }
 
-
-bool
-User::checkBitrate(Database::Bitrate bitrate) const
-{
-	if (audioTranscodeAllowedBitrates.find(bitrate) == std::cend(audioTranscodeAllowedBitrates))
-		return false;
-
-	return static_cast<Bitrate>(_maxAudioTranscodeBitrate) >= bitrate;
-}
-
 } // namespace Database