Make DLNA premium.

git-svn-id: https://svn.code.sf.net/p/subsonic/code/trunk@3772 104adb81-38d2-4886-885e-82898e39ce25
hamsterdog6 · Dec 8, 2013 · bc80585 · bc80585
1 parent 2cd2fbc
commit bc80585
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 40 deletions.
diff --git a/subsonic-android/assets/html/en/index.html b/subsonic-android/assets/html/en/index.html
@@ -34,6 +34,7 @@ <h3><img src="../img/subsonic.png" alt=""> Welcome to Subsonic</h3>
     <li>Video streaming.</li>
     <li>Podcast receiver.</li>
     <li>A personal web address for your Subsonic server (<em>yourname</em>.subsonic.org).</li>
+    <li>Play your media on compatible DLNA/UPnP devices.</li>
     <li>Share your media on Facebook, Twitter, Google+.</li>
     <li>No ads in the Subsonic web interface.</li>
     <li>Free access to new premium features.</li>

diff --git a/subsonic-main/TODO.TXT b/subsonic-main/TODO.TXT
@@ -3,6 +3,8 @@ DONE IN 4.9.beta3
 
 TODO IN 4.9
 --------------
+Add browser notification
+  http://www.paulund.co.uk/html5-notifications
 Make DLNA premium.
   Update doc
 Make DLNA video work.
@@ -36,13 +38,6 @@ Make more space available on forum server.
 Deal with backup server. Document procedure for swapping over. Invoice notice.
 Gradient background in top.jsp (similar to subsonic.org)
 Update screenshots
-From forum:
- - music track items are missing <upnp:albumArtURI>, thus will not show covers in most control points
- - duration attribute of <res> elements is not valid: for example "5:30" should be "0:05:30.000"
-DLNA
-  Playlist support
-  http://www.upnp-database.info/device.jsp
-  http://upnp.org/specs/av/UPnP-av-ContentDirectory-v1-Service.pdf
 Publish on Mac app store
 Shuffle play
 Dont use <div/>
@@ -53,14 +48,6 @@ Recently added broken
 https port 8080 redirect to 8443 (jetty?)
 REST: Add getSongs
   https://mail.google.com/mail/u/0/?tab=cm#inbox/13e240db8f93072b
-UPnP
-  DLNA
-    https://github.com/longkerdandy/chii2;cid=1358200757747-963
-    http://4thline.org/projects/mailinglists.html#nabble-td2188762
-    http://4thline.org/projects/mailinglists.html#nabble-td2165790
-  Test on Linux (alternative JDK)
-  Add controls for config
-make menu text more visible
 Clean up podcasts in demo
 Update backup server (after a couple of days)
 Publish blackberry app.
@@ -80,20 +67,6 @@ Samsung tv, new (3450) - Can browse and play music, haven't tested video
 Samsung tv, old (3450) - Can browse, but can't play music.
 PS3 (3450) - Can browse albums
 
-
-  AbstractMediaReceiverRegistrarService
-  MiniDLNA
-    http://minidlna.sourceforge.net/
-  http://4thline.org/projects/cling/
-  Use 2.0?
-  Fails to play nrk podcast.
-  Premium
-  https://github.com/jinzora/jinzora-upnp-bridge/tree/master/src/main
-  https://github.com/jinzora/jinzora-upnp-bridge/blob/master/src/main/java/org/jinzora/upnp/MediaServer.java
-  http://upnp.org/specs/av/UPnP-av-ContentDirectory-v1-Service.pdf
-  Intel UPnP Spy
-    http://software.intel.com/en-us/articles/intel-software-for-upnp-technology-download-tools/#anchor_2
-  SkatteFUNN
   DAAP support.
     https://mail.google.com/mail/u/0/?tab=cm#inbox/13a4690309e4d779
     http://www.activeobjects.no/subsonic/forum/viewtopic.php?t=976
@@ -112,7 +85,6 @@ Prefill minisub
 FLAC crashes Flash in Firefox (with server on Linux).
   http://forum.subsonic.org/forum/viewtopic.php?f=2&t=10027&p=44673#p44673
 
-
 Postponed:
   - Add "Force rescan" option.
   - Increase line height in playlist.jsp
@@ -155,7 +127,6 @@ Add "byteOffset" parameter as well.
 Add rating attributes to <directory> in getMusicDirectory.
 REST: add method to get everything in search index (binary, compressed)?
 
-Bookmark support (for audiobooks, podcasts)
 Stream from devices
   https://mail.google.com/mail/?shva=1#inbox/13352f77f870eba1
 Go through tracker.
@@ -178,8 +149,6 @@ Handle non-square cover art
 Cover arts not always aligned in grid
   https://mail.google.com/a/activeobjects.no/#inbox/12defd71c5d9e916
 Upgrade ffmpeg and support wtv.
-Add browser notification
-  http://www.activeobjects.no/subsonic/forum/viewtopic.php?t=5434&highlight=
 AdMob
 Show library statistics for video.
 Playing only first three seconds of podcast

diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_en.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_en.properties
@@ -641,11 +641,12 @@ premium.title = Subsonic Premium
 premium.invalidlicense = Invalid license key.
 premium.text = <p>Upgrade to Subsonic Premium to enjoy these extra features:</p> \
                     <ul> \
