[Slim-Checkins] r12743 - in /trunk/server: HTML/Default/home.html HTML/Default/html/home.js Slim/Player/Player.pm Slim/Player/Transporter.pm Slim/Plugin/MP3tunes/Plugin.pm Slim/Plugin/RhapsodyDirect/Plugin.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Mon Aug 27 14:30:21 2007
New Revision: 12743

URL: http://svn.slimdevices.com?rev=12743&view=rev
Log:
Add Music On Demand menu

Modified:
    trunk/server/HTML/Default/home.html
    trunk/server/HTML/Default/html/home.js
    trunk/server/Slim/Player/Player.pm
    trunk/server/Slim/Player/Transporter.pm
    trunk/server/Slim/Plugin/MP3tunes/Plugin.pm
    trunk/server/Slim/Plugin/RhapsodyDirect/Plugin.pm

Modified: trunk/server/HTML/Default/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Default/home.html?rev=12743&r1=12742&r2=12743&view=diff
==============================================================================
--- trunk/server/HTML/Default/home.html (original)
+++ trunk/server/HTML/Default/home.html Mon Aug 27 14:30:21 2007
@@ -63,6 +63,14 @@
 	[%- END %]
 </div>
 
+<div class="homeMenuSection" id="music_on_demandMenu">
+	[%- FOREACH link = additionalLinks.music_on_demand %]
+		[% IF link.key != 'FAVORITES' %]
+			[% PROCESS menuItem token=link.key category='music_on_demand' %]
+		[%- END %]
+	[%- END %]
+</div>
+
 <div class="homeMenuSection" id="searchMenu">
 	<div id="search-results"></div>
 </div>

Modified: trunk/server/HTML/Default/html/home.js
URL: http://svn.slimdevices.com/trunk/server/HTML/Default/html/home.js?rev=12743&r1=12742&r2=12743&view=diff
==============================================================================
--- trunk/server/HTML/Default/html/home.js (original)
+++ trunk/server/HTML/Default/html/home.js Mon Aug 27 14:30:21 2007
@@ -70,7 +70,7 @@
 					break;
 
 				case 'MUSIC_ON_DEMAND':
-					alert('...soon to come');
+					this.showPanel('music_on_demand');
 					break;
 
 				case 'OTHER_SERVICES':

Modified: trunk/server/Slim/Player/Player.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Player.pm?rev=12743&r1=12742&r2=12743&view=diff
==============================================================================
--- trunk/server/Slim/Player/Player.pm (original)
+++ trunk/server/Slim/Player/Player.pm Mon Aug 27 14:30:21 2007
@@ -44,6 +44,7 @@
 		FAVORITES
 		SAVED_PLAYLISTS
 		RADIO
+		MUSIC_ON_DEMAND
 		SETTINGS
 		PLUGINS
 	)],

Modified: trunk/server/Slim/Player/Transporter.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Transporter.pm?rev=12743&r1=12742&r2=12743&view=diff
==============================================================================
--- trunk/server/Slim/Player/Transporter.pm (original)
+++ trunk/server/Slim/Player/Transporter.pm Mon Aug 27 14:30:21 2007
@@ -44,6 +44,7 @@
 		FAVORITES
 		SAVED_PLAYLISTS
 		RADIO
+		MUSIC_ON_DEMAND
 		PLUGIN_DIGITAL_INPUT
 		SETTINGS
 		PLUGINS

Modified: trunk/server/Slim/Plugin/MP3tunes/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Plugin/MP3tunes/Plugin.pm?rev=12743&r1=12742&r2=12743&view=diff
==============================================================================
--- trunk/server/Slim/Plugin/MP3tunes/Plugin.pm (original)
+++ trunk/server/Slim/Plugin/MP3tunes/Plugin.pm Mon Aug 27 14:30:21 2007
@@ -19,6 +19,10 @@
 	);
 }
 
+sub playerMenu () {
+	return 'MUSIC_ON_DEMAND';
+}
+
 sub getDisplayName () {
 	return 'PLUGIN_MP3TUNES_MODULE_NAME';
 }

Modified: trunk/server/Slim/Plugin/RhapsodyDirect/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Plugin/RhapsodyDirect/Plugin.pm?rev=12743&r1=12742&r2=12743&view=diff
==============================================================================
--- trunk/server/Slim/Plugin/RhapsodyDirect/Plugin.pm (original)
+++ trunk/server/Slim/Plugin/RhapsodyDirect/Plugin.pm Mon Aug 27 14:30:21 2007
@@ -35,6 +35,10 @@
 	);
 }
 
+sub playerMenu () {
+	return 'MUSIC_ON_DEMAND';
+}
+
 sub getDisplayName () {
 	return 'PLUGIN_RHAPSODY_DIRECT_MODULE_NAME';
 }