Updated Chromecast playback to support Cinema Trailers. Improved display of playback control elements on smaller screens.

Author: Chris Bellew

mobile/src/main/AndroidManifest.xml

@@ -49,7 +49,7 @@
         </service>
         <activity
             android:name=".activities.NowPlayingActivity"
-            android:configChanges="orientation|screenSize"
+            android:configChanges="screenSize"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />

mobile/src/main/java/com/atomjack/vcfp/CastPlayerManager.java

@@ -176,6 +176,7 @@ public interface CastListener {
     void onCastPlayerTimeUpdate(int seconds);
     void onCastPlayerPlaylistAdvance(PlexMedia media);
     void onCastPlayerState(PlayerState state, PlexMedia media);
+    void onCastConnectionFailed();
     PlexMedia getNowPlayingMedia();
   };
 
@@ -311,9 +312,12 @@ public void onDataMessageReceived(String message) {
             }
           } else if(obj.has("event") && obj.getString("event").equals("timeUpdate") && obj.has("currentTime")) {
             listener.onCastPlayerTimeUpdate(obj.getInt("currentTime"));
-          } else if(obj.has("event") && obj.getString("event").equals("playlistAdvance") && obj.has("media")) {
+          } else if(obj.has("event") && obj.getString("event").equals("playlistAdvance") && obj.has("media") && obj.has("type")) {
             Logger.d("[CastPlayerManager] playlistAdvance");
-            nowPlayingMedia = VoiceControlForPlexApplication.gsonRead.fromJson(obj.getString("media"), PlexTrack.class);
+            if(obj.getString("type").equals(PARAMS.MEDIA_TYPE_VIDEO))
+              nowPlayingMedia = VoiceControlForPlexApplication.gsonRead.fromJson(obj.getString("media"), PlexVideo.class);
+            else
+              nowPlayingMedia = VoiceControlForPlexApplication.gsonRead.fromJson(obj.getString("media"), PlexTrack.class);
             listener.onCastPlayerPlaylistAdvance(nowPlayingMedia);
           } else if(obj.has("event") && obj.getString("event").equals("getPlaybackState") && obj.has("state")) {
             currentState = PlayerState.getState(obj.getString("state"));
@@ -383,6 +387,13 @@ public void onApplicationStatusChanged(String appStatus) {
         Logger.d("CastPlayerManager onApplicationStatusChanged: %s", appStatus);
       }
 
+      @Override
+      public boolean onApplicationConnectionFailed(int errorCode) {
+        Logger.d("[CastPlayerManager] onApplicationConnectionFailed: %d", errorCode);
+        listener.onCastConnectionFailed();
+        return false;
+      }
+
       @Override
       public void onVolumeChanged(double value, boolean isMute) {
         super.onVolumeChanged(value, isMute);
@@ -396,10 +407,6 @@ public void onCastDeviceDetected(final MediaRouter.RouteInfo info) {
     };
   }
 
-  public String getTranscodeUrl(PlexMedia media, Connection connection) {
-    return getTranscodeUrl(media, connection, 0);
-  }
-
   public String getTranscodeUrl(PlexMedia media, Connection connection, int offset) {
     String url = connection.uri;
     url += String.format("/%s/:/transcode/universal/start?", media instanceof PlexVideo ? "video" : "audio");
@@ -463,15 +470,7 @@ public JSONObject buildMedia(Connection connection, int offset) {
   }
 
   private String getPlaylistJson() {
-    String json = "{}";
-    if(nowPlayingMedia instanceof PlexTrack) {
-      json = VoiceControlForPlexApplication.gsonWrite.toJson(nowPlayingAlbum);
-    } else {
-      ArrayList<PlexMedia> playlist = new ArrayList<PlexMedia>();
-      playlist.add(nowPlayingMedia);
-      json = VoiceControlForPlexApplication.gsonWrite.toJson(playlist);
-    }
-    return json;
+    return VoiceControlForPlexApplication.gsonWrite.toJson(nowPlayingAlbum);
   }
 
   public PlayerState getCurrentState() {

mobile/src/main/java/com/atomjack/vcfp/VoiceControlForPlexApplication.java

@@ -73,6 +73,7 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 import cz.fhucho.android.util.SimpleDiskCache;
@@ -809,4 +810,13 @@ public static void SetWearMediaTitles(DataMap dataMap, PlexMedia media) {
       dataMap.putString(WearConstants.MEDIA_SUBTITLE, media.title);
     }
   }
+
+  public static String getUUID() {
+    String uuid = VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.UUID, null);
+    if(uuid == null) {
+      uuid = UUID.randomUUID().toString();
+      VoiceControlForPlexApplication.getInstance().prefs.put(Preferences.UUID, uuid);
+    }
+    return uuid;
+  }
 }

mobile/src/main/java/com/atomjack/vcfp/activities/CastActivity.java

@@ -47,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
       new SendToDataLayerThread(WearConstants.FINISH, this).start();
     }
     // If just playing a single track, put the media into an array
