Merge remote-tracking branch 'origin/pr/1466'

master
Andrew DeMaria 5 years ago
commit 165701bcdc
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
  1. 4
      airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java
  2. 5
      airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java

@ -95,7 +95,9 @@ public class CoverArtController implements LastModified {
public long getLastModified(HttpServletRequest request) {
CoverArtRequest coverArtRequest = createCoverArtRequest(request);
// LOG.info("getLastModified - " + coverArtRequest + ": " + new Date(result));
if (null == coverArtRequest) {
return -1L;
}
return coverArtRequest.lastModified();
}

@ -2115,7 +2115,10 @@ public class SubsonicRESTController {
command.setShareRole(getBooleanParameter(request, "shareRole", u.isShareRole()));
int maxBitRate = getIntParameter(request, "maxBitRate", s.getTranscodeScheme().getMaxBitRate());
command.setTranscodeSchemeName(TranscodeScheme.fromMaxBitRate(maxBitRate).name());
TranscodeScheme transcodeScheme = TranscodeScheme.fromMaxBitRate(maxBitRate);
if (transcodeScheme != null) {
command.setTranscodeSchemeName(transcodeScheme.name());
}
if (hasParameter(request, "password")) {
command.setPassword(decrypt(getRequiredStringParameter(request, "password")));

Loading…
Cancel
Save