[Slim-Checkins] r10808 - in /trunk/server/Plugins: ./ CLI/ RPC/ RSSNews/ Rescan/ SavePlaylist/ SlimTris/ Snow/ Visualizer/ xPL/

dsully at svn.slimdevices.com dsully at svn.slimdevices.com
Thu Nov 30 17:39:59 PST 2006 

Author: dsully
Date: Thu Nov 30 17:39:59 2006
New Revision: 10808

URL: http://svn.slimdevices.com?rev=10808&view=rev
Log:
Bug: N/A
Description: Remove top level plugins into directories.

Added:
    trunk/server/Plugins/CLI/
    trunk/server/Plugins/CLI/Plugin.pm
      - copied, changed from r10458, trunk/server/Plugins/CLI.pm
    trunk/server/Plugins/RPC/
    trunk/server/Plugins/RPC/Plugin.pm
      - copied, changed from r10437, trunk/server/Plugins/RPC.pm
    trunk/server/Plugins/RSSNews/
    trunk/server/Plugins/RSSNews/Plugin.pm
      - copied, changed from r10502, trunk/server/Plugins/RssNews.pm
    trunk/server/Plugins/Rescan/
    trunk/server/Plugins/Rescan/Plugin.pm
      - copied, changed from r10437, trunk/server/Plugins/Rescan.pm
    trunk/server/Plugins/SavePlaylist/
    trunk/server/Plugins/SavePlaylist/Plugin.pm
      - copied, changed from r9767, trunk/server/Plugins/SavePlaylist.pm
    trunk/server/Plugins/SlimTris/
    trunk/server/Plugins/SlimTris/Plugin.pm
      - copied, changed from r9767, trunk/server/Plugins/SlimTris.pm
    trunk/server/Plugins/Snow/
    trunk/server/Plugins/Snow/Plugin.pm
      - copied, changed from r10752, trunk/server/Plugins/Snow.pm
    trunk/server/Plugins/Visualizer/
    trunk/server/Plugins/Visualizer/Plugin.pm
      - copied, changed from r10437, trunk/server/Plugins/Visualizer.pm
    trunk/server/Plugins/xPL/
    trunk/server/Plugins/xPL/Plugin.pm
      - copied, changed from r10437, trunk/server/Plugins/xPL.pm
Removed:
    trunk/server/Plugins/CLI.pm
    trunk/server/Plugins/RPC.pm
    trunk/server/Plugins/Rescan.pm
    trunk/server/Plugins/RssNews.pm
    trunk/server/Plugins/SavePlaylist.pm
    trunk/server/Plugins/SlimTris.pm
    trunk/server/Plugins/Snow.pm
    trunk/server/Plugins/Visualizer.pm
    trunk/server/Plugins/xPL.pm

Copied: trunk/server/Plugins/CLI/Plugin.pm (from r10458, trunk/server/Plugins/CLI.pm)
URL: http://svn.slimdevices.com/trunk/server/Plugins/CLI/Plugin.pm?p2=trunk/server/Plugins/CLI/Plugin.pm&p1=trunk/server/Plugins/CLI.pm&r1=10458&r2=10808&rev=10808&view=diff
==============================================================================
--- trunk/server/Plugins/CLI.pm (original)
+++ trunk/server/Plugins/CLI/Plugin.pm Thu Nov 30 17:39:59 2006
@@ -1,4 +1,4 @@
-package Plugins::CLI;
+package Plugins::CLI::Plugin;
 
 # SlimServer Copyright (c) 2001-2004 Sean Adams, Slim Devices Inc.
 # This program is free software; you can redistribute it and/or
@@ -224,7 +224,7 @@
 		Slim::Networking::Select::addRead($cli_socket, undef);
 		$cli_socket->close();
 		$cli_socket_port = 0;
-		Slim::Control::Request::unsubscribe(\&Plugins::CLI::cli_request_notification);
+		Slim::Control::Request::unsubscribe(\&cli_request_notification);
 	}
 }
 
@@ -961,13 +961,13 @@
 	# subscribe
 	if ($subscribe && !$cli_subscribed) {
 
-		Slim::Control::Request::subscribe(\&Plugins::CLI::cli_subscribe_notification);
+		Slim::Control::Request::subscribe(\&cli_subscribe_notification);
 		$cli_subscribed = 1;
 
 	# unsubscribe
 	} elsif (!$subscribe && $cli_subscribed) {
 
-		Slim::Control::Request::unsubscribe(\&Plugins::CLI::cli_subscribe_notification);
+		Slim::Control::Request::unsubscribe(\&cli_subscribe_notification);
 		$cli_subscribed = 0;
 	}
 }