-    if(nowPlayingMedia.isMusic() && nowPlayingAlbum == null)
+    if(nowPlayingAlbum == null)
       nowPlayingAlbum = Arrays.asList(nowPlayingMedia);
 
     Logger.d("[CastActivity] starting up, action: %s, current state: %s", getIntent().getAction(), castPlayerManager.getCurrentState());

mobile/src/main/java/com/atomjack/vcfp/activities/MainActivity.java

@@ -458,6 +458,22 @@ public void logout(MenuItem item) {
 		feedback.m(R.string.logged_out);
 	}
 
+  public void cinemaTrailers(MenuItem item) {
+    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    builder.setTitle(getString(R.string.cinema_trailers_title));
+    final CharSequence[] items = {getString(R.string.none), "1", "2", "3", "4", "5"};
+    int numTrailers = VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.NUM_CINEMA_TRAILERS, 0);
+    builder.setSingleChoiceItems(items, numTrailers, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        Logger.d("clicked %d", which);
+        VoiceControlForPlexApplication.getInstance().prefs.put(Preferences.NUM_CINEMA_TRAILERS, which);
+        dialog.dismiss();
+      }
+    });
+    builder.create().show();
+  }
+
   public void purchaseWear(MenuItem item) {
     showWearPurchaseRequired();
   }

mobile/src/main/java/com/atomjack/vcfp/activities/PlayerActivity.java

@@ -94,19 +94,19 @@ public void showNowPlaying() {
   public void showNowPlaying(boolean setView) {
     if (nowPlayingMedia instanceof PlexVideo) {
       PlexVideo video = (PlexVideo)nowPlayingMedia;
-      if(video.isMovie()) {
-        if(setView)
+      if(video.isMovie() || video.isClip()) {
+        if (setView)
           setContentView(R.layout.now_playing_movie);
 
-        TextView title = (TextView)findViewById(R.id.nowPlayingTitle);
+        TextView title = (TextView) findViewById(R.id.nowPlayingTitle);
         title.setText(video.title);
-        TextView genre = (TextView)findViewById(R.id.nowPlayingGenre);
+        TextView genre = (TextView) findViewById(R.id.nowPlayingGenre);
         genre.setText(video.getGenres());
-        TextView year = (TextView)findViewById(R.id.nowPlayingYear);
+        TextView year = (TextView) findViewById(R.id.nowPlayingYear);
         year.setText(video.year);
-        TextView duration = (TextView)findViewById(R.id.nowPlayingDuration);
+        TextView duration = (TextView) findViewById(R.id.nowPlayingDuration);
         duration.setText(video.getDuration());
-        TextView summary = (TextView)findViewById(R.id.nowPlayingSummary);
+        TextView summary = (TextView) findViewById(R.id.nowPlayingSummary);
         summary.setText(video.summary);
       } else {
         if(setView)

mobile/src/main/java/com/atomjack/vcfp/activities/VCFPActivity.java

@@ -486,6 +486,15 @@ public void onCastConnected(PlexClient _client) {
 //    castPlayerManager.getPlaybackState();
   }
 
+  @Override
+  public void onCastConnectionFailed() {
+    Logger.d("[VCFPActivity] onCastConnectionFailed");
+    setCastIconActive();
+    if(castPlayerManager.mClient != null)
+      feedback.e(getString(R.string.couldnt_connect_to), castPlayerManager.mClient.name);
+    subscribing = false;
+  }
+
   @Override
   public void onCastPlayerState(PlayerState state, PlexMedia media) {
     mCurrentState = state;

mobile/src/main/java/com/atomjack/vcfp/interfaces/PlexPlayQueueHandler.java

@@ -0,0 +1,7 @@
+package com.atomjack.vcfp.interfaces;
+
+import com.atomjack.vcfp.model.MediaContainer;
+
+public interface PlexPlayQueueHandler {
+  public void onSuccess(MediaContainer mediaContainer);
+}

mobile/src/main/java/com/atomjack/vcfp/model/MediaContainer.java

@@ -53,6 +53,9 @@ public class MediaContainer {
   @Attribute(required=false)
   public String art;
 
+  @Attribute(required=false)
+  public String playQueueID;
+
 	public Timeline getTimeline(String type) {
 		if(timelines != null) {
 			for (Timeline t : timelines) {

mobile/src/main/java/com/atomjack/vcfp/model/PlexMedia.java

@@ -282,6 +282,8 @@ class Part implements Parcelable {
   public List<Stream> streams = new ArrayList<Stream>();
   @Attribute(required=false)
   public String key;
+  @Attribute(required=false)
+  public int duration;
 
   public Part() {
 
@@ -292,6 +294,7 @@ public Part(Parcel in) {
     streams = new ArrayList<Stream>();
     in.readTypedList(streams, Stream.CREATOR);
     key = in.readString();
+    duration = in.readInt();
   }
 
   @Override
@@ -304,6 +307,7 @@ public void writeToParcel(Parcel out, int flags) {
     out.writeString(id);
     out.writeTypedList(streams);
     out.writeString(key);
+    out.writeInt(duration);
   }
 
   public static final Parcelable.Creator<Part> CREATOR = new Parcelable.Creator<Part>() {