Skip to content

Commit 05834da

Browse files
committed
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.
1 parent 4934fc8 commit 05834da

9 files changed

Lines changed: 15 additions & 40 deletions

File tree

Slim/Control/Jive.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package Slim::Control::Jive;
77
# version 2.
88

99
use strict;
10+
use warnings;
1011

1112
use POSIX qw(strftime);
1213
use Scalar::Util qw(blessed);

Slim/Player/Boom.pm

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ package Slim::Player::Boom;
1212
# GNU General Public License for more details.
1313

1414
use strict;
15-
use vars qw(@ISA);
15+
use warnings;
1616

17-
BEGIN {
18-
require Slim::Player::Squeezebox2;
19-
push @ISA, qw(Slim::Player::Squeezebox2);
20-
}
17+
use parent qw(Slim::Player::Squeezebox2);
2118

2219
use Slim::Hardware::BacklightLED;
2320
use Slim::Networking::Slimproto;

Slim/Player/Disconnected.pm

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,9 @@
1717
package Slim::Player::Disconnected;
1818

1919
use strict;
20-
use vars qw(@ISA);
21-
use Slim::Player::Client;
20+
use warnings;
2221

23-
use Slim::Display::NoDisplay;
24-
25-
BEGIN {
26-
require Slim::Player::Client;
27-
push @ISA, qw(Slim::Player::Client);
28-
}
22+
use parent qw(Slim::Player::Client);
2923

3024
sub new {
3125
my ( $class, $id ) = @_;

Slim/Player/HTTP.pm

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@
1212
package Slim::Player::HTTP;
1313

1414
use strict;
15-
use vars qw(@ISA);
16-
use Slim::Player::Client;
15+
use warnings;
1716

18-
use Slim::Display::NoDisplay;
19-
20-
@ISA = qw(Slim::Player::Client);
17+
use parent qw(Slim::Player::Client);
2118

2219
sub new {
2320
my ($class, $id, $paddr, $tcpsock) = @_;

Slim/Player/Receiver.pm

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ package Slim::Player::Receiver;
1212
# GNU General Public License for more details.
1313

1414
use strict;
15-
use vars qw(@ISA);
15+
use warnings;
1616

17-
BEGIN {
18-
require Slim::Player::Squeezebox2;
19-
push @ISA, qw(Slim::Player::Squeezebox2);
20-
}
17+
use parent qw(Slim::Player::Squeezebox2);
2118

2219
use Slim::Player::ProtocolHandlers;
2320
use Slim::Utils::Prefs;

Slim/Player/SqueezePlay.pm

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,9 @@ package Slim::Player::SqueezePlay;
1212
# GNU General Public License for more details.
1313

1414
use strict;
15-
use vars qw(@ISA);
15+
use warnings;
1616

17-
use Slim::Utils::Prefs;
18-
use Slim::Utils::Log;
19-
20-
my $prefs = preferences('server');
21-
22-
my $log = logger('network.protocol.slimproto');
23-
24-
BEGIN {
25-
require Slim::Player::Squeezebox2;
26-
push @ISA, qw(Slim::Player::Squeezebox2);
27-
}
17+
use parent qw(Slim::Player::Squeezebox2);
2818

2919
{
3020

Slim/Player/Transporter.pm

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ package Slim::Player::Transporter;
1414
#
1515

1616
use strict;
17-
use vars qw(@ISA);
17+
use warnings;
1818

19-
BEGIN {
20-
require Slim::Player::Squeezebox2;
21-
push @ISA, qw(Slim::Player::Squeezebox2);
22-
}
19+
use parent qw(Slim::Player::Squeezebox2);
2320

2421
use MIME::Base64;
2522

Slim/Utils/Misc.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ L<Slim::Utils::Misc> serves as a collection of miscellaneous utility
2929
=cut
3030

3131
use strict;
32+
use warnings;
3233
use Exporter::Lite;
3334

3435
our @EXPORT = qw(assert msg msgf errorMsg specified dumpFiltered);

Slim/Web/HTTP.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package Slim::Web::HTTP;
88
# version 2.
99

1010
use strict;
11+
use warnings;
1112

1213
use AnyEvent::Handle;
1314
use CGI::Cookie;

0 commit comments

Comments
 (0)