[Slim-Checkins] r10814 - in /trunk/server/Plugins: CLI/HTML/
CLI/HTML/EN/ CLI/HTML/EN/plugins/ CLI/HTML/EN/plugins/CLI/
CLI/HTML/EN/plugins/CLI/settings/
CLI/HTML/EN/plugins/CLI/settings/basic.html CLI/Plugin.pm CLI/Settings.pm
MusicMagic/Plugin.pm
dsully at svn.slimdevices.com
dsully at svn.slimdevices.com
Fri Dec 1 10:42:25 PST 2006
Author: dsully
Date: Fri Dec 1 10:42:24 2006
New Revision: 10814
URL: http://svn.slimdevices.com?rev=10814&view=rev
Log:
Bug: N/A
Description: Convert CLI. Fix MusicMagic loading.
Added:
trunk/server/Plugins/CLI/HTML/
trunk/server/Plugins/CLI/HTML/EN/
trunk/server/Plugins/CLI/HTML/EN/plugins/
trunk/server/Plugins/CLI/HTML/EN/plugins/CLI/
trunk/server/Plugins/CLI/HTML/EN/plugins/CLI/settings/
trunk/server/Plugins/CLI/HTML/EN/plugins/CLI/settings/basic.html (with props)
trunk/server/Plugins/CLI/Settings.pm (with props)
Modified:
trunk/server/Plugins/CLI/Plugin.pm
trunk/server/Plugins/MusicMagic/Plugin.pm
Added: trunk/server/Plugins/CLI/HTML/EN/plugins/CLI/settings/basic.html
URL: http://svn.slimdevices.com/trunk/server/Plugins/CLI/HTML/EN/plugins/CLI/settings/basic.html?rev=10814&view=auto
==============================================================================
--- trunk/server/Plugins/CLI/HTML/EN/plugins/CLI/settings/basic.html (added)
+++ trunk/server/Plugins/CLI/HTML/EN/plugins/CLI/settings/basic.html Fri Dec 1 10:42:24 2006
@@ -1,0 +1,15 @@
+[% PROCESS settings/header.html %]
+
+ <div class="settingSection">
+ <div class="groupHead">[% "PLUGIN_CLI" | string | upper %]</div>
+ <div class="groupDesc">[% "PLUGIN_CLI_DESC" | string %]</div>
+ </div>
+
+ <div class="settingSection">
+ <div class="prefHead">[% "SETUP_CLIPORT" | string | upper %]</div>
+ <div class="prefDesc">[% "SETUP_CLIPORT_DESC" | string %]</div>
+
+ <input type="text" class="stdedit" name="cliport" id="cliport" value="[% prefs.cliport %]" size="5">
+ </div>
+
+[% PROCESS settings/footer.html %]
Propchange: trunk/server/Plugins/CLI/HTML/EN/plugins/CLI/settings/basic.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/server/Plugins/CLI/HTML/EN/plugins/CLI/settings/basic.html
------------------------------------------------------------------------------
svn:keywords = Id Author LastChangedDate LastChangedBy
Propchange: trunk/server/Plugins/CLI/HTML/EN/plugins/CLI/settings/basic.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Modified: trunk/server/Plugins/CLI/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/CLI/Plugin.pm?rev=10814&r1=10813&r2=10814&view=diff
==============================================================================
--- trunk/server/Plugins/CLI/Plugin.pm (original)
+++ trunk/server/Plugins/CLI/Plugin.pm Fri Dec 1 10:42:24 2006
@@ -10,6 +10,8 @@
use IO::Socket;
use Socket qw(:crlf);
use Scalar::Util qw(blessed);
+
+use Plugins::CLI::Settings;
use Slim::Control::Request;
use Slim::Utils::Log;
@@ -71,7 +73,9 @@
Slim::Utils::Prefs::set('cliport', 9090);
}
-
+
+ Plugins::CLI::Settings->new;
+
# register our functions
# |requires Client
@@ -101,24 +105,6 @@
sub getDisplayDescription {
return "PLUGIN_CLI_DESC";
-}
-
-# plugin: manage the CLI preference
-sub setupGroup {
- my $client = shift;
-
- my %setupGroup = (
- PrefOrder => ['cliport'],
- );
-
- my %setupPrefs = (
- 'cliport' => {
- 'validate' => \&Slim::Utils::Validate::port,
- 'onChange' => \&cli_socket_change,
- }
- );
-
- return (\%setupGroup, \%setupPrefs);
}
# plugin: shutdown the CLI
Added: trunk/server/Plugins/CLI/Settings.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/CLI/Settings.pm?rev=10814&view=auto
==============================================================================
--- trunk/server/Plugins/CLI/Settings.pm (added)
+++ trunk/server/Plugins/CLI/Settings.pm Fri Dec 1 10:42:24 2006
@@ -1,0 +1,47 @@
+package Plugins::CLI::Settings;
+
+# SlimServer Copyright (c) 2001-2006 Slim Devices Inc.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License,
+# version 2.
+
+use strict;
+use base qw(Slim::Web::Settings);
+
+sub name {
+ return 'PLUGIN_CLI';
+}
+
+sub page {
+ return 'plugins/CLI/settings/basic.html';
+}
+
+sub handler {
+ my ($class, $client, $params) = @_;
+
+ my @prefs = qw(
+ cliport
+ );
+
+ for my $pref (@prefs) {
+
+ if ($params->{'submit'}) {
+
+ # XXX - validate port
+ Slim::Utils::Prefs::set($pref, $params->{$pref});
+
+ if ($params->{$pref} != Slim::Utils::Prefs::get($pref)) {
+
+ Plugins::CLI::::Plugin::cli_socket_change();
+ }
+ }
+
+ $params->{'prefs'}->{$pref} = Slim::Utils::Prefs::get($pref);
+ }
+
+ return $class->SUPER::handler($client, $params);
+}
+
+1;
+
+__END__
Propchange: trunk/server/Plugins/CLI/Settings.pm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/server/Plugins/CLI/Settings.pm
------------------------------------------------------------------------------
svn:keywords = Id Author LastChangedDate LastChangedBy
Propchange: trunk/server/Plugins/CLI/Settings.pm
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: trunk/server/Plugins/MusicMagic/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/MusicMagic/Plugin.pm?rev=10814&r1=10813&r2=10814&view=diff
==============================================================================
--- trunk/server/Plugins/MusicMagic/Plugin.pm (original)
+++ trunk/server/Plugins/MusicMagic/Plugin.pm Fri Dec 1 10:42:24 2006
@@ -126,10 +126,6 @@
$initialized = 0;
- my ($groupRef, $prefRef) = setupPort();
-
- Slim::Web::Setup::addGroup('PLUGINS', 'musicmagic_connect', $groupRef, undef, $prefRef);
-
return 0;
}
@@ -149,10 +145,6 @@
$initialized = 0;
$log->warn("Can't connect to port $MMSport - MusicMagic disabled.");
-
- my ($groupRef, $prefRef) = setupPort();
-
- Slim::Web::Setup::addGroup('PLUGINS', 'musicmagic_connect', $groupRef, undef, $prefRef);
} else {
More information about the checkins
mailing list