Copied: trunk/server/Plugins/RPC/Plugin.pm (from r10437, trunk/server/Plugins/RPC.pm)
URL: http://svn.slimdevices.com/trunk/server/Plugins/RPC/Plugin.pm?p2=trunk/server/Plugins/RPC/Plugin.pm&p1=trunk/server/Plugins/RPC.pm&r1=10437&r2=10808&rev=10808&view=diff
==============================================================================
--- trunk/server/Plugins/RPC.pm (original)
+++ trunk/server/Plugins/RPC/Plugin.pm Thu Nov 30 17:39:59 2006
@@ -1,4 +1,4 @@
-package Plugins::RPC;
+package Plugins::RPC::Plugin;
 
 # $Id$
 

Copied: trunk/server/Plugins/RSSNews/Plugin.pm (from r10502, trunk/server/Plugins/RssNews.pm)
URL: http://svn.slimdevices.com/trunk/server/Plugins/RSSNews/Plugin.pm?p2=trunk/server/Plugins/RSSNews/Plugin.pm&p1=trunk/server/Plugins/RssNews.pm&r1=10502&r2=10808&rev=10808&view=diff
==============================================================================
--- trunk/server/Plugins/RssNews.pm (original)
+++ trunk/server/Plugins/RSSNews/Plugin.pm Thu Nov 30 17:39:59 2006
@@ -1,4 +1,4 @@
-package Plugins::RssNews;
+package Plugins::RSSNews::Plugin;
 
 # RSS News Browser
 # Copyright (c) 2006 Slim Devices, Inc. (www.slimdevices.com)

Copied: trunk/server/Plugins/Rescan/Plugin.pm (from r10437, trunk/server/Plugins/Rescan.pm)
URL: http://svn.slimdevices.com/trunk/server/Plugins/Rescan/Plugin.pm?p2=trunk/server/Plugins/Rescan/Plugin.pm&p1=trunk/server/Plugins/Rescan.pm&r1=10437&r2=10808&rev=10808&view=diff
==============================================================================
--- trunk/server/Plugins/Rescan.pm (original)
+++ trunk/server/Plugins/Rescan/Plugin.pm Thu Nov 30 17:39:59 2006
@@ -1,4 +1,4 @@
-package Plugins::Rescan;
+package Plugins::Rescan::Plugin;
 
 # Rescan.pm by Andrew Hedges (andrew at hedges.me.uk) October 2002
 # Timer functions added by Kevin Deane-Freeman (kevindf at shaw.ca) June 2004
@@ -54,7 +54,7 @@
 		}
 	);
 
-	Slim::Buttons::Common::addMode('scantimer', getFunctions(), \&Plugins::Rescan::setMode);
+	Slim::Buttons::Common::addMode('scantimer', getFunctions(), \&setMode);
 	setTimer();
 }
 

Copied: trunk/server/Plugins/SavePlaylist/Plugin.pm (from r9767, trunk/server/Plugins/SavePlaylist.pm)
URL: http://svn.slimdevices.com/trunk/server/Plugins/SavePlaylist/Plugin.pm?p2=trunk/server/Plugins/SavePlaylist/Plugin.pm&p1=trunk/server/Plugins/SavePlaylist.pm&r1=9767&r2=10808&rev=10808&view=diff
==============================================================================
--- trunk/server/Plugins/SavePlaylist.pm (original)
+++ trunk/server/Plugins/SavePlaylist/Plugin.pm Thu Nov 30 17:39:59 2006
@@ -1,3 +1,5 @@
+package Plugins::SavePlaylist::Plugin;
+
 # $Id$
 # This code is derived from code with the following copyright message:
 #
@@ -5,8 +7,6 @@
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License,
 # version 2.
-
-package Plugins::SavePlaylist;
 
 use strict;
 use Slim::Player::Playlist;
