[Slim-Checkins] r12786 - in /trunk/server/Slim/Plugin: Jive/Plugin.pm OPMLBased.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Wed Aug 29 12:16:25 2007
New Revision: 12786

URL: http://svn.slimdevices.com?rev=12786&view=rev
Log:
Hook up Music On Demand menu for Jive

Modified:
    trunk/server/Slim/Plugin/Jive/Plugin.pm
    trunk/server/Slim/Plugin/OPMLBased.pm

Modified: trunk/server/Slim/Plugin/Jive/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Plugin/Jive/Plugin.pm?rev=12786&r1=12785&r2=12786&view=diff
==============================================================================
--- trunk/server/Slim/Plugin/Jive/Plugin.pm (original)
+++ trunk/server/Slim/Plugin/Jive/Plugin.pm Wed Aug 29 12:16:25 2007
@@ -928,12 +928,12 @@
 			},
 		},
 		{
-			text    => Slim::Utils::Strings::string('MUSIC_SERVICES'),
+			text    => Slim::Utils::Strings::string('MUSIC_ON_DEMAND'),
 			actions => {
 				go => {
-					cmd => ['services'],
+					cmd => ['music_on_demand'],
 					params => {
-						menu => 'services',
+						menu => 'music_on_demand',
 					},
 				},
 			},

Modified: trunk/server/Slim/Plugin/OPMLBased.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Plugin/OPMLBased.pm?rev=12786&r1=12785&r2=12786&view=diff
==============================================================================
--- trunk/server/Slim/Plugin/OPMLBased.pm (original)
+++ trunk/server/Slim/Plugin/OPMLBased.pm Wed Aug 29 12:16:25 2007
@@ -34,10 +34,12 @@
 		[ $args{tag}, 'playlist', '_method' ],
 		[ 1, 1, 1, $cliQuery ]
 	);
+	
+	my $cli_menu = $args{menu} eq 'music_on_demand' ? 'music_on_demand' : 'radios';	
 		
 	$cli_next{$class} = Slim::Control::Request::addDispatch(
-		[ 'radios', '_index', '_quantity' ],
-		[ 0, 1, 1, $class->cliRadiosQuery( $args{tag} ) ]
+		[ $cli_menu, '_index', '_quantity' ],
+		[ 0, 1, 1, $class->cliRadiosQuery( $args{tag}, $cli_menu ) ]
 	);
 	
 	$class->SUPER::initPlugin();
@@ -70,7 +72,7 @@
 }
 
 sub cliRadiosQuery {
-	my ( $class, $tag ) = @_;
+	my ( $class, $tag, $cli_menu ) = @_;
 	
 	return sub {
 		my $request = shift;
@@ -101,7 +103,7 @@
 		}
 	
 		# let our super duper function do all the hard work
-		Slim::Control::Queries::dynamicAutoQuery( $request, 'radios', $cli_next{$class}, $data );
+		Slim::Control::Queries::dynamicAutoQuery( $request, $cli_menu, $cli_next{$class}, $data );
 	};
 }