Merge pull request #584 from philippe44/Inheritance-issue-on-Player-P…

…rotocols

Consistency of Player::Protocols inheritance

Slim/Formats/RemoteStream.pm

@@ -38,7 +38,7 @@ sub isRemote {
 	return 1;
 }
 
-sub open {
+sub new {
 	my $class = shift;
 	my $args  = shift;
 
@@ -119,8 +119,12 @@ sub open {
 
 	${*$sock}{'song'} = $args->{'song'};
 
-	return $sock->request($args);
+	return $sock->open($args);
+
+}
 
+sub open {
+	shift->request(@_);
 }
 
 sub request {
@@ -197,7 +201,7 @@ sub request {
 		$redir = Slim::Utils::Misc::cloneProtocol($redir, $url);
 		main::INFOLOG && $log->info("Redirect to: $redir");
 
-		return $class->open({
+		return $class->new({
 			'url'     => $redir,
 			'song'    => $args->{'song'},
 			'infoUrl' => $self->infoUrl,

Slim/Player/Protocols/HTTP.pm

@@ -42,7 +42,7 @@ sub new {
 		# return undef;
 	}
 
-	my $self = $class->open($args);
+	my $self = $class->SUPER::new($args);
 
 	if (defined($self)) {
 		${*$self}{'client'}  = $args->{'client'};

Slim/Player/Protocols/HTTPS.pm

@@ -10,11 +10,6 @@ my $log = logger('player.streaming.remote');
 my $prefs = preferences('server');
 
 sub new {
-	# make sure it's our open called, not system's one
-	return Slim::Player::Protocols::HTTPS::open(@_);
-}
-
-sub open {
 	my $class = shift;
 	my $args  = shift;
 	my $url   = $args->{'url'} || '';

Slim/Player/Protocols/MMS.pm

@@ -47,7 +47,7 @@ sub new {
 	my $url        = $args->{'url'};
 	my $client     = $args->{'client'};
 
-	my $self = $class->open($args);
+	my $self = $class->SUPER::new($args);
 
 	if (defined($self)) {
 		${*$self}{'client'}  = $args->{'client'};