@@ -81,7 +81,7 @@
 							0;
 
 		Slim::Buttons::Common::pushMode($client,'INPUT.Text', {
-			'callback'        => \&Plugins::SavePlaylist::savePluginCallback,
+			'callback'        => \&savePluginCallback,
 			'valueRef'        => \$context{$client},
 			'charsRef'        => \@LegalChars,
 			'numberLetterRef' => \@legalMixed,

Copied: trunk/server/Plugins/SlimTris/Plugin.pm (from r9767, trunk/server/Plugins/SlimTris.pm)
URL: http://svn.slimdevices.com/trunk/server/Plugins/SlimTris/Plugin.pm?p2=trunk/server/Plugins/SlimTris/Plugin.pm&p1=trunk/server/Plugins/SlimTris.pm&r1=9767&r2=10808&rev=10808&view=diff
==============================================================================
--- trunk/server/Plugins/SlimTris.pm (original)
+++ trunk/server/Plugins/SlimTris/Plugin.pm Thu Nov 30 17:39:59 2006
@@ -1,4 +1,4 @@
-package Plugins::SlimTris;
+package Plugins::SlimTris::Plugin;
 
 # SliMP3 Server Copyright (C) 2001 Sean Adams, Slim Devices Inc.
 # This program is free software; you can redistribute it and/or
@@ -11,8 +11,7 @@
 use Slim::Buttons::Common;
 use Slim::Utils::Misc;
 
-use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.7 $,10);
+our $VERSION = substr(q$Revision: 1.7 $,10);
 
 # constants
 my $height = 4;

Copied: trunk/server/Plugins/Snow/Plugin.pm (from r10752, trunk/server/Plugins/Snow.pm)
URL: http://svn.slimdevices.com/trunk/server/Plugins/Snow/Plugin.pm?p2=trunk/server/Plugins/Snow/Plugin.pm&p1=trunk/server/Plugins/Snow.pm&r1=10752&r2=10808&rev=10808&view=diff
==============================================================================
--- trunk/server/Plugins/Snow.pm (original)
+++ trunk/server/Plugins/Snow/Plugin.pm Thu Nov 30 17:39:59 2006
@@ -1,4 +1,4 @@
-package Plugins::Snow;
+package Plugins::Snow::Plugin;
 
 # $Id$
 # by Phil Barrett, December 2003
@@ -22,8 +22,7 @@
 use File::Spec::Functions qw(:ALL);
 use Scalar::Util qw(blessed);
 
-use vars qw($VERSION);
-$VERSION = substr(q$Revision$,10);
+our $VERSION = substr(q$Revision$,10);
 
 sub getDisplayName {
 	return 'PLUGIN_SCREENSAVER_SNOW';

Copied: trunk/server/Plugins/Visualizer/Plugin.pm (from r10437, trunk/server/Plugins/Visualizer.pm)
URL: http://svn.slimdevices.com/trunk/server/Plugins/Visualizer/Plugin.pm?p2=trunk/server/Plugins/Visualizer/Plugin.pm&p1=trunk/server/Plugins/Visualizer.pm&r1=10437&r2=10808&rev=10808&view=diff
==============================================================================
--- trunk/server/Plugins/Visualizer.pm (original)
+++ trunk/server/Plugins/Visualizer/Plugin.pm Thu Nov 30 17:39:59 2006
@@ -1,3 +1,5 @@
+package Plugins::Visualizer::Plugin;
+
 # $Id: $
 
 # SlimServer Copyright (c) 2001-2005 Sean Adams, Slim Devices Inc.

Copied: trunk/server/Plugins/xPL/Plugin.pm (from r10437, trunk/server/Plugins/xPL.pm)
URL: http://svn.slimdevices.com/trunk/server/Plugins/xPL/Plugin.pm?p2=trunk/server/Plugins/xPL/Plugin.pm&p1=trunk/server/Plugins/xPL.pm&r1=10437&r2=10808&rev=10808&view=diff
==============================================================================
--- trunk/server/Plugins/xPL.pm (original)
+++ trunk/server/Plugins/xPL/Plugin.pm Thu Nov 30 17:39:59 2006
@@ -1,4 +1,4 @@
-package Plugins::xPL;
+package Plugins::xPL::Plugin;
 
 # SlimServer Copyright (C) 2001 Sean Adams, Slim Devices Inc.
 # This program is free software; you can redistribute it and/or
@@ -85,11 +85,11 @@
 	Slim::Networking::Select::addRead($xpl_socket, \&readxpl);
 	sendxplhbeat();
 	
-	Slim::Control::Request::subscribe(\&Plugins::xPL::xplExecuteCallback);
+	Slim::Control::Request::subscribe(\&xplExecuteCallback);
 }
 
 sub shutdownPlugin {
-	Slim::Control::Request::unsubscribe(\&Plugins::xPL::xplExecuteCallback);
+	Slim::Control::Request::unsubscribe(\&xplExecuteCallback);
 }
 
 # plugin: name of our plugin

More information about the checkins mailing list