From 3c1de917b661cb105aaa80542d87a1e4bf6c2c77 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sat, 15 Feb 2014 11:45:30 -0800 Subject: Fix a bunch of casting bugs, start of album art --- .../dsub/service/CachedMusicService.java | 7 ++- .../dsub/service/ChromeCastController.java | 58 ++++++++++++++-------- .../daneren2005/dsub/service/MusicService.java | 2 + .../daneren2005/dsub/service/RESTMusicService.java | 8 +++ .../daneren2005/dsub/util/MediaRouteManager.java | 2 + 5 files changed, 56 insertions(+), 21 deletions(-) (limited to 'src/github') diff --git a/src/github/daneren2005/dsub/service/CachedMusicService.java b/src/github/daneren2005/dsub/service/CachedMusicService.java index 4417ac78..0826e967 100644 --- a/src/github/daneren2005/dsub/service/CachedMusicService.java +++ b/src/github/daneren2005/dsub/service/CachedMusicService.java @@ -283,7 +283,12 @@ public class CachedMusicService implements MusicService { return musicService.getRandomSongs(size, folder, genre, startYear, endYear, context, progressListener); } - @Override + @Override + public String getCoverArtUrl(Context context, MusicDirectory.Entry entry) throws Exception { + return musicService.getCoverArtUrl(context, entry); + } + + @Override public Bitmap getCoverArt(Context context, MusicDirectory.Entry entry, int size, ProgressListener progressListener) throws Exception { return musicService.getCoverArt(context, entry, size, progressListener); } diff --git a/src/github/daneren2005/dsub/service/ChromeCastController.java b/src/github/daneren2005/dsub/service/ChromeCastController.java index 550414c4..c70ccdcd 100644 --- a/src/github/daneren2005/dsub/service/ChromeCastController.java +++ b/src/github/daneren2005/dsub/service/ChromeCastController.java @@ -32,7 +32,11 @@ import com.google.android.gms.common.api.Status; import java.io.IOException; +import github.daneren2005.dsub.R; import github.daneren2005.dsub.domain.MusicDirectory; +import github.daneren2005.dsub.domain.PlayerState; +import github.daneren2005.dsub.util.Constants; +import github.daneren2005.dsub.util.Util; import github.daneren2005.dsub.util.compat.CastCompat; /** @@ -49,6 +53,7 @@ public class ChromeCastController extends RemoteController { private boolean applicationStarted = false; private boolean waitingForReconnect = false; + private boolean error = false; private RemoteMediaPlayer mediaPlayer; private double gain = 0.5; @@ -93,10 +98,17 @@ public class ChromeCastController extends RemoteController { @Override public void start() { + if(error) { + error = false; + Log.w(TAG, "Attempting to restart song"); + startSong(downloadService.getCurrentPlaying(), true); + return; + } + try { mediaPlayer.play(apiClient); } catch(Exception e) { - Log.e(TAG, "Failed to pause"); + Log.e(TAG, "Failed to start"); } } @@ -112,7 +124,7 @@ public class ChromeCastController extends RemoteController { @Override public void shutdown() { try { - if(mediaPlayer != null) { + if(mediaPlayer != null && !error) { mediaPlayer.stop(apiClient); } } catch(Exception e) { @@ -120,17 +132,20 @@ public class ChromeCastController extends RemoteController { } try { - Cast.CastApi.stopApplication(apiClient); - Cast.CastApi.removeMessageReceivedCallbacks(apiClient, mediaPlayer.getNamespace()); - mediaPlayer = null; - applicationStarted = false; - } catch(IOException e) { + if(apiClient != null) { + Cast.CastApi.stopApplication(apiClient); + Cast.CastApi.removeMessageReceivedCallbacks(apiClient, mediaPlayer.getNamespace()); + mediaPlayer = null; + applicationStarted = false; + } + } catch(Exception e) { Log.e(TAG, "Failed to shutdown application", e); } - if(apiClient.isConnected()) { + if(apiClient != null && apiClient.isConnected()) { apiClient.disconnect(); } + apiClient = null; } @Override @@ -159,7 +174,7 @@ public class ChromeCastController extends RemoteController { gain = Math.max(gain, 0.0); gain = Math.min(gain, 1.0); - getVolumeToast().setVolume(gain); + getVolumeToast().setVolume((float) gain); try { Cast.CastApi.setVolume(apiClient, gain); } catch(Exception e) { @@ -169,8 +184,8 @@ public class ChromeCastController extends RemoteController { @Override public int getRemotePosition() { - if(remotePlayer != null) { - return remotePlayer.getApproximateStreamPosition(); + if(mediaPlayer != null) { + return (int) (mediaPlayer.getApproximateStreamPosition() / 1000L); } else { return 0; } @@ -181,11 +196,12 @@ public class ChromeCastController extends RemoteController { // Don't start anything return; } + downloadService.setPlayerState(PlayerState.PREPARING); MusicDirectory.Entry song = currentPlaying.getSong(); try { MusicService musicService = MusicServiceFactory.getMusicService(downloadService); - String url = song.isVideo() ? musicVideo.getHlsUrl(song.getId(), downloadFile.getBitRate(), downloadService) : musicService.getMusicUrl(downloadService, song, currentPlaying.getBitRate()); + String url = song.isVideo() ? musicService.getHlsUrl(song.getId(), currentPlaying.getBitRate(), downloadService) : musicService.getMusicUrl(downloadService, song, currentPlaying.getBitRate()); // Use separate profile for Chromecast so users can do ogg on phone, mp3 for CC url = url.replace(Constants.REST_CLIENT_ID, Constants.CHROMECAST_CLIENT_ID); @@ -208,7 +224,7 @@ public class ChromeCastController extends RemoteController { .setMetadata(meta) .build(); - mediaPlayer.load(apiClient, mediaInfo, autoPlay).setResultCallback(new ResultCallback() { + mediaPlayer.load(apiClient, mediaInfo, autoStart).setResultCallback(new ResultCallback() { @Override public void onResult(RemoteMediaPlayer.MediaChannelResult result) { if (result.getStatus().isSuccess()) { @@ -217,9 +233,11 @@ public class ChromeCastController extends RemoteController { } else { downloadService.setPlayerState(PlayerState.PREPARED); } - } else { + } else if(result.getStatus().getStatusCode() != ConnectionResult.SIGN_IN_REQUIRED) { Log.e(TAG, "Failed to load"); downloadService.setPlayerState(PlayerState.STOPPED); + error = true; + Util.toast(downloadService, downloadService.getResources().getString(R.string.download_failed_to_load)); } } }); @@ -276,17 +294,18 @@ public class ChromeCastController extends RemoteController { @Override public void onStatusUpdated() { MediaStatus mediaStatus = mediaPlayer.getMediaStatus(); + Log.d(TAG, "state: " + mediaStatus.getPlayerState()); switch(mediaStatus.getPlayerState()) { - case PLAYER_STATE_PLAYING: + case MediaStatus.PLAYER_STATE_PLAYING: downloadService.setPlayerState(PlayerState.STARTED); break; - case PLAYER_STATE_PAUSED: + case MediaStatus.PLAYER_STATE_PAUSED: downloadService.setPlayerState(PlayerState.PAUSED); break; - case PLAYER_STATE_BUFFERING: + case MediaStatus.PLAYER_STATE_BUFFERING: downloadService.setPlayerState(PlayerState.PREPARING); break; - case PLAYER_STATE_IDLE: + case MediaStatus.PLAYER_STATE_IDLE: downloadService.setPlayerState(PlayerState.COMPLETED); downloadService.next(); break; @@ -297,7 +316,6 @@ public class ChromeCastController extends RemoteController { @Override public void onMetadataUpdated() { MediaInfo mediaInfo = mediaPlayer.getMediaInfo(); - MediaMetadata metadata = mediaInfo.getMetadata(); // TODO: Do I care about this? } }); @@ -309,7 +327,7 @@ public class ChromeCastController extends RemoteController { } DownloadFile currentPlaying = downloadService.getCurrentPlaying(); - startSong(currentPlaying, false); + startSong(currentPlaying, true); } } diff --git a/src/github/daneren2005/dsub/service/MusicService.java b/src/github/daneren2005/dsub/service/MusicService.java index a1e54a81..d5fdc251 100644 --- a/src/github/daneren2005/dsub/service/MusicService.java +++ b/src/github/daneren2005/dsub/service/MusicService.java @@ -91,6 +91,8 @@ public interface MusicService { MusicDirectory getRandomSongs(int size, String folder, String genre, String startYear, String endYear, Context context, ProgressListener progressListener) throws Exception; + String getCoverArtUrl(Context context, MusicDirectory.Entry entry) throws Exception; + Bitmap getCoverArt(Context context, MusicDirectory.Entry entry, int size, ProgressListener progressListener) throws Exception; HttpResponse getDownloadInputStream(Context context, MusicDirectory.Entry song, long offset, int maxBitrate, CancellableTask task) throws Exception; diff --git a/src/github/daneren2005/dsub/service/RESTMusicService.java b/src/github/daneren2005/dsub/service/RESTMusicService.java index 8555f9e2..5c909d1f 100644 --- a/src/github/daneren2005/dsub/service/RESTMusicService.java +++ b/src/github/daneren2005/dsub/service/RESTMusicService.java @@ -644,6 +644,14 @@ public class RESTMusicService implements MusicService { } } + @Override + public String getCoverArtUrl(Context context, MusicDirectory.Entry entry) throws Exception { + StringBuilder builder = new StringBuilder(getRestUrl(context, "getCoverArt")); + builder.append("&id=").append(entry.getId()); + String url = rewriteUrlWithRedirect(context, builder.toString()); + return url; + } + @Override public Bitmap getCoverArt(Context context, MusicDirectory.Entry entry, int size, ProgressListener progressListener) throws Exception { diff --git a/src/github/daneren2005/dsub/util/MediaRouteManager.java b/src/github/daneren2005/dsub/util/MediaRouteManager.java index ab6d6a10..7c0d33e6 100644 --- a/src/github/daneren2005/dsub/util/MediaRouteManager.java +++ b/src/github/daneren2005/dsub/util/MediaRouteManager.java @@ -18,6 +18,7 @@ package github.daneren2005.dsub.util; import android.support.v7.media.MediaControlIntent; import android.support.v7.media.MediaRouteSelector; import android.support.v7.media.MediaRouter; +import android.util.Log; import github.daneren2005.dsub.domain.RemoteControlState; import github.daneren2005.dsub.provider.JukeboxRouteProvider; @@ -29,6 +30,7 @@ import github.daneren2005.dsub.util.compat.CastCompat; * Created by owner on 2/8/14. */ public class MediaRouteManager extends MediaRouter.Callback { + private static final String TAG = MediaRouteManager.class.getSimpleName(); private static boolean castAvailable = false; private DownloadServiceImpl downloadService; -- cgit v1.2.3