|
|
|
@ -28,8 +28,6 @@ import org.airsonic.player.service.*; |
|
|
|
|
import org.airsonic.player.service.PlaylistService; |
|
|
|
|
import org.airsonic.player.util.StringUtil; |
|
|
|
|
import org.directwebremoting.WebContextFactory; |
|
|
|
|
import org.slf4j.Logger; |
|
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
import org.springframework.web.servlet.support.RequestContextUtils; |
|
|
|
@ -82,8 +80,6 @@ public class PlayQueueService { |
|
|
|
|
@Autowired |
|
|
|
|
private InternetRadioService internetRadioService; |
|
|
|
|
|
|
|
|
|
private static final Logger LOG = LoggerFactory.getLogger(PlayQueueService.class); |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Returns the play queue for the player of the current user. |
|
|
|
|
* |
|
|
|
@ -382,7 +378,6 @@ public class PlayQueueService { |
|
|
|
|
HttpServletRequest request = WebContextFactory.get().getHttpServletRequest(); |
|
|
|
|
HttpServletResponse response = WebContextFactory.get().getHttpServletResponse(); |
|
|
|
|
String username = securityService.getCurrentUsername(request); |
|
|
|
|
UserSettings userSettings = settingsService.getUserSettings(securityService.getCurrentUsername(request)); |
|
|
|
|
|
|
|
|
|
MusicFolder selectedMusicFolder = settingsService.getSelectedMusicFolder(username); |
|
|
|
|
List<MusicFolder> musicFolders = settingsService.getMusicFoldersForUser(username, |
|
|
|
@ -664,8 +659,6 @@ public class PlayQueueService { |
|
|
|
|
|
|
|
|
|
private PlayQueueInfo convert(HttpServletRequest request, Player player, boolean serverSidePlaylist, int offset) { |
|
|
|
|
|
|
|
|
|
String url = NetworkService.getBaseUrl(request); |
|
|
|
|
Locale locale = RequestContextUtils.getLocale(request); |
|
|
|
|
PlayQueue playQueue = player.getPlayQueue(); |
|
|
|
|
|
|
|
|
|
List<PlayQueueInfo.Entry> entries; |
|
|
|
|