MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'stable' into develop

Browse Source 
Conflicts:
	CHANGELOG.md
	INSTALL.md
	libresonic-assembly/pom.xml
	libresonic-booter/pom.xml
	libresonic-booter/src/main/resources/images/libresonic-512.png
	libresonic-installer-debian/pom.xml
	libresonic-installer-mac/pom.xml
	libresonic-installer-rpm/pom.xml
	libresonic-installer-windows/pom.xml
	libresonic-main/pom.xml
	libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema62.java
	libresonic-main/src/main/resources/org/libresonic/player/service/logo-512.png
	libresonic-main/src/main/webapp/icons/buuftheme/logo.png
	libresonic-main/src/main/webapp/icons/coolandclean/logo.png
	libresonic-main/src/main/webapp/icons/default_dark/logo_light.png
	libresonic-main/src/main/webapp/icons/default_light/logo.png
	libresonic-main/src/main/webapp/icons/denim/logo_light.png
	libresonic-main/src/main/webapp/icons/groove/logo.png
	libresonic-main/src/main/webapp/icons/hicon/logo.png
	libresonic-main/src/main/webapp/icons/hiconi/logo_light.png
	libresonic-main/src/main/webapp/icons/hitech/logo_light.png
	libresonic-main/src/main/webapp/icons/midnightfun/logo.png
	libresonic-main/src/main/webapp/icons/monochrome/logo.png
	libresonic-main/src/main/webapp/icons/monochrome/logo_light.png
	libresonic-main/src/main/webapp/icons/pinkpanther/logo_light.png
	libresonic-main/src/main/webapp/icons/simplify/logo_light.png
	libresonic-main/src/main/webapp/icons/slick/logo_light.png
	libresonic-main/src/main/webapp/icons/sonic/logo.png
	libresonic-main/src/main/webapp/icons/sonic_blue/logo_light.png
	libresonic-main/src/main/webapp/icons/sonic_white/logo.png
	libresonic-main/src/main/webapp/icons/subStandard/logo_light.png
	libresonic-rest-api/pom.xml
	libresonic-sonos-api/pom.xml
	pom.xml
This commit is contained in:
Andrew DeMaria
2017-03-22 19:47:57 -06:00
parent a7be3743b1 9c5cb78cdf
commit a12bdd6e0a
9 changed files with 352 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java
+9
View File
@@ -134,6 +134,15 @@ public class StreamController {
return null;
}
// Update the index of the currently playing media file. At
// this point we haven't yet modified the play queue to support
// multiple streams, so the current play queue is the real one.
int currentIndex = player.getPlayQueue().getFiles().indexOf(file);
player.getPlayQueue().setIndex(currentIndex);
// Create a new, fake play queue that only contains the
// currently playing media file, in case multiple streams want
// to use the same player.
PlayQueue playQueue = new PlayQueue();
playQueue.addFiles(true, file);
player.setPlayQueue(playQueue);