From 7c47f4d7a243010d8fc81793920958b0ace1194a Mon Sep 17 00:00:00 2001
From: Adam Brown <adam@novoda.com>
Date: Thu, 1 Jun 2017 16:24:13 +0100
Subject: [PATCH 1/3] adding button to main activity layout for selecting audio
 tracks

---
 demo/src/main/res/layout/activity_main.xml | 28 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
index c98d522f..f64b6194 100644
--- a/demo/src/main/res/layout/activity_main.xml
+++ b/demo/src/main/res/layout/activity_main.xml
@@ -1,10 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <com.novoda.noplayer.NoPlayerView
-    android:id="@+id/player_view"
-    android:layout_width="wrap_content"
+  <LinearLayout
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="center" />
+    android:orientation="vertical">
+
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal">
+
+      <Button
+        android:id="@+id/button_audio_selection"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Audio" />
+
+    </LinearLayout>
+
+    <com.novoda.noplayer.NoPlayerView
+      android:id="@+id/player_view"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center" />
+
+  </LinearLayout>
 
 </merge>

From b44edac37aebd4cd2ef919ce10b47045e3051de0 Mon Sep 17 00:00:00 2001
From: Adam Brown <adam@novoda.com>
Date: Thu, 1 Jun 2017 16:24:37 +0100
Subject: [PATCH 2/3] showing audio tracks in dialog and selecting them on the
 player on click

---
 .../java/com/novoda/demo/MainActivity.java    | 49 ++++++++++++++++++-
 demo/src/main/res/layout/list_item.xml        |  9 ++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 demo/src/main/res/layout/list_item.xml

diff --git a/demo/src/main/java/com/novoda/demo/MainActivity.java b/demo/src/main/java/com/novoda/demo/MainActivity.java
index b69266db..4ad2fa3b 100644
--- a/demo/src/main/java/com/novoda/demo/MainActivity.java
+++ b/demo/src/main/java/com/novoda/demo/MainActivity.java
@@ -1,24 +1,34 @@
 package com.novoda.demo;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.ArrayAdapter;
 
 import com.novoda.noplayer.ContentType;
 import com.novoda.noplayer.Player;
+import com.novoda.noplayer.PlayerAudioTrack;
 import com.novoda.noplayer.PlayerState;
 import com.novoda.noplayer.PlayerView;
 import com.novoda.noplayer.player.PlayerFactory;
 import com.novoda.noplayer.player.PrioritisedPlayers;
+import com.novoda.notils.caster.Views;
 import com.novoda.notils.logger.simple.Log;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class MainActivity extends Activity {
 
     private static final String URI_VIDEO_MP4 = "http://yt-dash-mse-test.commondatastorage.googleapis.com/media/car-20120827-85.mp4";
-    private static final String URI_VIDEO_MPD = "https://storage.googleapis.com/content-samples/multi-audio/multi-audio.mpd";
+    private static final String URI_VIDEO_MPD = "https://storage.googleapis.com/content-samples/multi-audio/manifest.mpd";
 
     private Player player;
     private PlayerView playerView;
+    private View audioSelectionButton;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -26,6 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
         Log.setShowLogs(true);
         setContentView(R.layout.activity_main);
         playerView = (PlayerView) findViewById(R.id.player_view);
+        audioSelectionButton = Views.findById(this, R.id.button_audio_selection);
     }
 
     @Override
@@ -39,15 +50,51 @@ public void onPrepared(PlayerState playerState) {
                 player.play();
             }
         });
+
         player.attach(playerView);
 
+        audioSelectionButton.setOnClickListener(showAudioSelectionDialog);
+
         Uri uri = Uri.parse(URI_VIDEO_MPD);
         player.loadVideo(uri, ContentType.DASH);
     }
 
+    private final View.OnClickListener showAudioSelectionDialog = new View.OnClickListener() {
+
+        @Override
+        public void onClick(View v) {
+            showAudioSelectionDialog();
+        }
+
+        private void showAudioSelectionDialog() {
+            final List<PlayerAudioTrack> audioTracks = player.getAudioTracks();
+            ArrayAdapter<String> adapter = new ArrayAdapter<>(MainActivity.this, R.layout.list_item);
+            adapter.addAll(mapAudioTrackToLabel(audioTracks));
+            AlertDialog audioSelectionDialog = new AlertDialog.Builder(MainActivity.this)
+                    .setTitle("Select audio track")
+                    .setAdapter(adapter, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int position) {
+                            PlayerAudioTrack audioTrack = audioTracks.get(position);
+                            player.selectAudioTrack(audioTrack);
+                        }
+                    }).create();
+            audioSelectionDialog.show();
+        }
+
+        private List<String> mapAudioTrackToLabel(List<PlayerAudioTrack> audioTracks) {
+            List<String> labels = new ArrayList<>();
+            for (PlayerAudioTrack audioTrack : audioTracks) {
+                labels.add("Group: " + audioTrack.groupIndex() + " Format: " + audioTrack.formatIndex());
+            }
+            return labels;
+        }
+    };
+
     @Override
     protected void onStop() {
         super.onStop();
         player.release();
+        audioSelectionButton.setOnClickListener(null);
     }
 }
diff --git a/demo/src/main/res/layout/list_item.xml b/demo/src/main/res/layout/list_item.xml
new file mode 100644
index 00000000..f6ed23aa
--- /dev/null
+++ b/demo/src/main/res/layout/list_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@android:id/text1"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="@android:color/white"
+  android:textColor="@android:color/black"
+  android:textSize="20sp"
+  android:padding="8dp" />

From edc5b3215abcaa52f537a915049a71a022d45cd6 Mon Sep 17 00:00:00 2001
From: Adam Brown <adam@novoda.com>
Date: Thu, 1 Jun 2017 16:47:31 +0100
Subject: [PATCH 3/3] making the content centered by allowing the  parent
 layout to fill the page

---
 demo/src/main/res/layout/activity_main.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
index f64b6194..52a9b06c 100644
--- a/demo/src/main/res/layout/activity_main.xml
+++ b/demo/src/main/res/layout/activity_main.xml
@@ -3,7 +3,7 @@
 
   <LinearLayout
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical">
 
     <LinearLayout