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
master
Andrew DeMaria 8 years ago
parent a7be3743b1 9c5cb78cdf
commit a12bdd6e0a
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
9 changed files with 352 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      CHANGELOG.md
  2. 5
      README.md
  3. 77
      contrib/assets/logo-square_dark.svg
  4. 77
      contrib/assets/logo-square_light.svg
  5. 88
      contrib/assets/logo_dark.svg
  6. 90
      contrib/assets/logo_light.svg
  7. BIN
      contrib/assets/screenshot.jpg
  8. 6
      documentation/FreeBSD-FreeNAS-Install.md
  9. 9
      libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java

6
CHANGELOG.md
Unescape View File

@ -3,7 +3,6 @@
# Libresonic/libresonic # Libresonic/libresonic
# --> # -->
v6.2.beta1 v6.2.beta1
---------- ----------
@ -15,6 +14,11 @@ v6.2.beta1
* Add a demo site * Add a demo site
* Tests and bugfixes and documentation, oh my! * Tests and bugfixes and documentation, oh my!
v6.1
----
* First real stable release!
v6.1.beta2 v6.1.beta2
-------- --------

5
README.md
Unescape View File

@ -8,7 +8,7 @@ Libresonic
What is 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. 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. Based on Java technology, Libresonic runs on most platforms, including Windows, Mac, Linux and Unix variants.
![Screenshot](contrib/assets/screenshot.jpg)
History History
----- -----
@ -32,7 +33,7 @@ Libresonic will strive to maintain compatibility and stability for Subsonic user
License 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). 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).

77
contrib/assets/logo-square_dark.svg
Unescape View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="512"
height="512"
viewBox="0 0 135.46666 135.46667"
id="svg2"
version="1.1"
inkscape:version="0.91+devel+osxmenu r12922"
sodipodi:docname="logo512-dark.svg"
inkscape:export-filename="/Users/tiago/Pictures/libresonic/logo.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.77279412"
inkscape:cx="-128.02569"
inkscape:cy="233.04091"
inkscape:document-units="mm"
inkscape:current-layer="g4227"
showgrid="false"
units="px"
inkscape:window-width="1440"
inkscape:window-height="851"
inkscape:window-x="0"
inkscape:window-y="23"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-161.53332)">
<g
id="g4227"
transform="matrix(0.96843103,0,0,0.96843103,-0.28304865,8.7068755)">
<text
sodipodi:linespacing="125%"
id="text4168"
y="251.3284"
x="45.718079"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:15.54632759px;line-height:125%;font-family:'DIN Condensed';-inkscape-font-specification:'DIN Condensed, Bold Condensed';letter-spacing:0px;word-spacing:0px;fill:#2d2d2d;fill-opacity:1;stroke:none;stroke-width:0.38865817px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:77.05491638px;fill:#000000;fill-opacity:1;stroke-width:0.38865817px"
y="251.3284"
x="45.718079"
id="tspan4170"
sodipodi:role="line">)))</tspan></text>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

77
contrib/assets/logo-square_light.svg
Unescape View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="512"
height="512"
viewBox="0 0 135.46666 135.46667"
id="svg2"
version="1.1"
inkscape:version="0.91+devel+osxmenu r12922"
sodipodi:docname="logo512-light.svg"
inkscape:export-filename="/Users/tiago/Pictures/libresonic/logo512-dark.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.77279412"
inkscape:cx="-128.02569"
inkscape:cy="233.04091"
inkscape:document-units="mm"
inkscape:current-layer="g4227"
showgrid="false"
units="px"
inkscape:window-width="1440"
inkscape:window-height="851"
inkscape:window-x="0"
inkscape:window-y="23"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-161.53332)">
<g
id="g4227"
transform="matrix(0.96843103,0,0,0.96843103,-0.28304865,8.7068755)">
<text
sodipodi:linespacing="125%"
id="text4168"
y="251.3284"
x="45.718079"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:15.54632759px;line-height:125%;font-family:'DIN Condensed';-inkscape-font-specification:'DIN Condensed, Bold Condensed';letter-spacing:0px;word-spacing:0px;fill:#2d2d2d;fill-opacity:1;stroke:none;stroke-width:0.38865817px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="font-size:77.05491638px;fill:#ffffff;fill-opacity:1;stroke-width:0.38865817px"
y="251.3284"
x="45.718079"
id="tspan4170"
sodipodi:role="line">)))</tspan></text>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