-                    <li><a href="http://subsonic.org/pages/apps.jsp" target="blank">Apps</a> for Android, iPhone and Windows Phone*.</li> \
-                    <li><a href="http://subsonic.org/pages/apps.jsp" target="blank">Apps</a> for BlackBerry, Roku, Mac, Windows, Chrome and more*.</li> \
+                    <li><a href="http://subsonic.org/pages/apps.jsp" target="blank">Apps</a> for Android, iPhone, Blackberry and Windows Phone*.</li> \
+                    <li><a href="http://subsonic.org/pages/apps.jsp" target="blank">Apps</a> for Mac, Windows, Chrome, Roku and many more*.</li> \
                     <li>Video streaming.</li> \
                     <li>Podcast receiver.</li> \
                     <li>Your personal server address: <em>yourname</em>.subsonic.org (see <a href="networkSettings.view">Settings &gt; Network</a>).</li> \
+                    <li>Play your media on compatible DLNA/UPnP devices.</li> \
                     <li>Share your media on Facebook, Twitter, Google+.</li> \
                     <li>No ads in the web interface.</li> \
                     <li>Other features to be released later.</li> \

diff --git a/subsonic-site/src/main/webapp/features.jsp b/subsonic-site/src/main/webapp/features.jsp
@@ -186,6 +186,7 @@
             <ul class="list">
                 <li>Download Podcasts with the integrated Podcast receiver.</li>
                 <li>Manage your internet TV and radio stations.</li>
+                <li>Play your media on compatible DLNA/UPnP devices.</li>
                 <li>Play music directly on the server's audio hardware using the <b>jukebox</b> mode.</li>
             </ul>
         </div>

diff --git a/subsonic-site/src/main/webapp/premium-column.jsp b/subsonic-site/src/main/webapp/premium-column.jsp
@@ -12,6 +12,7 @@
         <li><a href="apps.jsp">Apps</a> for Android, iPhone, Windows Phone, BlackBerry, Roku and more*.</li>
         <li>Video streaming.</li>
         <li>Podcast receiver.</li>
+        <li>Play your media on compatible DLNA/UPnP devices.</li>
         <li>Share your media on Facebook, Twitter, Google+.</li>
         <li>No ads in the web interface.</li>
         <li>Your personal server address: <em>yourname</em>.subsonic.org</li>

diff --git a/subsonic-site/src/main/webapp/premium.jsp b/subsonic-site/src/main/webapp/premium.jsp
@@ -32,6 +32,7 @@
                 </ul>
                 <ul class="stars column-right">
                     <li>Your personal server address: <em>yourname</em>.subsonic.org</li>
+                    <li>Play your media on compatible DLNA/UPnP devices.</li>
                     <li>Share your media on Facebook, Twitter, Google+.</li>
                     <li>Other features to be released later.</li>
                 </ul>

diff --git a/subsonic-site/src/main/webapp/redirect-expired.jsp b/subsonic-site/src/main/webapp/redirect-expired.jsp
@@ -32,6 +32,7 @@
     <li>Video streaming.</li>
     <li>Podcast receiver.</li>
     <li>No ads in the Subsonic web interface.</li>
+    <li>Play your media on compatible DLNA/UPnP devices.</li>
     <li>Share your media on Facebook, Twitter, Google+.</li>
     <li>Other features to be released later.</li>
 </ul>

diff --git a/subsonic-site/src/main/webapp/subsonic-ad.jsp b/subsonic-site/src/main/webapp/subsonic-ad.jsp
@@ -19,20 +19,21 @@
 	 height: 398px;
 	 border: 1px solid gray;">
     <div style="margin:6px;padding-top:0.5em"> 
-        <h2 style=""><img src="inc/img/love.png" alt="">&nbsp;&nbsp;Love Subsonic?</h2>
+        <h2><img src="inc/img/love.png" alt="">&nbsp;&nbsp;Love Subsonic?</h2>
         <p>
             Support us by upgrading to Subsonic Premium and enjoy features like:
         </p>
         <div style="font-size:12px;">
             <div style="color:#00008b;padding-top:6px"><a href="http://subsonic.org/pages/apps.jsp" target="_blank">Apps</a> for Android, iPhone, Windows Phone, BlackBerry, Roku ++.</div>
             <div style="color:green;padding-top:12px">Video streaming.</div>
             <div style="color:#00008b;padding-top:12px">Share on Facebook, Twitter, Google+</div>
-            <div style="color:green;padding-top:12px">Your personal server address: <em>you</em>.subsonic.org</div>
-            <div style="color:#00008b;padding-top:12px">No ads.</div>
-            <div style="color:green;padding-top:12px">Podcast receiver.</div>
+            <div style="color:green;padding-top:12px">DLNA/UPnP support</div>
+            <div style="color:#00008b;padding-top:12px">Your personal server address: <em>you</em>.subsonic.org</div>
+            <div style="color:green;padding-top:12px">No ads.</div>
+            <div style="color:#00008b;padding-top:12px">Podcast receiver.</div>
         </div>
 
-        <p style="padding-top:30px;font-size:1.0em"><b><a href="http://subsonic.org/pages/premium.jsp" target="_blank">&raquo; Get Subsonic Premium</a></b></p>
+        <p style="padding-top:20px;font-size:1.0em"><b><a href="http://subsonic.org/pages/premium.jsp" target="_blank">&raquo; Get Subsonic Premium</a></b></p>
 
     </div>
 </div>