Revert the streaming change for Gingerbread and older

lastfm · Jul 10, 2012 · 9e20e19 · 9e20e19
1 parent d2fa575
commit 9e20e19
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="fm.last.android" android:versionCode="61" android:versionName="1.9.9">
+	package="fm.last.android" android:versionCode="62" android:versionName="1.9.9.1">
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/app/src/fm/last/android/player/RadioPlayerService.java b/app/src/fm/last/android/player/RadioPlayerService.java
@@ -728,13 +728,15 @@ private void playTrack(RadioTrack track, MediaPlayer p) {
 				track.setLocationUrl(newURL.toString());
 			}
 			String url = track.getLocationUrl();
-			//Stream through a proxy to enforce one connection per track
-			if (proxy == null) {
-				proxy = new StreamProxy();
-				proxy.init();
-				proxy.start();
+			//Stream through a proxy to enforce one connection per track (Honeycomb+)
+			if(Integer.decode(Build.VERSION.SDK) >= 11) {
+				if (proxy == null) {
+					proxy = new StreamProxy();
+					proxy.init();
+					proxy.start();
+				}
+				url = String.format("http://127.0.0.1:%d/%s",proxy.getPort(), url);
 			}
-			url = String.format("http://127.0.0.1:%d/%s",proxy.getPort(), url);
 			if(!wifiLock.isHeld())
 				wifiLock.acquire();
 			if(!wakeLock.isHeld())