88
contrib/assets/logo_dark.svg
Unescape View File

@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="170"
height="52"
viewBox="0 0 44.979166 13.758334"
id="svg2"
version="1.1"
inkscape:version="0.91+devel+osxmenu r12922"
sodipodi:docname="logo-dark.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.0911765"
inkscape:cx="79.338725"
inkscape:cy="26"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1440"
inkscape:window-height="851"
inkscape:window-x="0"
inkscape:window-y="23"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-283.24165)">
<g
id="g4227"
transform="matrix(0.96843103,0,0,0.96843103,-0.48055547,8.7068755)">
<text
sodipodi:linespacing="125%"
id="text3336"
y="294.32339"
x="2.9642951"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:10.58333302px;line-height:125%;font-family:'DIN Condensed';-inkscape-font-specification:'DIN Condensed, Bold Condensed';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="stroke-width:0.26458332px"
y="294.32339"
x="2.9642951"
id="tspan3338"
sodipodi:role="line"><tspan
id="tspan3351"
style="fill:#2f7bd9;fill-opacity:1">libre</tspan>sonic</tspan></text>
<text
sodipodi:linespacing="125%"
id="text4168"
y="293.82599"
x="37.559322"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:10.58333302px;line-height:125%;font-family:'DIN Condensed';-inkscape-font-specification:'DIN Condensed, Bold Condensed';letter-spacing:0px;word-spacing:0px;fill:#2d2d2d;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="fill:#000000;fill-opacity:1;stroke-width:0.26458332px"
y="293.82599"
x="37.559322"
id="tspan4170"
sodipodi:role="line">)))</tspan></text>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

90
contrib/assets/logo_light.svg
Unescape View File

@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="170"
height="52"
viewBox="0 0 44.979166 13.758334"
id="svg2"
version="1.1"
inkscape:version="0.91+devel+osxmenu r12922"
sodipodi:docname="logo-light.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.0911765"
inkscape:cx="79.338725"
inkscape:cy="26"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:window-width="1440"
inkscape:window-height="851"
inkscape:window-x="0"
inkscape:window-y="23"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-283.24165)">
<g
id="g4227"
transform="matrix(0.96843103,0,0,0.96843103,-0.48055547,8.7068755)">
<text
sodipodi:linespacing="125%"
id="text3336"
y="294.32339"
x="2.9642951"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:10.58333302px;line-height:125%;font-family:'DIN Condensed';-inkscape-font-specification:'DIN Condensed, Bold Condensed';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="stroke-width:0.26458332px"
y="294.32339"
x="2.9642951"
id="tspan3338"
sodipodi:role="line"><tspan
id="tspan3351"
style="fill:#2f7bd9;fill-opacity:1">libre</tspan><tspan
style="fill:#ffffff"
id="tspan4723">sonic</tspan></tspan></text>
<text
sodipodi:linespacing="125%"
id="text4168"
y="293.82599"
x="37.559322"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:10.58333302px;line-height:125%;font-family:'DIN Condensed';-inkscape-font-specification:'DIN Condensed, Bold Condensed';letter-spacing:0px;word-spacing:0px;fill:#2d2d2d;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
style="fill:#ffffff;fill-opacity:1;stroke-width:0.26458332px"
y="293.82599"
x="37.559322"
id="tspan4170"
sodipodi:role="line">)))</tspan></text>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
contrib/assets/screenshot.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 183 KiB

6
documentation/FreeBSD-FreeNAS-Install.md
Unescape View File

@ -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 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 ### 6. Navigate to Libresonic
In a browser. Take your server IP address and port and append the the context path from above 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 ### 7. Log into Libresonic

9
libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java
Unescape View File

@ -134,6 +134,15 @@ public class StreamController {
return null; 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 playQueue = new PlayQueue();
playQueue.addFiles(true, file); playQueue.addFiles(true, file);
player.setPlayQueue(playQueue); player.setPlayQueue(playQueue);

Write Preview
Loading…
Cancel
Save