Persistent & Cache streaming options alltogether

HTML/EN/settings/server/performance.html

@@ -67,11 +67,12 @@
 		</select>
 	[% END %]
 
-	[% WRAPPER setting title="SETUP_BUFFEREDHTTP" desc="SETUP_BUFFEREDHTTP_DESC" %]
-		<select class="stdedit" name="pref_useBufferedHTTP" id="useBufferedHTTP">
+	[% WRAPPER setting title="SETUP_ENHANCEDHTTP" desc="SETUP_ENHANCEDHTTP_DESC" %]
+		<select class="stdedit" name="pref_useEnhancedHTTP" id="useEnhancedHTTP">
 
-			<option [% IF NOT prefs.pref_useBufferedHTTP %]selected [% END %]value="0">[% 'SETUP_DISABLE_BUFFEREDHTTP' | getstring %]</option>
-			<option [% IF prefs.pref_useBufferedHTTP %]selected [% END %]value="1">[% 'SETUP_ENABLE_BUFFEREDHTTP' | getstring %]</option>
+			<option [% IF NOT prefs.pref_useEnhancedHTTP %]selected [% END %]value="0">[% 'SETUP_DISABLE_ENHANCEDHTTP' | getstring %]</option>
+			<option [% IF prefs.pref_useEnhancedHTTP == 1 %]selected [% END %]value="1">[% 'SETUP_ENABLE_PERSISTENTHTTP' | getstring %]</option>
+			<option [% IF prefs.pref_useEnhancedHTTP == 2 %]selected [% END %]value="2">[% 'SETUP_ENABLE_BUFFEREDHTTP' | getstring %]</option>
 
 		</select>
 	[% END %]

Slim/Formats/Movie.pm

@@ -325,11 +325,10 @@ sub setADTSProcess {
 			$offset += 3 if $data == 0x80 || $data == 0x81 || $data == 0xfe;
 			$offset++;
 			$data = unpack("N", substr($$bufref, $pos + $offset, 4));
-			$codec->{freq_index} = ($data >> 23) & 0x0f;
+			$codec->{freq_index} = ($data >> 23) & 0x0f;						
+			$codec->{channel_config} = ($data >> 19) & 0x0f;						
 			$codec->{object_type} = $data >> 27;
-			# Fix because Touch and Radio cannot handle ADTS header of AAC Main.
-			$codec->{object_type} = 2 if $codec->{object_type} == 5; 
-			$codec->{channel_config} = ($data >> 19) & 0x0f;
+			$codec->{object_type} = ($data >> 10) & 0x1f if $codec->{object_type} == 5 || $codec->{object_type} == 29;
 			$pos += $len - 8;
 	} elsif ($type eq 'stsz') {
 			my $offset = 4;
@@ -405,6 +404,18 @@ sub extractADTS {
 # M	13	frame length, this value must include 7 bytes of header 
 # O	11	Buffer fullness
 # P	2	Number of AAC frames (RDBs) in ADTS frame minus 1, for maximum compatibility always use 1 AAC frame per ADTS frame
+#
+# ISO 14496 Part 3 Table 1.13
+# 
+# A: Profile (2=LC, 5=SBR, 29=PS), R: Core SampleRate, M: Main SampleRate, 
+# C: Channels, X: Extensions, S=???, T=???, E=extension bit
+# 
+# AOT=2      AOT=5|29   AOT=2 (extended)
+# AAAA ARRR  AAAA ARRR  AAAA ARRR	
+# RCCC CXXX  RCCC CMMM  RCCC CXXX
+#            MPPP PP    SSSS SSSS
+#                       SSST TTTT
+#                       ERRR R
 
 
 1;

Slim/Formats/RemoteStream.pm

@@ -211,6 +211,8 @@ sub request {
 		});
 	}
 
+	$self->response($args, $request, @headers) if $self->can('response');
+
 	main::INFOLOG && $log->info("Opened stream!");
 
 	return $self;
@@ -302,6 +304,12 @@ sub contentLength {
 	return ${*$self}{'contentLength'};
 }
 
+sub contentRange {
+	my $self = shift;
+
+	return ${*$self}{'contentRange'};
+}
+
 sub contentType {
 	my $self = shift;
 

Slim/Player/ProtocolHandlers.pm

@@ -27,14 +27,13 @@ my %protocolHandlers = (
 	tmp      => qw(Slim::Player::Protocols::Volatile),
 	mms      => qw(Slim::Player::Protocols::MMS),
 	spdr     => qw(Slim::Player::Protocols::SqueezePlayDirect),
+	http     => qw(Slim::Player::Protocols::HTTP),
+	https    => qw(Slim::Player::Protocols::HTTPS),
+	icy      => qw(Slim::Player::Protocols::HTTP),	
 	playlist => 0,
 	db       => 1,
 );
 
-setHTTPHandler($prefs->get('useBufferedHTTP'));
-
-$prefs->setChange(sub { setHTTPHandler($_[1]) }, 'useBufferedHTTP');
-
 tie my %URLHandlers, 'Tie::RegexpHash';
 
 my %localHandlers = (
@@ -46,14 +45,6 @@ my %loadedHandlers = ();
 
 my %iconHandlers = ();
 
-sub setHTTPHandler {
-	my ($useBufferedHTTP) = @_;
-
-	$protocolHandlers{http}  = $useBufferedHTTP ? qw(Slim::Player::Protocols::Buffered) : qw(Slim::Player::Protocols::HTTP),
-	$protocolHandlers{https} = $useBufferedHTTP ? qw(Slim::Player::Protocols::Buffered) : (Slim::Networking::Async::HTTP->hasSSL() ? qw(Slim::Player::Protocols::HTTPS) : qw(Slim::Player::Protocols::HTTP)),
-	$protocolHandlers{icy}   = $useBufferedHTTP ? qw(Slim::Player::Protocols::Buffered) : qw(Slim::Player::Protocols::HTTP),
-}
-
 sub isValidHandler {
 	my ($class, $protocol) = @_;