diff --git a/CHANGELOG.md b/CHANGELOG.md index 3819c473..2573354a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,6 @@ # Libresonic/libresonic # --> - v6.2.beta1 ---------- @@ -15,6 +14,11 @@ v6.2.beta1 * Add a demo site * Tests and bugfixes and documentation, oh my! +v6.1 +---- + + * First real stable release! + v6.1.beta2 -------- diff --git a/README.md b/README.md index dcba1301..85d58820 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Libresonic What is Libresonic? ----------------- -Libresonic is a free, web-based media streamer, providing ubiqutious access to your music. Use it to share your music with friends, or to listen to your own music while at work. You can stream to multiple players simultaneously, for instance to one player in your kitchen and another in your living room. +Libresonic is a free, web-based media streamer, providing ubiquitious access to your music. Use it to share your music with friends, or to listen to your own music while at work. You can stream to multiple players simultaneously, for instance to one player in your kitchen and another in your living room. Libresonic is designed to handle very large music collections (hundreds of gigabytes). Although optimized for MP3 streaming, it works for any audio or video format that can stream over HTTP, for instance AAC and OGG. By using transcoder plug-ins, Libresonic supports on-the-fly conversion and streaming of virtually any audio format, including WMA, FLAC, APE, Musepack, WavPack and Shorten. @@ -18,6 +18,7 @@ In addition to being a streaming media server, Libresonic works very well as a l Based on Java technology, Libresonic runs on most platforms, including Windows, Mac, Linux and Unix variants. +![Screenshot](contrib/assets/screenshot.jpg) History ----- @@ -32,7 +33,7 @@ Libresonic will strive to maintain compatibility and stability for Subsonic user License ------- -Libresonic is free software and licensed under the [GNU General Public License version 3](http://www.gnu.org/copyleft/gpl.html). The code in this repository(and associated binaries) are free of any "license key" or other restrictions. If you wish to thank the maintainer of this repository, please consider a donation to the [Electronic Frontier Foundation](https://supporters.eff.org/donate). +Libresonic is free software and licensed under the [GNU General Public License version 3](http://www.gnu.org/copyleft/gpl.html). The code in this repository (and associated binaries) are free of any "license key" or other restrictions. If you wish to thank the maintainer of this repository, please consider a donation to the [Electronic Frontier Foundation](https://supporters.eff.org/donate). The [Subsonic source code](https://github.com/Libresonic/subsonic-svn) was released under the GPLv3 through version 6.0-beta1. Beginning with 6.0-beta2, source is no longer provided. Binaries of Subsonic are only available under a commercial license. There is a [Subsonic Premium](http://www.subsonic.org/pages/premium.jsp) service which adds functionality not available in Libresonic. Subsonic also offers RPM, Deb, Exe, and other pre-built packages that Libresonic [currently does not](https://github.com/Libresonic/libresonic/issues/65). diff --git a/contrib/assets/logo-square_dark.svg b/contrib/assets/logo-square_dark.svg new file mode 100644 index 00000000..8d50152e --- /dev/null +++ b/contrib/assets/logo-square_dark.svg @@ -0,0 +1,77 @@ + + + + + + + + + + image/svg+xml + + + + + + + + ))) + + + diff --git a/contrib/assets/logo-square_light.svg b/contrib/assets/logo-square_light.svg new file mode 100644 index 00000000..f03dbb1d --- /dev/null +++ b/contrib/assets/logo-square_light.svg @@ -0,0 +1,77 @@ + + + + + + + + + + image/svg+xml + + + + + + + + ))) + + + diff --git a/contrib/assets/logo_dark.svg b/contrib/assets/logo_dark.svg new file mode 100644 index 00000000..8465bc6f --- /dev/null +++ b/contrib/assets/logo_dark.svg @@ -0,0 +1,88 @@ + + + + + + + + + + image/svg+xml + + + + + + + + libresonic + ))) + + + diff --git a/contrib/assets/logo_light.svg b/contrib/assets/logo_light.svg new file mode 100644 index 00000000..6ca0fd44 --- /dev/null +++ b/contrib/assets/logo_light.svg @@ -0,0 +1,90 @@ + + + + + + + + + + image/svg+xml + + + + + + + + libresonic + ))) + + + diff --git a/contrib/assets/screenshot.jpg b/contrib/assets/screenshot.jpg new file mode 100644 index 00000000..77be23fc Binary files /dev/null and b/contrib/assets/screenshot.jpg differ diff --git a/documentation/FreeBSD-FreeNAS-Install.md b/documentation/FreeBSD-FreeNAS-Install.md index d2960a73..0edaa6c2 100644 --- a/documentation/FreeBSD-FreeNAS-Install.md +++ b/documentation/FreeBSD-FreeNAS-Install.md @@ -66,15 +66,15 @@ Open a web browser and enter your servers IP address in the url bar followed by You should be greeted by the Apache Tomcat page. Click on the Manager App button on the right of the page and enter the username and password used in step 3. Default was username: admin and password: admin -Scroll down to Deploy and the subheading "WAR file to deploy" hit choose file and select the libresonic.war downloaded in the preamble. After selecting press the deploy button. Scroll up and press start. When the page refreshes a message "OK - Started application at context path /libresonic-v6.1.beta2" should be visible. +Scroll down to Deploy and the subheading "WAR file to deploy" hit choose file and select the libresonic.war downloaded in the preamble. After selecting press the deploy button. Scroll up and press start. When the page refreshes a message "OK - Started application at context path /libresonic-v6.1" should be visible. ### 6. Navigate to Libresonic In a browser. Take your server IP address and port and append the the context path from above -ie if the War deployed was called libresonic-v6.1.beta2.war navigate to: +ie if the War deployed was called libresonic-v6.1.war navigate to: - 10.0.0.10:8080/libresonic-v6.1.beta2/ + 10.0.0.10:8080/libresonic-v6.1/ ### 7. Log into Libresonic diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java index b6d84098..c429000d 100644 --- a/libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java +++ b/libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java @@ -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);