From 7684114fba15de5029051d02108ece4f11770f9c Mon Sep 17 00:00:00 2001 From: igland Date: Fri, 30 Jan 2026 09:53:02 +0100 Subject: [PATCH] Modernize player modules and core strictness - Replaced legacy 'use vars / @ISA' inheritance with 'use parent' in Slim/Player/*.pm. - Standardized 'use warnings' in Slim/Web/HTTP.pm, Slim/Utils/Misc.pm, and Slim/Control/Jive.pm. Signed-off-by: igland --- Slim/Control/Jive.pm | 1 + Slim/Player/Boom.pm | 7 ++----- Slim/Player/Disconnected.pm | 10 ++-------- Slim/Player/HTTP.pm | 7 ++----- Slim/Player/Receiver.pm | 7 ++----- Slim/Player/SqueezePlay.pm | 14 ++------------ Slim/Player/Transporter.pm | 7 ++----- Slim/Utils/Misc.pm | 1 + Slim/Web/HTTP.pm | 1 + 9 files changed, 15 insertions(+), 40 deletions(-) diff --git a/Slim/Control/Jive.pm b/Slim/Control/Jive.pm index cd41f96cc27..db9371a3178 100644 --- a/Slim/Control/Jive.pm +++ b/Slim/Control/Jive.pm @@ -7,6 +7,7 @@ package Slim::Control::Jive; # version 2. use strict; +use warnings; use POSIX qw(strftime); use Scalar::Util qw(blessed); diff --git a/Slim/Player/Boom.pm b/Slim/Player/Boom.pm index 8fca905446c..ed1556d97b2 100644 --- a/Slim/Player/Boom.pm +++ b/Slim/Player/Boom.pm @@ -12,12 +12,9 @@ package Slim::Player::Boom; # GNU General Public License for more details. use strict; -use vars qw(@ISA); +use warnings; -BEGIN { - require Slim::Player::Squeezebox2; - push @ISA, qw(Slim::Player::Squeezebox2); -} +use parent qw(Slim::Player::Squeezebox2); use Slim::Hardware::BacklightLED; use Slim::Networking::Slimproto; diff --git a/Slim/Player/Disconnected.pm b/Slim/Player/Disconnected.pm index a4096368998..7fe7baf4628 100644 --- a/Slim/Player/Disconnected.pm +++ b/Slim/Player/Disconnected.pm @@ -17,15 +17,9 @@ package Slim::Player::Disconnected; use strict; -use vars qw(@ISA); -use Slim::Player::Client; +use warnings; -use Slim::Display::NoDisplay; - -BEGIN { - require Slim::Player::Client; - push @ISA, qw(Slim::Player::Client); -} +use parent qw(Slim::Player::Client); sub new { my ( $class, $id ) = @_; diff --git a/Slim/Player/HTTP.pm b/Slim/Player/HTTP.pm index 6ac7bf8b8da..ec08cd044b0 100644 --- a/Slim/Player/HTTP.pm +++ b/Slim/Player/HTTP.pm @@ -12,12 +12,9 @@ package Slim::Player::HTTP; use strict; -use vars qw(@ISA); -use Slim::Player::Client; +use warnings; -use Slim::Display::NoDisplay; - -@ISA = qw(Slim::Player::Client); +use parent qw(Slim::Player::Client); sub new { my ($class, $id, $paddr, $tcpsock) = @_; diff --git a/Slim/Player/Receiver.pm b/Slim/Player/Receiver.pm index 600aa9f95fb..688169946ce 100644 --- a/Slim/Player/Receiver.pm +++ b/Slim/Player/Receiver.pm @@ -12,12 +12,9 @@ package Slim::Player::Receiver; # GNU General Public License for more details. use strict; -use vars qw(@ISA); +use warnings; -BEGIN { - require Slim::Player::Squeezebox2; - push @ISA, qw(Slim::Player::Squeezebox2); -} +use parent qw(Slim::Player::Squeezebox2); use Slim::Player::ProtocolHandlers; use Slim::Utils::Prefs; diff --git a/Slim/Player/SqueezePlay.pm b/Slim/Player/SqueezePlay.pm index 2e1946ba820..b7f58e78809 100644 --- a/Slim/Player/SqueezePlay.pm +++ b/Slim/Player/SqueezePlay.pm @@ -12,19 +12,9 @@ package Slim::Player::SqueezePlay; # GNU General Public License for more details. use strict; -use vars qw(@ISA); +use warnings; -use Slim::Utils::Prefs; -use Slim::Utils::Log; - -my $prefs = preferences('server'); - -my $log = logger('network.protocol.slimproto'); - -BEGIN { - require Slim::Player::Squeezebox2; - push @ISA, qw(Slim::Player::Squeezebox2); -} +use parent qw(Slim::Player::Squeezebox2); { diff --git a/Slim/Player/Transporter.pm b/Slim/Player/Transporter.pm index 038e3d8b4da..3ba90915202 100644 --- a/Slim/Player/Transporter.pm +++ b/Slim/Player/Transporter.pm @@ -14,12 +14,9 @@ package Slim::Player::Transporter; # use strict; -use vars qw(@ISA); +use warnings; -BEGIN { - require Slim::Player::Squeezebox2; - push @ISA, qw(Slim::Player::Squeezebox2); -} +use parent qw(Slim::Player::Squeezebox2); use MIME::Base64; diff --git a/Slim/Utils/Misc.pm b/Slim/Utils/Misc.pm index ee017243c6b..4baa099c06e 100644 --- a/Slim/Utils/Misc.pm +++ b/Slim/Utils/Misc.pm @@ -29,6 +29,7 @@ L serves as a collection of miscellaneous utility =cut use strict; +use warnings; use Exporter::Lite; our @EXPORT = qw(assert msg msgf errorMsg specified dumpFiltered); diff --git a/Slim/Web/HTTP.pm b/Slim/Web/HTTP.pm index dc23238ca91..dfe8f9d58d8 100644 --- a/Slim/Web/HTTP.pm +++ b/Slim/Web/HTTP.pm @@ -8,6 +8,7 @@ package Slim::Web::HTTP; # version 2. use strict; +use warnings; use AnyEvent::Handle; use CGI::Cookie;