Initial work on audio/subtitle stream support (Chromecast not working yet).

Author: Chris Bellew

Voice Control For Plex/mobile.iml

@@ -99,8 +99,8 @@
     <orderEntry type="library" exported="" name="library-1.0.30" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="mediarouter-v7-23.0.0" level="project" />
-    <orderEntry type="library" exported="" name="stax-1.2.0" level="project" />
     <orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
+    <orderEntry type="library" exported="" name="stax-1.2.0" level="project" />
     <orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-wearable-7.8.0" level="project" />
     <orderEntry type="library" exported="" name="simple-xml-2.7.1" level="project" />

mobile/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     useLibrary  'org.apache.http.legacy'
     compileSdkVersion 23
-    buildToolsVersion '23.0.0'
+    buildToolsVersion '23.0.2'
     defaultConfig {
         applicationId "com.atomjack.vcfp"
         minSdkVersion 15
@@ -107,7 +107,7 @@ dependencies {
     wearApp project(':wear')
     compile 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
     compile 'com.squareup.retrofit:retrofit:2.0.0-beta1'
-    compile ('com.squareup.retrofit:converter-simplexml:2.0.0-beta1') {
+    compile('com.squareup.retrofit:converter-simplexml:2.0.0-beta1') {
         exclude group: 'xpp3', module: 'xpp3'
         exclude group: 'stax', module: 'stax-api'
         exclude group: 'stax', module: 'stax'

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

@@ -347,7 +347,7 @@ public void doPrevious(View v) {
     castPlayerManager.doPrevious();
   }
 
-	@Override
+  @Override
 	public void onStopTrackingTouch(SeekBar _seekBar) {
 		Logger.d("stopped changing progress: %d", _seekBar.getProgress());
 		try {

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

@@ -191,7 +191,7 @@ public void onFailure(Throwable error) {
     });
 	}
 
-	@Override
+  @Override
 	protected void onPause() {
 		super.onPause();
     Logger.d("NowPlaying onPause");

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

@@ -1,16 +1,21 @@
 package com.atomjack.vcfp.activities;
 
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.speech.RecognizerIntent;
 import android.support.v4.view.GestureDetectorCompat;
 import android.view.GestureDetector;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ImageButton;
 import android.widget.SeekBar;
+import android.widget.Spinner;
 import android.widget.TextView;
 
 import com.atomjack.shared.Logger;
@@ -19,15 +24,18 @@
 import com.atomjack.shared.WearConstants;
 import com.atomjack.vcfp.R;
 import com.atomjack.vcfp.VoiceControlForPlexApplication;
+import com.atomjack.vcfp.adapters.StreamAdapter;
 import com.atomjack.vcfp.model.PlexMedia;
 import com.atomjack.vcfp.model.PlexServer;
 import com.atomjack.vcfp.model.PlexTrack;
 import com.atomjack.vcfp.model.PlexVideo;
+import com.atomjack.vcfp.model.Stream;
 import com.atomjack.vcfp.services.PlexSearchService;
 import com.google.android.gms.wearable.DataMap;
 
 import java.math.BigInteger;
 import java.security.SecureRandom;
+import java.util.List;
 
 public abstract class PlayerActivity extends VCFPActivity implements SeekBar.OnSeekBarChangeListener {
 	protected boolean resumePlayback;
@@ -39,6 +47,8 @@ public abstract class PlayerActivity extends VCFPActivity implements SeekBar.OnS
 
   protected GestureDetectorCompat mDetector;
 
+  protected Dialog mediaOptionsDialog;
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -73,6 +83,64 @@ public void doMic(View v) {
 		}
 	}
 
+  // Open an alert to allow selection of currently playing media's audio and/or subtitle options
+  public void doMediaOptions(View v) {
+    if(nowPlayingMedia == null) {
+      return;
+    }
+
+    final List<Stream> audioStreams = nowPlayingMedia.getStreams(Stream.AUDIO);
+    final List<Stream> subtitleStreams = nowPlayingMedia.getStreams(Stream.SUBTITLE);
+
+    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    LayoutInflater inflater = getLayoutInflater();
+    View layout = inflater.inflate(R.layout.media_options_dialog, null);
+
+    Spinner subtitlesSpinner = (Spinner)layout.findViewById(R.id.subtitlesSpinner);
+    StreamAdapter subtitlesStreamAdapter = new StreamAdapter(this, android.R.layout.simple_spinner_dropdown_item, subtitleStreams);
+    subtitlesSpinner.setAdapter(subtitlesStreamAdapter);
+    subtitlesSpinner.setSelection(subtitleStreams.indexOf(nowPlayingMedia.getActiveStream(Stream.SUBTITLE)), false);
+
+    subtitlesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+      @Override
+      public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        Stream stream = subtitleStreams.get(position);
+        if(!stream.isActive()) {
+          mClient.setStream(stream);
+          nowPlayingMedia.setActiveStream(stream);
+        }
+      }
+
+      @Override
+      public void onNothingSelected(AdapterView<?> parent) {
+      }
+    });
+    Spinner audioSpinner = (Spinner)layout.findViewById(R.id.audioSpinner);
+    StreamAdapter audioStreamAdapter = new StreamAdapter(this, android.R.layout.simple_spinner_dropdown_item, audioStreams);
+    audioSpinner.setAdapter(audioStreamAdapter);
+    audioSpinner.setSelection(audioStreams.indexOf(nowPlayingMedia.getActiveStream(Stream.AUDIO)), false);
+
+    audioSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+      @Override
+      public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        Stream stream = audioStreams.get(position);
+        if(!stream.isActive()) {
+          mClient.setStream(stream);
+          nowPlayingMedia.setActiveStream(stream);
+        }
+      }
+
+      @Override
+      public void onNothingSelected(AdapterView<?> parent) {
+      }
+    });
+
+    builder.setView(layout);
+    builder.setTitle(getResources().getString(R.string.stream_selection));
+    mediaOptionsDialog = builder.create();
+    mediaOptionsDialog.show();
+  }
+
 	private void attachUIElements() {
 		playPauseButton = (ImageButton)findViewById(R.id.playPauseButton);
 		currentTimeDisplay = (TextView)findViewById(R.id.currentTimeView);

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

@@ -77,7 +77,8 @@
 
 import cz.fhucho.android.util.SimpleDiskCache;
 
-public abstract class VCFPActivity extends AppCompatActivity implements PlexSubscription.PlexListener, CastPlayerManager.CastListener, VoiceControlForPlexApplication.NetworkChangeListener {
+public abstract class VCFPActivity extends AppCompatActivity implements PlexSubscription.PlexListener,
+        CastPlayerManager.CastListener, VoiceControlForPlexApplication.NetworkChangeListener {
 	protected PlexMedia nowPlayingMedia;
 	protected boolean subscribing = false;
 	protected PlexClient mClient;

mobile/src/main/java/com/atomjack/vcfp/adapters/StreamAdapter.java

@@ -0,0 +1,56 @@
+package com.atomjack.vcfp.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import com.atomjack.vcfp.model.Stream;
+
+import java.util.List;
+
+public class StreamAdapter extends ArrayAdapter<Stream> {
+  Context context;
+  private List<Stream> streams;
+
+  public StreamAdapter(Context c, int resource, List<Stream> s) {
+    super(c, resource, s);
+    streams = s;
+    context = c;
+  }
+
+  @Override
+  public int getCount() {
+    return streams.size();
+  }
+
+  @Override
+  public Stream getItem(int position) {
+    return streams.get(position);
+  }
+
+  @Override
+  public long getItemId(int position) {
+    return position;
+  }
+
+  @Override
+  public View getDropDownView(int position, View convertView, ViewGroup parent) {
+    if (convertView == null) {
+      LayoutInflater vi = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+      convertView = vi.inflate(com.atomjack.vcfp.R.layout.stream_dropdown_item, parent, false);
+    }
+    ((TextView) convertView).setText(streams.get(position).getTitle());
+    return convertView;
+
+  }
+
+  @Override
+  public View getView(int position, View convertView, ViewGroup parent) {
+    TextView textView = (TextView) View.inflate(context, android.R.layout.simple_spinner_item, null);
+    textView.setText(streams.get(position).getTitle());
+    return textView;
+  }
+}

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

@@ -14,8 +14,11 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 
 import retrofit.Call;
+import retrofit.Callback;
+import retrofit.Response;
 
 @Root(name="Server", strict=false)
 public class PlexClient extends PlexDevice {
@@ -162,4 +165,31 @@ public String toString() {
 
 		return output;
 	}
+
+  public void setStream(Stream stream) {
+    if(isCastClient) {
+      // TODO: Implement
+    } else {
+      PlexHttpClient.PlexHttpService service = PlexHttpClient.getService(String.format("http://%s:%s", address, port));
+      HashMap<String, String> qs = new HashMap<>();
+      if (stream.streamType == Stream.AUDIO) {
+        qs.put("audioStreamID", stream.id);
+      } else if (stream.streamType == Stream.SUBTITLE) {
+        qs.put("subtitleStreamID", stream.id);
+      }
+      Call<PlexResponse> call = service.setStreams(qs);
+      call.enqueue(new Callback<PlexResponse>() {
+        @Override
+        public void onResponse(Response<PlexResponse> response) {
+          Logger.d("setStream response: %s", response.body().status);
+        }
+
+        @Override
+        public void onFailure(Throwable t) {
+
+        }
+      });
+
+    }
+  }
 }

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

@@ -167,24 +167,63 @@ public int describeContents() {
 		return 0;
 	}
 
+  private List<Stream> streams;
+
   public List<Stream> getStreams() {
-    Media m = media.get(0);
-    Part p = m.parts.get(0);
-    return p.streams;
+    // The list of streams needs to have a "none" subtitle stream added to it. Subsequent calls
+    // to get the list of streams should get this list, since any manipulation of which (audio/video)
+    // stream is active will need to be saved to it - the list of streams in media/parts will not reflect
+    // the updating of active streams.
+    if (streams == null) {
+      streams = new ArrayList<>();
+      Media m = media.get(0);
+      Part p = m.parts.get(0);
+
+      List<Stream> ss = new ArrayList<>();
+      Stream none = Stream.getNoneSubtitleStream();
+      for (int i = 0; i < p.streams.size(); i++) {
+        if (p.streams.get(i).streamType == Stream.SUBTITLE && !ss.contains(none)) {
+          ss.add(none);
+        }
+        ss.add(p.streams.get(i));
+      }
+      boolean subsActive = false;
+      for (Stream s : ss) {
+        if(s.streamType == Stream.SUBTITLE && s.isActive())
+          subsActive = true;
+      }
+      if(!subsActive)
+        none.setActive(true);
+      streams = ss;
+    }
+    return streams;
   }
 
   public List<Stream> getStreams(int streamType) {
     List<Stream> s = new ArrayList<Stream>();
-    try {
-      Media m = media.get(0);
-      Part p = m.parts.get(0);
+    for (Stream stream : getStreams()) {
+      if (stream.streamType == streamType)
+        s.add(stream);
+    }
+    return s;
+  }
+
+  public Stream getActiveStream(int streamType) {
+    List<Stream> streams = getStreams(streamType);
+    for(Stream stream : streams) {
+      if(stream.isActive())
+        return stream;
+    }
 
-      for (Stream stream : p.streams) {
-        if (stream.streamType == streamType)
-          s.add(stream);
+    return streams.get(0);
+  }
+
+  public void setActiveStream(Stream s) {
+    for(Stream ss : streams) {
+      if(ss.streamType == s.streamType) {
+        ss.setActive(s.id.equals(ss.id));
       }
-    } catch (Exception ex) {}
-    return s;
+    }
   }
 
   public PlexMedia() {
@@ -279,7 +318,7 @@ class Part implements Parcelable {
   @Attribute(required=false)
   public String id;
   @ElementList(required=false, inline=true, entry="Stream")
-  public List<Stream> streams = new ArrayList<Stream>();
+  public List<Stream> streams = new ArrayList<>();
   @Attribute(required=false)
   public String key;
   @Attribute(required=false)
@@ -291,7 +330,7 @@ public Part() {
 
   public Part(Parcel in) {
     id = in.readString();
-    streams = new ArrayList<Stream>();
+    streams = new ArrayList<>();
     in.readTypedList(streams, Stream.CREATOR);
     key = in.readString();
     duration = in.readInt();