Fixes #747: Add support for Internet Radio while casting

5 files changed, 71 insertions, 102 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectInternetRadioStationFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectInternetRadioStationFragment.java
index c39e9f61..74c4b269 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectInternetRadioStationFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectInternetRadioStationFragment.java
@@ -133,7 +133,7 @@ public class SelectInternetRadioStationFragment extends SelectRecyclerFragment<I
 					connection.disconnect();
 				}
 			} catch (Exception e) {
-				Log.e(TAG, "Failed to get stream data from playlist");
+				Log.e(TAG, "Failed to get stream data from playlist", e);
 			}
 
 		}
diff --git a/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java b/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
index 2df290cf..566ed773 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
@@ -66,17 +66,12 @@ public class ChromeCastController extends RemoteController {
 	private boolean isStopping = false;
 	private Runnable afterUpdateComplete = null;
 
-	private ServerProxy proxy;
-	private String rootLocation;
 	private RemoteMediaPlayer mediaPlayer;
 	private double gain = 0.5;
 
 	public ChromeCastController(DownloadService downloadService, CastDevice castDevice) {
-		this.downloadService = downloadService;
+		super(downloadService);
 		this.castDevice = castDevice;
-
-		SharedPreferences prefs = Util.getPreferences(downloadService);
-		rootLocation = prefs.getString(Constants.PREFERENCES_KEY_CACHE_LOCATION, null);
 	}
 
 	@Override
@@ -287,49 +282,7 @@ public class ChromeCastController extends RemoteController {
 
 		try {
 			MusicService musicService = MusicServiceFactory.getMusicService(downloadService);
-			String url;
-			// Offline, use file proxy
-			if(Util.isOffline(downloadService) || song.getId().indexOf(rootLocation) != -1) {
-				if(proxy == null) {
-					proxy = new FileProxy(downloadService);
-					proxy.start();
-				}
-
-				// Offline song
-				if(song.getId().indexOf(rootLocation) != -1) {
-					url = proxy.getPublicAddress(song.getId());
-				} else {
-					// Playing online song in offline mode
-					url = proxy.getPublicAddress(currentPlaying.getCompleteFile().getPath());
-				}
-			} else {
-				// Check if we want a proxy going still
-				if(Util.isCastProxy(downloadService)) {
-					if(proxy instanceof FileProxy) {
-						proxy.stop();
-						proxy = null;
-					}
-
-					if(proxy == null) {
-						proxy = createWebProxy();
-						proxy.start();
-					}
-				} else if(proxy != null) {
-					proxy.stop();
-					proxy = null;
-				}
-
-				if(song.isVideo()) {
-					url = musicService.getHlsUrl(song.getId(), currentPlaying.getBitRate(), downloadService);
-				} else {
-					url = musicService.getMusicUrl(downloadService, song, currentPlaying.getBitRate());
-				}
-
-				// If proxy is going, it is a WebProxy
-				if(proxy != null) {
-					url = proxy.getPublicAddress(url);
-				}
-			}
+			String url = getStreamUrl(musicService, currentPlaying);
 
 			// Setup song/video information
 			MediaMetadata meta = new MediaMetadata(song.isVideo() ? MediaMetadata.MEDIA_TYPE_MOVIE : MediaMetadata.MEDIA_TYPE_MUSIC_TRACK);
diff --git a/app/src/main/java/github/daneren2005/dsub/service/DLNAController.java b/app/src/main/java/github/daneren2005/dsub/service/DLNAController.java
index 24890057..143be330 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DLNAController.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/DLNAController.java
@@ -83,9 +83,6 @@ public class DLNAController extends RemoteController {
 	SubscriptionCallback callback;
 	boolean supportsSeek = false;
 	boolean supportsSetupNext = false;
-
-	private ServerProxy proxy;
-	String rootLocation = "";
 	boolean error = false;
 
 	final AtomicLong lastUpdate = new AtomicLong();
@@ -108,12 +105,9 @@ public class DLNAController extends RemoteController {
 	};
 
 	public DLNAController(DownloadService downloadService, ControlPoint controlPoint, DLNADevice device) {
-		this.downloadService = downloadService;
+		super(downloadService);
 		this.controlPoint = controlPoint;
 		this.device = device;
-
-		SharedPreferences prefs = Util.getPreferences(downloadService);
-		rootLocation = prefs.getString(Constants.PREFERENCES_KEY_CACHE_LOCATION, null);
 		nextSupported = true;
 	}
 
@@ -473,49 +467,7 @@ public class DLNAController extends RemoteController {
 
 		// Get url for entry
 		MusicService musicService = MusicServiceFactory.getMusicService(downloadService);
-		String url;
-		// In offline mode or playing offline song
-		if(Util.isOffline(downloadService) || song.getId().indexOf(rootLocation) != -1) {
-			if(proxy == null) {
-				proxy = new FileProxy(downloadService);
-				proxy.start();
-			}
-
-			// Offline song
-			if(song.getId().indexOf(rootLocation) != -1) {
-				url = proxy.getPublicAddress(song.getId());
-			} else {
-				// Playing online song in offline mode
-				url = proxy.getPublicAddress(downloadFile.getCompleteFile().getPath());
-			}
-		} else {
-			// Check if we want a proxy going still
-			if(Util.isCastProxy(downloadService)) {
-				if(proxy instanceof FileProxy) {
-					proxy.stop();
-					proxy = null;
-				}
-
-				if(proxy == null) {
-					proxy = createWebProxy();
-					proxy.start();
-				}
-			} else if(proxy != null) {
-				proxy.stop();
-				proxy = null;
-			}
-
-			if(song.isVideo()) {
-				url = musicService.getHlsUrl(song.getId(), downloadFile.getBitRate(), downloadService);
-			} else {
-				url = musicService.getMusicUrl(downloadService, song, downloadFile.getBitRate());
-			}
-
-			// If proxy is going, it is a WebProxy
-			if(proxy != null) {
-				url = proxy.getPublicAddress(url);
-			}
-		}
+		String url = getStreamUrl(musicService, downloadFile);
 
 		// Create metadata for entry
 		Item track;
@@ -585,7 +537,7 @@ public class DLNAController extends RemoteController {
 			Log.w(TAG, "Metadata generation failed", e);
 		}
 
-		return new Pair<String, String>(url, metadata);
+		return new Pair<>(url, metadata);
 	}
 
 	private void failedLoad() {
diff --git a/app/src/main/java/github/daneren2005/dsub/service/JukeboxController.java b/app/src/main/java/github/daneren2005/dsub/service/JukeboxController.java
index 82ef45e1..b9f40f32 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/JukeboxController.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/JukeboxController.java
@@ -48,7 +48,7 @@ public class JukeboxController extends RemoteController {
 	private float gain = 0.5f;
     
     public JukeboxController(DownloadService downloadService, Handler handler) {
-    	this.downloadService = downloadService;
+		super(downloadService);
 		this.handler = handler;
     }
 
diff --git a/app/src/main/java/github/daneren2005/dsub/service/RemoteController.java b/app/src/main/java/github/daneren2005/dsub/service/RemoteController.java
index 2815bcc9..c6702e3e 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/RemoteController.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/RemoteController.java
@@ -19,20 +19,32 @@
 
 package github.daneren2005.dsub.service;
 
+import android.content.SharedPreferences;
 import android.util.Log;
 
 import java.util.Iterator;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import github.daneren2005.dsub.domain.MusicDirectory;
 import github.daneren2005.dsub.domain.RemoteStatus;
 import github.daneren2005.dsub.util.Constants;
 import github.daneren2005.dsub.util.Util;
+import github.daneren2005.serverproxy.FileProxy;
+import github.daneren2005.serverproxy.ServerProxy;
 import github.daneren2005.serverproxy.WebProxy;
 
 public abstract class RemoteController {
 	private static final String TAG = RemoteController.class.getSimpleName();
 	protected DownloadService downloadService;
 	protected boolean nextSupported = false;
+	protected ServerProxy proxy;
+	protected String rootLocation = "";
+
+	public RemoteController(DownloadService downloadService) {
+		this.downloadService = downloadService;
+		SharedPreferences prefs = Util.getPreferences(downloadService);
+		rootLocation = prefs.getString(Constants.PREFERENCES_KEY_CACHE_LOCATION, null);
+	}
 
 	public abstract void create(boolean playing, int seconds);
 	public abstract void start();
@@ -110,4 +122,56 @@ public abstract class RemoteController {
 			return new WebProxy(downloadService);
 		}
 	}
+
+	protected String getStreamUrl(MusicService musicService, DownloadFile downloadFile) throws Exception {
+		MusicDirectory.Entry song = downloadFile.getSong();
+
+		String url;
+		// In offline mode or playing offline song
+		if(downloadFile.isStream()) {
+			url = downloadFile.getStream();
+		} else if(Util.isOffline(downloadService) || song.getId().indexOf(rootLocation) != -1) {
+			if(proxy == null) {
+				proxy = new FileProxy(downloadService);
+				proxy.start();
+			}
+
+			// Offline song
+			if(song.getId().indexOf(rootLocation) != -1) {
+				url = proxy.getPublicAddress(song.getId());
+			} else {
+				// Playing online song in offline mode
+				url = proxy.getPublicAddress(downloadFile.getCompleteFile().getPath());
+			}
+		} else {
+			// Check if we want a proxy going still
+			if(Util.isCastProxy(downloadService)) {
+				if(proxy instanceof FileProxy) {
+					proxy.stop();
+					proxy = null;
+				}
+
+				if(proxy == null) {
+					proxy = createWebProxy();
+					proxy.start();
+				}
+			} else if(proxy != null) {
+				proxy.stop();
+				proxy = null;
+			}
+
+			if(song.isVideo()) {
+				url = musicService.getHlsUrl(song.getId(), downloadFile.getBitRate(), downloadService);
+			} else {
+				url = musicService.getMusicUrl(downloadService, song, downloadFile.getBitRate());
+			}
+
+			// If proxy is going, it is a WebProxy
+			if(proxy != null) {
+				url = proxy.getPublicAddress(url);
+			}
+		}
+
+		return url;
+	}
 }