From 7689acc0c50fd56087a622b5e05ab67eef5466d6 Mon Sep 17 00:00:00 2001
From: William Seemann <wseemann@gmail.com>
Date: Thu, 25 Aug 2016 22:51:27 -0500
Subject: [PATCH] Update code to work with API 23

---
 app/app.iml                                   |  73 ++-
 app/build.gradle                              |  18 +-
 app/src/main/AndroidManifest.xml              |   5 +-
 .../servestream/activity/MainActivity.java    | 175 +++---
 .../activity/MediaPlayerActivity.java         |   4 +-
 .../fragment/AlarmClockFragment.java          |  51 +-
 .../servestream/fragment/BrowseFragment.java  |  29 +-
 .../fragment/MiniControllerFragment.java      |   2 +
 .../fragment/SettingsFragment.java            |   4 +-
 .../servestream/fragment/UrlListFragment.java |  41 +-
 .../servestream/media/FFmpegMediaPlayer.java  |  14 +-
 .../media/MetadataRetrieverTask.java          |   4 +
 .../media/ShoutCastRetrieverTask.java         |   4 +
 .../preference/UserPreferences.java           |   3 +-
 .../service/MediaPlaybackService.java         | 369 +++++++------
 .../servestream/utils/Constants.java          |   2 +-
 app/src/main/jni/Android.mk                   |  19 +
 app/src/main/jni/metadata/Android.mk          |   7 +-
 .../metadata/ffmpeg_mediametadataretriever.c  | 517 ++++++++++--------
 .../metadata/ffmpeg_mediametadataretriever.h  |  20 +-
 .../jni/metadata/mediametadataretriever.cpp   |  26 +-
 .../jni/metadata/mediametadataretriever.h     |  12 +-
 app/src/main/jni/player/ffmpeg_mediaplayer.c  |   4 +-
 ...ge_servestream_media_FFmpegMediaPlayer.cpp |   4 +-
 .../res/layout-sw600dp/mini_controller.xml    |   3 +-
 .../res/layout-sw720dp/mini_controller.xml    |   3 +-
 app/src/main/res/layout/activity_main.xml     |  75 +--
 app/src/main/res/layout/fragment_browse.xml   |  40 +-
 .../res/layout/fragment_mini_controller.xml   |   1 -
 app/src/main/res/layout/fragment_uri_list.xml |  18 +-
 .../main/res/layout/list_item_now_playing.xml |   4 +-
 app/src/main/res/layout/mini_controller.xml   |   3 +-
 app/src/main/res/menu/browse.xml              |   5 -
 app/src/main/res/values-sw600dp/dimens.xml    |   2 +-
 app/src/main/res/values/dimens.xml            |   7 +-
 app/src/main/res/values/strings.xml           |   6 +-
 app/src/main/res/values/styles.xml            |  24 +-
 app/src/main/res/xml/preferences.xml          |   4 +-
 build.gradle                                  |   2 +-
 drag-sort-listview/build.gradle               |   2 +-
 drag-sort-listview/dslv/dslv.iml              |  28 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 local.properties                              |   2 +-
 43 files changed, 920 insertions(+), 720 deletions(-)
 mode change 100644 => 100755 app/src/main/jni/metadata/ffmpeg_mediametadataretriever.c

diff --git a/app/app.iml b/app/app.iml
index 816d5e77..c968dea7 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -12,10 +12,7 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleArmDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileArmDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleArmDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileArmDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateArmDebugAndroidTestSources</task>
           <task>generateArmDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/arm/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/arm/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/arm/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/arm/debug" isTestSource="false" generated="true" />
@@ -44,6 +41,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/armDebug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/armDebug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/armDebug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArmDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/arm/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/arm/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/arm/debug" isTestSource="true" generated="true" />
@@ -57,6 +63,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/arm/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/arm/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/arm/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/arm/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArm/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArm/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArm/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArm/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArm/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArm/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArm/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testArm/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/assets" type="java-test-resource" />
@@ -64,6 +79,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestArm/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -71,12 +87,22 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -84,19 +110,42 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.4.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
@@ -105,9 +154,13 @@
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="jplaylistparser-0.2.5" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
+    <orderEntry type="library" exported="" name="design-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-23.4.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
     <orderEntry type="library" exported="" name="jsoup-1.8.1" level="project" />
     <orderEntry type="module" module-name="dslv" exported="" />
     <orderEntry type="library" exported="" name="effects-android-23" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 17305d04..8061cc11 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,17 @@ android {
 
     defaultConfig {
         applicationId "net.sourceforge.servestream"
-        minSdkVersion 11
+        minSdkVersion 12
         targetSdkVersion 23
+        versionName "0.7.1"
+        versionCode 106
+    }
+
+    lintOptions {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
     }
 
     buildTypes {
@@ -25,7 +34,7 @@ android {
     }
 
     task buildFFmpeg(type: Exec, description: 'Compile FFmpeg source via NDK') {
-        def dir = file('src/main/scripts/build-ffmpeg.sh').absolutePath
+        def dir = file('src/main/ffmpeg/build-ffmpeg.sh').absolutePath
         commandLine "$dir"
     }
 
@@ -96,13 +105,13 @@ android {
         }
     }
 
-    Map<String, Integer> versionCodes = [armeabi: 10, 'armeabi-v7a': 11, mips: 12, x86: 13]
+    Map<String, Integer> versionCodes = [armeabi: 106, 'armeabi-v7a': 107, mips: 108, x86: 109]
 
     android.applicationVariants.all { variant ->
         // assign different version code for each output
         variant.outputs.each { output ->
             int abiVersionCode = versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI)) ?: 0
-            output.versionCodeOverride = abiVersionCode + 6
+            output.versionCodeOverride = abiVersionCode + 0
             // android.defaultConfig.versionCode
         }
     }
@@ -114,4 +123,5 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.android.support:support-v4:23.1.1'
     compile project(':dslv')
+    compile 'com.android.support:design:23.4.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5f4557c2..36264a27 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,10 +24,6 @@
 	android:versionCode="105"
 	android:installLocation="auto" >
 
-	<uses-sdk
-	    android:targetSdkVersion="23"
-	    android:minSdkVersion="11" />
-
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.BLUETOOTH" />
 	<uses-permission android:name="android.permission.BROADCAST_STICKY" />
@@ -65,6 +61,7 @@
 
 		<activity
 		    android:name=".activity.MainActivity"
+			android:theme="@style/Theme.ServeStream.DarkActionBar.NoActionBar"
 		    android:launchMode="singleTop" >
 		    
 			<intent-filter>
diff --git a/app/src/main/java/net/sourceforge/servestream/activity/MainActivity.java b/app/src/main/java/net/sourceforge/servestream/activity/MainActivity.java
index 538f6ff9..86c98a85 100644
--- a/app/src/main/java/net/sourceforge/servestream/activity/MainActivity.java
+++ b/app/src/main/java/net/sourceforge/servestream/activity/MainActivity.java
@@ -1,6 +1,6 @@
 /*
  * ServeStream: A HTTP stream browser/player for Android
- * Copyright 2013 William Seemann
+ * Copyright 2016 William Seemann
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 package net.sourceforge.servestream.activity;
 
 import net.sourceforge.servestream.R;
-import net.sourceforge.servestream.adapter.NavigationDrawerAdapter;
 import net.sourceforge.servestream.adapter.NavigationDrawerAdapter.ItemAccess;
 import net.sourceforge.servestream.fragment.AlarmClockFragment;
 import net.sourceforge.servestream.fragment.BrowseFragment;
@@ -28,7 +27,6 @@
 import net.sourceforge.servestream.utils.DownloadScannerDialog;
 import net.sourceforge.servestream.utils.MusicUtils;
 import net.sourceforge.servestream.utils.MusicUtils.ServiceToken;
-import net.sourceforge.servestream.utils.Utils;
 
 import android.Manifest;
 import android.app.Activity;
@@ -38,11 +36,10 @@
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v4.app.ActionBarDrawerToggle;
+import android.support.design.widget.NavigationView;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
@@ -51,18 +48,17 @@
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
 
-public class MainActivity extends ActionBarActivity implements
+public class MainActivity extends AppCompatActivity implements
 			ServiceConnection,
-			BrowseIntentListener, ItemAccess {
+			BrowseIntentListener, ItemAccess,
+		NavigationView.OnNavigationItemSelectedListener {
 	
 	private static final String STATE_SELECTED_NAVIGATION_ITEM = "selected_navigation_item";
 	
@@ -72,69 +68,41 @@ public class MainActivity extends ActionBarActivity implements
 
 	private String mTag;
 	
-    private DrawerLayout mDrawerLayout;
-    private ListView mDrawerList;
-    private ActionBarDrawerToggle mDrawerToggle;
-
-    private CharSequence mDrawerTitle;
     private CharSequence mTitle;
-    private String[] mDrawerItems;
 
 	private ServiceToken mToken;
     
     private int mCurrentSelectedPosition = 0;
-	
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-    	setTheme(UserPreferences.getTheme());
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        mTitle = mDrawerTitle = getTitle();
-        mDrawerItems = getResources().getStringArray(R.array.drawer_items);
-        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-        mDrawerList = (ListView) findViewById(R.id.left_drawer);
-
-        // set a custom shadow that overlays the main content when the drawer opens
-        mDrawerLayout.setDrawerShadow(Utils.getThemedIcon(this, R.attr.drawer_shadow), GravityCompat.START);
-        // set up the drawer's list view with items and click listener
-        mDrawerList.setAdapter(new NavigationDrawerAdapter(this, this));
-        //mDrawerList.setAdapter(new ArrayAdapter<String>(this,
-        //        R.layout.drawer_list_item, mDrawerItems));
-        mDrawerList.setOnItemClickListener(new DrawerItemClickListener());
-
-        // enable ActionBar app icon to behave as action to toggle nav drawer
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setHomeButtonEnabled(true);
-
-        // ActionBarDrawerToggle ties together the the proper interactions
-        // between the sliding drawer and the action bar app icon
-        mDrawerToggle = new ActionBarDrawerToggle(
-                this,                  /* host Activity */
-                mDrawerLayout,         /* DrawerLayout object */
-                Utils.getThemedIcon(this, R.attr.ic_drawer),  /* nav drawer image to replace 'Up' caret */
-                R.string.drawer_open,  /* "open drawer" description for accessibility */
-                R.string.drawer_close  /* "close drawer" description for accessibility */
-                ) {
-            public void onDrawerClosed(View view) {
-                getSupportActionBar().setTitle(mTitle);
-            }
 
-            public void onDrawerOpened(View drawerView) {
-                getSupportActionBar().setTitle(mDrawerTitle);
-            }
-        };
-        mDrawerLayout.setDrawerListener(mDrawerToggle);
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		//setTheme(UserPreferences.getTheme());
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_main);
+		Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
+
+		DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+		android.support.v7.app.ActionBarDrawerToggle toggle = new android.support.v7.app.ActionBarDrawerToggle(
+				this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+		drawer.setDrawerListener(toggle);
+		toggle.syncState();
+
+		NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+		navigationView.setNavigationItemSelectedListener(this);
+
+		if (savedInstanceState == null) {
+			openUri(getUri());
+
+			navigationView = (NavigationView) findViewById(R.id.nav_view);
+			navigationView.setCheckedItem(R.id.nav_urls);
+			//selectItem(0);
+		}
 
-        if (savedInstanceState == null) {
-        	openUri(getUri());
-            //selectItem(0);
-        }
-        
-        mToken = MusicUtils.bindToService(this, this);
+		mToken = MusicUtils.bindToService(this, this);
 
 		requestPermission(this);
-    }
+	}
 
     @Override
     public void onNewIntent(Intent intent) {
@@ -192,9 +160,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onOptionsItemSelected(MenuItem item) {
          // The action bar home/up action should open or close the drawer.
          // ActionBarDrawerToggle will take care of this.
-        if (mDrawerToggle.onOptionsItemSelected(item)) {
-            return true;
-        }
+
         // Handle action buttons
         switch (item.getItemId()) {
 			case (R.id.menu_item_settings):
@@ -254,21 +220,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
 	    }
 	}
 	
-    /* The click listener for ListView in the navigation drawer */
-    private class DrawerItemClickListener implements ListView.OnItemClickListener {
-        @Override
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            selectItem(position);
-        }
-    }
-
     private void selectItem(int position) {
-		if (position == 3) {
-			startActivity(new Intent(this, SettingsActivity.class));
-	    	mDrawerLayout.closeDrawer(mDrawerList);
-			return;
-		}
-    	
     	mCurrentSelectedPosition = position;
     	
     	FragmentManager fragmentManager = getSupportFragmentManager();
@@ -298,11 +250,6 @@ private void selectItem(int position) {
     	}
     	
     	mTag = tag;
-    	
-    	// update selected item and title, then close the drawer
-    	mDrawerList.setItemChecked(position, true);
-    	setTitle(mDrawerItems[position]);
-    	mDrawerLayout.closeDrawer(mDrawerList);
     }
 
     @Override
@@ -316,20 +263,6 @@ public void setTitle(CharSequence title) {
      * onPostCreate() and onConfigurationChanged()...
      */
 
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        // Sync the toggle state after onRestoreInstanceState has occurred.
-        mDrawerToggle.syncState();
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        // Pass any configuration change to the drawer toggls
-        mDrawerToggle.onConfigurationChanged(newConfig);
-    }
-
 	@Override
 	public void onRequestPermissionsResult(int requestCode,
 										   String permissions[], int[] grantResults) {
@@ -460,10 +393,6 @@ private void openUri(String uri) {
     	}
     	
     	mTag = tag;
-    	
-    	mDrawerList.setItemChecked(0, true);
-    	setTitle(mDrawerItems[0]);
-    	mDrawerLayout.closeDrawer(mDrawerList);
 	}
 	
 	@Override
@@ -493,10 +422,9 @@ public void browseToUri(Uri uri) {
     	}
     	
     	mTag = tag;
-    	
-    	mDrawerList.setItemChecked(1, true);
-    	setTitle(mDrawerItems[1]);
-    	mDrawerLayout.closeDrawer(mDrawerList);
+
+		NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+		navigationView.setCheckedItem(R.id.nav_browse);
 	}
 	
 	private void showDialog(String tag) {
@@ -522,4 +450,33 @@ private void showDialog(String tag) {
 	public int getSelectedItemIndex() {
 		return mCurrentSelectedPosition;
 	}
+
+	@Override
+	public void onBackPressed() {
+		DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+		if (drawer.isDrawerOpen(GravityCompat.START)) {
+			drawer.closeDrawer(GravityCompat.START);
+		} else {
+			super.onBackPressed();
+		}
+	}
+
+	@SuppressWarnings("StatementWithEmptyBody")
+	@Override
+	public boolean onNavigationItemSelected(MenuItem item) {
+		// Handle navigation view item clicks here.
+		int id = item.getItemId();
+
+		if (id == R.id.nav_urls) {
+			selectItem(0);
+		} else if (id == R.id.nav_browse) {
+			selectItem(1);
+		} else if (id == R.id.nav_alarm_clock) {
+			selectItem(2);
+		}
+
+		DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+		drawer.closeDrawer(GravityCompat.START);
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/sourceforge/servestream/activity/MediaPlayerActivity.java b/app/src/main/java/net/sourceforge/servestream/activity/MediaPlayerActivity.java
index a9190468..9ab64c5e 100644
--- a/app/src/main/java/net/sourceforge/servestream/activity/MediaPlayerActivity.java
+++ b/app/src/main/java/net/sourceforge/servestream/activity/MediaPlayerActivity.java
@@ -144,7 +144,7 @@ public void onCreate(Bundle icicle) {
         
         mCurrentTime = (TextView) findViewById(R.id.position_text);
         mTotalTime = (TextView) findViewById(R.id.duration_text);
-        mProgress = (ProgressBar) findViewById(R.id.seek_bar);
+        mProgress = (SeekBar) findViewById(R.id.seek_bar);
 
         mPrevButton = (RepeatingImageButton) findViewById(R.id.previous_button);
         mPrevButton.setOnClickListener(mPrevListener);
@@ -1000,7 +1000,7 @@ private void setPager() {
     
     private TextView mCurrentTime;
     private TextView mTotalTime;
-    private ProgressBar mProgress;
+    private SeekBar mProgress;
     private SeekBar mVolume;
     private long mPosOverride = -1;
     private boolean mFromTouch = false;
diff --git a/app/src/main/java/net/sourceforge/servestream/fragment/AlarmClockFragment.java b/app/src/main/java/net/sourceforge/servestream/fragment/AlarmClockFragment.java
index be86a7bb..6d3633ba 100644
--- a/app/src/main/java/net/sourceforge/servestream/fragment/AlarmClockFragment.java
+++ b/app/src/main/java/net/sourceforge/servestream/fragment/AlarmClockFragment.java
@@ -18,6 +18,7 @@
 package net.sourceforge.servestream.fragment;
 
 import android.app.AlertDialog;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.support.v4.app.LoaderManager;
@@ -27,13 +28,10 @@
 import android.database.Cursor;
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
+import android.support.v4.app.Fragment;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -59,7 +57,7 @@
 /**
  * AlarmClock application.
  */
-public class AlarmClockFragment extends ListFragment implements
+public class AlarmClockFragment extends Fragment implements
 	OnItemClickListener, LoaderManager.LoaderCallbacks<Cursor> {
 
 	public static final String PREFERENCES = "AlarmClock";
@@ -75,6 +73,20 @@ public class AlarmClockFragment extends ListFragment implements
     private ListView mAlarmsList;
     private AlarmTimeAdapter mAdapter;
 
+    private FloatingActionButton mFab;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_alarm_clock, container, false);
+        ListView list = (ListView) view.findViewById(android.R.id.list);
+        list.setEmptyView(view.findViewById(android.R.id.empty));
+
+        mFab = (FloatingActionButton) view.findViewById(R.id.fab);
+
+        return view;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -87,17 +99,22 @@ public void onCreate(Bundle savedInstanceState) {
 	public void onActivityCreated (Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
 	     
-		setListShownNoAnimation(true);
-		
         mFactory = LayoutInflater.from(getActivity());
         
         mAdapter = new AlarmTimeAdapter(getActivity(), null, false);
-        mAlarmsList = getListView();
+        mAlarmsList = (ListView) getView().findViewById(android.R.id.list);
         mAlarmsList.setAdapter(mAdapter);
         mAlarmsList.setVerticalScrollBarEnabled(true);
         mAlarmsList.setOnItemClickListener(this);
         mAlarmsList.setOnCreateContextMenuListener(this);
 
+        mFab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                addNewAlarm();
+            }
+        });
+
         getLoaderManager().initLoader(URL_LOADER, null, this);
 	}
 	
@@ -270,24 +287,6 @@ public void onCreateContextMenu(ContextMenu menu, View view,
         }
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_item_add_alarm:
-                addNewAlarm();
-                return true;
-            default:
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-    
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		inflater.inflate(R.menu.alarm_clock_menu, menu);
-	    super.onCreateOptionsMenu(menu, inflater);
-	}
-    
     public void onItemClick(AdapterView<?> parent, View v, int pos, long id) {
         Intent intent = new Intent(getActivity(), SetAlarmActivity.class);
         intent.putExtra(Alarms.ALARM_ID, (int) id);
diff --git a/app/src/main/java/net/sourceforge/servestream/fragment/BrowseFragment.java b/app/src/main/java/net/sourceforge/servestream/fragment/BrowseFragment.java
index 0e5776ea..8bbf18b0 100644
--- a/app/src/main/java/net/sourceforge/servestream/fragment/BrowseFragment.java
+++ b/app/src/main/java/net/sourceforge/servestream/fragment/BrowseFragment.java
@@ -50,6 +50,7 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.ListFragment;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.PopupMenu;
 import android.util.SparseArray;
 import android.view.ContextMenu;
@@ -84,7 +85,9 @@ public class BrowseFragment extends ListFragment implements
     private BrowseAdapter mAdapter;
     
     private UriBean mSelectedMenuItem;
-    
+
+	private SwipeRefreshLayout mSwiperefresh;
+
 	@SuppressLint("HandlerLeak")
 	private Handler mHandler = new Handler() {
 		@Override
@@ -115,7 +118,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 		View view = inflater.inflate(R.layout.fragment_browse, container, false);
 		ListView list = (ListView) view.findViewById(android.R.id.list);
 		list.setEmptyView(view.findViewById(android.R.id.empty));
-		
+
+		mSwiperefresh = (SwipeRefreshLayout) view.findViewById(R.id.swiperefresh);
+
 		return view;
 	}
 	
@@ -132,9 +137,20 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 		        UriBean uri = (UriBean) parent.getItemAtPosition(position);
 		        browseTo(uri);
 			}
-	    });
+			    });
+		//list.setEmptyView(getView().findViewById(android.R.id.empty));
 		registerForContextMenu(list);
 
+		mSwiperefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+			@Override
+			public void onRefresh() {
+				// This method performs the actual data-refresh operation.
+				// The method calls setRefreshing(false) when it's finished.
+				mSwiperefresh.setRefreshing(true);
+				refreshList();
+			}
+		});
+
 	    if (mAdapter == null) {
 	    	mAdapter = new BrowseAdapter(getActivity(), new ArrayList<UriBean>(), this);
 	    }
@@ -265,9 +281,6 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case (R.id.menu_item_refresh):
-            	refreshList();
-            	return true;
             case (R.id.menu_search):
             	getActivity().onSearchRequested();
         	default:
@@ -276,7 +289,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
     
     @SuppressWarnings("unchecked")
-	private void handleMessage(Message message) {    	 
+	private void handleMessage(Message message) {
+		mSwiperefresh.setRefreshing(false);
+
     	switch (message.what) {
     		case MESSAGE_SHOW_DIRECTORY_CONTENTS:
     			showDirectoryContents((List<UriBean>) message.obj);
diff --git a/app/src/main/java/net/sourceforge/servestream/fragment/MiniControllerFragment.java b/app/src/main/java/net/sourceforge/servestream/fragment/MiniControllerFragment.java
index e3d117b0..e4d6098e 100644
--- a/app/src/main/java/net/sourceforge/servestream/fragment/MiniControllerFragment.java
+++ b/app/src/main/java/net/sourceforge/servestream/fragment/MiniControllerFragment.java
@@ -173,6 +173,8 @@ private void updateNowPlaying() {
 					id = mService.getAudioId();
 				}
 
+				mCoverart.setImageDrawable(getResources().getDrawable(R.drawable.albumart_mp_unknown_list));
+
 				if (id == -1) {
 					//mCoverart.setVisibility(View.GONE);
 				} else {
diff --git a/app/src/main/java/net/sourceforge/servestream/fragment/SettingsFragment.java b/app/src/main/java/net/sourceforge/servestream/fragment/SettingsFragment.java
index 44bf309d..1c0e8d48 100644
--- a/app/src/main/java/net/sourceforge/servestream/fragment/SettingsFragment.java
+++ b/app/src/main/java/net/sourceforge/servestream/fragment/SettingsFragment.java
@@ -117,7 +117,7 @@ public void onIabSetupFinished(IabResult result) {
 
 					});
 			
-			findPreference(PreferenceConstants.THEME).setOnPreferenceChangeListener(
+			/*findPreference(PreferenceConstants.THEME).setOnPreferenceChangeListener(
                     new OnPreferenceChangeListener() {
 
                         @Override
@@ -129,7 +129,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 			getActivity().finish();
                             return true;
                         }
-                    });
+                    });*/
 		}
 	}
 
diff --git a/app/src/main/java/net/sourceforge/servestream/fragment/UrlListFragment.java b/app/src/main/java/net/sourceforge/servestream/fragment/UrlListFragment.java
index 19340c90..43cdbbd3 100644
--- a/app/src/main/java/net/sourceforge/servestream/fragment/UrlListFragment.java
+++ b/app/src/main/java/net/sourceforge/servestream/fragment/UrlListFragment.java
@@ -58,12 +58,14 @@
 import android.os.Handler;
 import android.os.Message;
 import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.view.ActionMode;
 import android.support.v7.widget.PopupMenu;
 import android.util.SparseBooleanArray;
@@ -77,7 +79,6 @@
 import android.widget.ListView;
 import android.widget.Toast;
 import net.sourceforge.servestream.utils.DetermineActionTask;
-import android.support.v7.app.ActionBarActivity;
 
 public class UrlListFragment extends ListFragment implements
 				DetermineActionTask.MusicRetrieverPreparedListener,
@@ -109,7 +110,9 @@ public class UrlListFragment extends ListFragment implements
     
     private ActionMode mActionMode;
     private SparseBooleanArray mChecked;
-    
+
+	private FloatingActionButton mFab;
+
 	@SuppressLint("HandlerLeak")
 	private Handler mQueueHandler = new Handler() {
 		@Override
@@ -137,7 +140,6 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
         setRetainInstance(true);
-        setHasOptionsMenu(true);
     }
 	
 	@Override
@@ -146,7 +148,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 		View view = inflater.inflate(R.layout.fragment_uri_list, container, false);
 		ListView list = (ListView) view.findViewById(android.R.id.list);
 		list.setEmptyView(view.findViewById(android.R.id.empty));
-		
+
+		mFab = (FloatingActionButton) view.findViewById(R.id.fab);
+
 		return view;
 	}
 	
@@ -199,7 +203,7 @@ public synchronized void onItemClick(AdapterView<?> parent, View view, int posit
 
 					if (hasCheckedElement) {
 						if (mActionMode == null) {
-							mActionMode = ((ActionBarActivity) getActivity()).startSupportActionMode(mActionModeCallback);
+							mActionMode = ((AppCompatActivity) getActivity()).startSupportActionMode(mActionModeCallback);
 						}
 					} else {
 						if (mActionMode != null) {
@@ -218,7 +222,7 @@ public synchronized void onItemClick(AdapterView<?> parent, View view, int posit
 			public boolean onItemLongClick(AdapterView<?> parent, View view,
 					int position, long id) {
 				if (mActionMode == null) {
-					mActionMode = ((ActionBarActivity) getActivity()).startSupportActionMode(mActionModeCallback);
+					mActionMode = ((AppCompatActivity) getActivity()).startSupportActionMode(mActionModeCallback);
 				    getListView().setItemChecked(position, true);
 				    view.setBackgroundColor(getActivity().getResources().getColor(R.color.selection_background_color_light));
 				    mChecked = getListView().getCheckedItemPositions().clone();
@@ -233,6 +237,14 @@ public boolean onItemLongClick(AdapterView<?> parent, View view,
 		controller.setDragHandleId(R.id.drag_handle);
 		list.setOnTouchListener(controller);
 
+		mFab.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				Intent intent = new Intent(getActivity(), AddUrlActivity.class);
+				startActivity(intent);
+			}
+		});
+
 		mAdapter = new UrlListAdapter(getActivity(), new ArrayList<UriBean>(), this);
 		setListAdapter(mAdapter);
 	}
@@ -290,23 +302,6 @@ public void onDetach () {
 		mStreamdb.close();
 	}
 	
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		inflater.inflate(R.menu.url_list, menu);
-	    super.onCreateOptionsMenu(menu, inflater);
-	}
-		
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-	    	case (R.id.menu_item_add):
-				startActivity(new Intent(getActivity(), AddUrlActivity.class));
-				return true;
-	        default:
-	        	return super.onOptionsItemSelected(item);
-	    }
-	}
-
 	private boolean processUri(String input) {
 		Uri uri = TransportFactory.getUri(input);
 
diff --git a/app/src/main/java/net/sourceforge/servestream/media/FFmpegMediaPlayer.java b/app/src/main/java/net/sourceforge/servestream/media/FFmpegMediaPlayer.java
index fbc37188..45a5b914 100644
--- a/app/src/main/java/net/sourceforge/servestream/media/FFmpegMediaPlayer.java
+++ b/app/src/main/java/net/sourceforge/servestream/media/FFmpegMediaPlayer.java
@@ -544,9 +544,19 @@ public class FFmpegMediaPlayer extends AbstractMediaPlayer
     }*/
     
     private final static String TAG = "FFmpegMediaPlayer";
-    
+
+    private static final String [] JNI_LIBRARIES = {
+            "avutil",
+            "swscale",
+            "avcodec",
+            "avformat",
+            "ffmpeg_mediaplayer_jni"
+    };
+
     static {
-    	System.loadLibrary("ffmpeg_mediaplayer_jni");
+        for (int i = 0; i < JNI_LIBRARIES.length; i++) {
+            System.loadLibrary(JNI_LIBRARIES[i]);
+        }
         native_init();
         initializeStaticCompatMethods();
     }
diff --git a/app/src/main/java/net/sourceforge/servestream/media/MetadataRetrieverTask.java b/app/src/main/java/net/sourceforge/servestream/media/MetadataRetrieverTask.java
index abe1df80..06fae771 100644
--- a/app/src/main/java/net/sourceforge/servestream/media/MetadataRetrieverTask.java
+++ b/app/src/main/java/net/sourceforge/servestream/media/MetadataRetrieverTask.java
@@ -22,6 +22,8 @@
 import net.sourceforge.servestream.provider.Media;
 import net.sourceforge.servestream.preference.PreferenceConstants;
 
+import wseemann.media.FFmpegMediaMetadataRetriever;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
@@ -31,6 +33,8 @@
 import android.util.Log;
 import android.util.SparseArray;
 
+import wseemann.media.FFmpegMediaMetadataRetriever;
+
 public class MetadataRetrieverTask implements Runnable {
 	private static final String TAG = MetadataRetrieverTask.class.getName();
 	
diff --git a/app/src/main/java/net/sourceforge/servestream/media/ShoutCastRetrieverTask.java b/app/src/main/java/net/sourceforge/servestream/media/ShoutCastRetrieverTask.java
index 88363342..414d7972 100644
--- a/app/src/main/java/net/sourceforge/servestream/media/ShoutCastRetrieverTask.java
+++ b/app/src/main/java/net/sourceforge/servestream/media/ShoutCastRetrieverTask.java
@@ -24,11 +24,15 @@
 
 import net.sourceforge.servestream.provider.Media;
 
+import wseemann.media.FFmpegMediaMetadataRetriever;
+
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
 
+import wseemann.media.FFmpegMediaMetadataRetriever;
+
 public class ShoutCastRetrieverTask {
 	private Context mContext = null;
 	private long mId;
diff --git a/app/src/main/java/net/sourceforge/servestream/preference/UserPreferences.java b/app/src/main/java/net/sourceforge/servestream/preference/UserPreferences.java
index 1c2db936..13c62ed8 100644
--- a/app/src/main/java/net/sourceforge/servestream/preference/UserPreferences.java
+++ b/app/src/main/java/net/sourceforge/servestream/preference/UserPreferences.java
@@ -60,7 +60,8 @@ public static void createInstance(Context context) {
 	private void loadPreferences() {
 		SharedPreferences sp = PreferenceManager
 				.getDefaultSharedPreferences(mContext);
-		mTheme = readThemeValue(sp.getString(PreferenceConstants.THEME, "0"));
+		//mTheme = readThemeValue(sp.getString(PreferenceConstants.THEME, "0"));
+		mTheme = R.style.Theme_ServeStream_DarkActionBar;;
 	}
 
 	private int readThemeValue(String valueFromPrefs) {
diff --git a/app/src/main/java/net/sourceforge/servestream/service/MediaPlaybackService.java b/app/src/main/java/net/sourceforge/servestream/service/MediaPlaybackService.java
index 33bf7491..71289e6f 100644
--- a/app/src/main/java/net/sourceforge/servestream/service/MediaPlaybackService.java
+++ b/app/src/main/java/net/sourceforge/servestream/service/MediaPlaybackService.java
@@ -18,7 +18,6 @@
 package net.sourceforge.servestream.service;
 
 import android.annotation.SuppressLint;
-import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -36,11 +35,13 @@
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.database.Cursor;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
 import android.media.AudioManager;
 import android.media.AudioManager.OnAudioFocusChangeListener;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
@@ -48,8 +49,11 @@
 import android.os.PowerManager.WakeLock;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
-import android.support.v4.app.NotificationCompat;
+import android.support.v7.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
+import android.support.v4.media.MediaMetadataCompat;
+import android.support.v4.media.session.MediaSessionCompat;
+import android.support.v4.media.session.PlaybackStateCompat;
 import android.util.Log;
 import android.widget.RemoteViews;
 import android.widget.Toast;
@@ -73,7 +77,6 @@
 import net.sourceforge.servestream.provider.Media;
 import net.sourceforge.servestream.receiver.ConnectivityReceiver;
 import net.sourceforge.servestream.receiver.MediaButtonIntentReceiver;
-import net.sourceforge.servestream.service.RemoteControlClientCompat.MetadataEditorCompat;
 import net.sourceforge.servestream.transport.AbsTransport;
 import net.sourceforge.servestream.transport.TransportFactory;
 import net.sourceforge.servestream.utils.DetermineActionTask;
@@ -201,7 +204,7 @@ public class MediaPlaybackService extends Service implements
 
     // our RemoteControlClient object, which will use remote control APIs available in
     // SDK level >= 14, if they're available.
-    private RemoteControlClientCompat mRemoteControlClientCompat;
+    private MediaSessionCompat mediaSession;
     
     // The component name of MusicIntentReceiver, for use with media button and remote control APIs
     private ComponentName mMediaButtonReceiverComponent;
@@ -469,6 +472,58 @@ public void onReceive(Context context, Intent intent) {
         }
     };
 
+    private final MediaSessionCompat.Callback mMediaSessionCallback = new MediaSessionCompat.Callback() {
+
+        @Override
+        public boolean onMediaButtonEvent(Intent intent) {
+            if (intent != null) {
+                String action = intent.getAction();
+                String cmd = intent.getStringExtra("command");
+                //MusicUtils.debugLog("onStartCommand " + action + " / " + cmd);
+
+                if (CMDNEXT.equals(cmd) || NEXT_ACTION.equals(action)) {
+                    gotoNext(true);
+                } else if (CMDPREVIOUS.equals(cmd) || PREVIOUS_ACTION.equals(action)) {
+                    prev();
+                } else if (CMDTOGGLEPAUSE.equals(cmd) || TOGGLEPAUSE_ACTION.equals(action)) {
+                    if (intent.getBooleanExtra("from_connectivity_receiver", false) && !mPausedByConnectivityReceiver) {
+                        return super.onMediaButtonEvent(intent);
+                    }
+
+                    if (isPlaying()) {
+                        pause(true);
+                        mPausedByTransientLossOfFocus = false;
+                    } else {
+                        play();
+                    }
+                } else if (CMDPAUSE.equals(cmd) || PAUSE_ACTION.equals(action)) {
+                    boolean wasPlaying = mIsSupposedToBePlaying;
+
+                    pause(true);
+                    mPausedByTransientLossOfFocus = false;
+
+                    if (wasPlaying != mIsSupposedToBePlaying) {
+                        mPausedByConnectivityReceiver = intent.getBooleanExtra("from_connectivity_receiver", false);
+                    }
+                } else if (CMDPLAY.equals(cmd)) {
+                    play();
+                } else if (CMDSTOP.equals(cmd)) {
+                    pause(true);
+                    mPausedByTransientLossOfFocus = false;
+                    seek(0);
+                } else if (AppWidgetOneProvider.CMDAPPWIDGETUPDATE.equals(cmd)) {
+                    // Someone asked us to refresh a set of specific widgets, probably
+                    // because they were just added.
+                    int[] appWidgetIds = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
+                    //TODO Fix this!
+                    mAppWidgetProvider.performUpdate(MediaPlaybackService.this, appWidgetIds, "");
+                }
+            }
+
+            return super.onMediaButtonEvent(intent);
+        }
+    };
+
     private OnAudioFocusChangeListener mAudioFocusListener = new OnAudioFocusChangeListener() {
         public void onAudioFocusChange(int focusChange) {
             mMediaplayerHandler.obtainMessage(FOCUSCHANGE, focusChange, 0).sendToTarget();
@@ -502,29 +557,36 @@ public void onCreate() {
     	
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         mMediaButtonReceiverComponent = new ComponentName(this, MediaButtonIntentReceiver.class);
-        mAudioManager.registerMediaButtonEventReceiver(mMediaButtonReceiverComponent);
-        
-        // Use the remote control APIs (if available) to set the playback state
-        if (mRemoteControlClientCompat == null) {
-            Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON);
-            intent.setComponent(mMediaButtonReceiverComponent);
-            mRemoteControlClientCompat = new RemoteControlClientCompat(
-                    PendingIntent.getBroadcast(this /*context*/,
-                            0 /*requestCode, ignored*/, intent /*intent*/, 0 /*flags*/));
-            RemoteControlHelper.registerRemoteControlClient(mAudioManager,
-                    mRemoteControlClientCompat);
+
+        mMediaButtonReceiverComponent = new ComponentName(this, MediaButtonIntentReceiver.class);
+
+        ComponentName eventReceiver = new ComponentName(getPackageName(), MediaButtonIntentReceiver.class.getName());
+        Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
+        mediaButtonIntent.setComponent(eventReceiver);
+        PendingIntent buttonReceiverIntent = PendingIntent.getBroadcast(this, 0, mediaButtonIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        mediaSession = new MediaSessionCompat(this, LOGTAG, eventReceiver, buttonReceiverIntent);
+
+        try {
+            mediaSession.setCallback(mMediaSessionCallback);
+            mediaSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);
+            mediaSession.setActive(true);
+        } catch (NullPointerException ex) {
+            // on some devices (Huawei) setting active can cause a NullPointerException
+            // even with correct use of the api.
+            // See http://stackoverflow.com/questions/31556679/android-huawei-mediassessioncompat
+            // and https://plus.google.com/+IanLake/posts/YgdTkKFxz7d
+            Log.e(LOGTAG, "NullPointerException while setting up MediaSession");
+            ex.printStackTrace();
         }
-        
-        mRemoteControlClientCompat.setTransportControlFlags(
-        		RemoteControlClientCompat.FLAG_KEY_MEDIA_PREVIOUS |
-        		RemoteControlClientCompat.FLAG_KEY_MEDIA_PLAY |
-        		RemoteControlClientCompat.FLAG_KEY_MEDIA_PAUSE |
-        		RemoteControlClientCompat.FLAG_KEY_MEDIA_NEXT |
-        		RemoteControlClientCompat.FLAG_KEY_MEDIA_STOP);
-        
+
         mPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         mPreferences.registerOnSharedPreferenceChangeListener(this);
-        
+
+        // needs mPreferences to not be null
+        updateMediaSessionMetadata();
+        setPlayerStatus();
+
 		final boolean lockingWifi = mPreferences.getBoolean(PreferenceConstants.WIFI_LOCK, true);
 		mConnectivityManager = new ConnectivityReceiver(this, lockingWifi);
 		
@@ -558,6 +620,38 @@ public void onCreate() {
         mDelayedStopHandler.sendMessageDelayed(msg, IDLE_DELAY);
     }
 
+    private void updateMediaSessionMetadata() {
+        MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder();
+        builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, getArtistName());
+        builder.putString(MediaMetadataCompat.METADATA_KEY_ALBUM, getAlbumName());
+        builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, getTrackName());
+        builder.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, getDuration());
+        if (mPreferences.getBoolean(PreferenceConstants.RETRIEVE_ALBUM_ART, false)) {
+            builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, getAlbumArt(false));
+        }
+
+        mediaSession.setMetadata(builder.build());
+    }
+
+    private void setPlayerStatus() {
+        PlaybackStateCompat.Builder sessionState = new PlaybackStateCompat.Builder();
+
+        int state;
+
+        if (isPlaying()) {
+            state = PlaybackStateCompat.STATE_PLAYING;
+        } else {
+            state = PlaybackStateCompat.STATE_PAUSED;
+        }
+        sessionState.setState(state, 1, 1.0f);
+        sessionState.setActions(PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS
+                | PlaybackStateCompat.ACTION_PLAY
+                | PlaybackStateCompat.ACTION_PAUSE
+                | PlaybackStateCompat.ACTION_SKIP_TO_NEXT
+                | PlaybackStateCompat.ACTION_STOP);
+        mediaSession.setPlaybackState(sessionState.build());
+    }
+
     @Override
     public void onDestroy() {
         // Check that we're not being destroyed while something is still playing.
@@ -584,9 +678,7 @@ public void onDestroy() {
         mPlayer = null;
 
         mAudioManager.abandonAudioFocus(mAudioFocusListener);
-        RemoteControlHelper.unregisterRemoteControlClient(mAudioManager,
-                mRemoteControlClientCompat);
-        
+
         // make sure there aren't any other messages coming
         mDelayedStopHandler.removeCallbacksAndMessages(null);
         mMediaplayerHandler.removeCallbacksAndMessages(null);
@@ -864,7 +956,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                     play();
                 }
             } else if (CMDTOGGLEPAUSE.equals(cmd) || TOGGLEPAUSE_ACTION.equals(action)) {
-                boolean remove_status_icon =  (intent.getIntExtra(CMDNOTIF, 0) != 2);
+                boolean remove_status_icon =  (intent.getIntExtra(CMDNOTIF, 0) != 1);
                 if (isPlaying()) {
                     pause(remove_status_icon);
                     mPausedByTransientLossOfFocus = false;
@@ -1026,9 +1118,8 @@ private void notifyChange(String what) {
         bluetoothNotifyChange(what);
 
         if (what.equals(PLAYSTATE_CHANGED)) {
-            mRemoteControlClientCompat.setPlaybackState(isPlaying() ?
-            		RemoteControlClientCompat.PLAYSTATE_PLAYING : RemoteControlClientCompat.PLAYSTATE_PAUSED);
-            
+            setPlayerStatus();
+
             if (isPlaying() && mRetrieveShoutCastMetadata) {
     			mShoutCastRetrieverTask = new ShoutCastRetrieverTask(MediaPlaybackService.this, mPlayList[mPlayPos]);
     			mShoutCastRetrieverTask.start();
@@ -1040,15 +1131,7 @@ private void notifyChange(String what) {
             }
         } else if (what.equals(META_CHANGED)) {
             // Update the remote controls
-            MetadataEditorCompat metadataEditor = mRemoteControlClientCompat.editMetadata(true);
-            metadataEditor.putString(2, getArtistName());
-            metadataEditor.putString(1, getAlbumName());
-            metadataEditor.putString(7, getTrackName());
-            metadataEditor.putLong(9, getDuration());
-            if (mPreferences.getBoolean(PreferenceConstants.RETRIEVE_ALBUM_ART, false)) {
-            	metadataEditor.putBitmap(100, getAlbumArt(false));
-            }
-            metadataEditor.apply();
+            updateMediaSessionMetadata();
         }
 
         if (what.equals(QUEUE_CHANGED)) {
@@ -1461,161 +1544,87 @@ public void play() {
 
     private void updateNotification(boolean updateNotification) {
         String contentText;
-    	
-    	String trackName = getTrackName();
-    	if (trackName == null || trackName.equals(Media.UNKNOWN_STRING)) {
-    		trackName = getMediaUri();
-    	}
-    	
+
+        String trackName = getTrackName();
+        if (trackName == null || trackName.equals(Media.UNKNOWN_STRING)) {
+            trackName = getMediaUri();
+        }
+
         String artist = getArtistName();
-    	if (artist == null || artist.equals(Media.UNKNOWN_STRING)) {
-    		artist = getString(R.string.unknown_artist_name);
-    	}
-        
-    	String album = getAlbumName();
+        if (artist == null || artist.equals(Media.UNKNOWN_STRING)) {
+            artist = getString(R.string.unknown_artist_name);
+        }
+
+        String album = getAlbumName();
         if (album == null || album.equals(Media.UNKNOWN_STRING)) {
             contentText = getString(R.string.notification_alt_info, artist);
         } else {
-        	contentText = getString(R.string.notification_artist_album, artist, album);
+            contentText = getString(R.string.notification_artist_album, artist, album);
         }
-        
-      	TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
-    	stackBuilder.addNextIntentWithParentStack(new Intent(this, MediaPlayerActivity.class)
-        	.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP));
-    	PendingIntent contentIntent = stackBuilder.getPendingIntent((int) System.currentTimeMillis(), 0);
-        
-        NotificationCompat.Builder status = new NotificationCompat.Builder(this)
-        		.setContentTitle(trackName)
-        		.setContentText(contentText)
+
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
+        stackBuilder.addNextIntentWithParentStack(new Intent(this, MediaPlayerActivity.class)
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP));
+        PendingIntent contentIntent = stackBuilder.getPendingIntent((int) System.currentTimeMillis(), 0);
+
+        NotificationCompat.MediaStyle style = new NotificationCompat.MediaStyle();
+        style.setMediaSession(mediaSession.getSessionToken());
+        style.setShowCancelButton(true);
+        style.setCancelButtonIntent(createPendingIntent(3, CMDSTOP));
+
+        NotificationCompat.Builder builder = (NotificationCompat.Builder) new NotificationCompat.Builder(this)
+                .setContentTitle(trackName)
+                .setContentText(contentText)
                 .setContentIntent(contentIntent)
-                .setWhen(0);
-		
+                .setWhen(0)
+                .setSmallIcon(R.drawable.ic_notification)
+                .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.albumart_mp_unknown_expanded));
+                //.setColor(Color.BLACK);
+
         int trackId = getTrackId();
-	    if (mPreferences.getBoolean(PreferenceConstants.RETRIEVE_ALBUM_ART, false) && trackId != -1) {
-	    	Bitmap bitmap = getAlbumArt(true);
-	    	if (bitmap != null) {
-	        	status.setLargeIcon(bitmap);
-	    	}
-	    }
-	    
-    	status.setSmallIcon(R.drawable.notification_icon);
-        
-	    Notification notification = status.build();
-	    
-	    // If the user has a phone running Android 4.0+ show an expanded notification
-	    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN){
-	    	notification = buildExpandedView(notification, updateNotification);
-	    }
-	    
-		if (!updateNotification) {
-    		startForeground(PLAYBACKSERVICE_STATUS, notification);
-    	} else {
-    		NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-    		notificationManager.notify(PLAYBACKSERVICE_STATUS, notification);
-    	}
-    }
-    
-    @SuppressLint("NewApi")
-	private Notification buildExpandedView(Notification notification, boolean updateNotification) {
-    	RemoteViews contentView = new RemoteViews(getPackageName(), R.layout.notification_small);
-    	RemoteViews expandedContentView = new RemoteViews(getPackageName(), R.layout.notification_expanded);
-    	setupContentView(contentView, updateNotification);
-    	setupExpandedContentView(expandedContentView, updateNotification);
-    	
-        notification.contentView = contentView;
-        notification.bigContentView = expandedContentView;
-        return notification;
-    }
-    
-    private void setupContentView(RemoteViews rv, boolean updateNotification) {
-    	String contentText;
-     	
-     	String trackName = getTrackName();
-     	if (trackName == null || trackName.equals(Media.UNKNOWN_STRING)) {
-     		trackName = getMediaUri();
-     	}
-     	
-        String artist = getArtistName();
-     	if (artist == null || artist.equals(Media.UNKNOWN_STRING)) {
-     		artist = getString(R.string.unknown_artist_name);
-     	}
-         
-     	String album = getAlbumName();
-        if (album == null || album.equals(Media.UNKNOWN_STRING)) {
-        	contentText = getString(R.string.notification_alt_info, artist);
-        } else {
-        	contentText = getString(R.string.notification_artist_album, artist, album);
+        if (mPreferences.getBoolean(PreferenceConstants.RETRIEVE_ALBUM_ART, false) && trackId != -1) {
+            Bitmap bitmap = getAlbumArt(true);
+            if (bitmap != null) {
+                builder.setLargeIcon(bitmap);
+            }
         }
-        
+
+        builder.addAction(createPendingIntent(android.R.drawable.ic_media_previous, "Previous", 0, CMDPREVIOUS));
+
         if (updateNotification) {
-        	if (isPlaying()) {
-        		rv.setImageViewResource(R.id.play_pause, android.R.drawable.ic_media_pause);
-        	} else {
-        		rv.setImageViewResource(R.id.play_pause, android.R.drawable.ic_media_play);
-        	}
+            if (isPlaying()) {
+                builder.addAction(createPendingIntent(android.R.drawable.ic_media_pause, "Play", 1, CMDTOGGLEPAUSE));
+            } else {
+                builder.addAction(createPendingIntent(android.R.drawable.ic_media_play, "Pause", 1, CMDTOGGLEPAUSE));
+            }
         } else {
-        	rv.setImageViewResource(R.id.play_pause, android.R.drawable.ic_media_pause);
+            builder.addAction(createPendingIntent(android.R.drawable.ic_media_pause, "Play", 1, CMDTOGGLEPAUSE));
         }
-    	
-        int trackId = getTrackId();
-	    if (mPreferences.getBoolean(PreferenceConstants.RETRIEVE_ALBUM_ART, false) && trackId != -1) {
-	    	Bitmap bitmap = getAlbumArt(true);
-	    	if (bitmap != null) {
-	    		rv.setImageViewBitmap(R.id.coverart, bitmap);
-	    	}
-	    }
-        
-    	// set the text for the notifications
-    	rv.setTextViewText(R.id.title, trackName);
-    	rv.setTextViewText(R.id.subtitle, contentText);
 
-    	rv.setOnClickPendingIntent(R.id.play_pause, createPendingIntent(2, CMDTOGGLEPAUSE));
-    	rv.setOnClickPendingIntent(R.id.next, createPendingIntent(3, CMDNEXT));
-    	rv.setOnClickPendingIntent(R.id.close, createPendingIntent(4, CMDSTOP));
-    }
-    
-    private void setupExpandedContentView(RemoteViews rv, boolean updateNotification) {
-    	String trackName = getTrackName();
-    	if (trackName == null || trackName.equals(Media.UNKNOWN_STRING)) {
-    			trackName = getMediaUri();
-    	}
-    	
-        String artist = getArtistName();
-    	if (artist == null || artist.equals(Media.UNKNOWN_STRING)) {
-    		artist = getString(R.string.unknown_artist_name);
-    	}
-        
-    	String album = getAlbumName();
-        
-        if (updateNotification) {
-        	if (isPlaying()) {
-        		rv.setImageViewResource(R.id.play_pause, android.R.drawable.ic_media_pause);
-        	} else {
-        		rv.setImageViewResource(R.id.play_pause, android.R.drawable.ic_media_play);
-        	}
+        builder.addAction(createPendingIntent(android.R.drawable.ic_media_next, "Next", 2, CMDNEXT));
+
+        style.setShowActionsInCompactView(0,1,2);
+
+        builder.setStyle(style);
+
+        if (!updateNotification) {
+            startForeground(PLAYBACKSERVICE_STATUS, builder.build());
         } else {
-        	rv.setImageViewResource(R.id.play_pause, android.R.drawable.ic_media_pause);
+            NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+            notificationManager.notify(PLAYBACKSERVICE_STATUS, builder.build());
         }
-    	
-        int trackId = getTrackId();
-	    if (mPreferences.getBoolean(PreferenceConstants.RETRIEVE_ALBUM_ART, false) && trackId != -1) {
-	    	Bitmap bitmap = getAlbumArt(true);
-	    	if (bitmap != null) {
-	    		rv.setImageViewBitmap(R.id.coverart, bitmap);
-	    	}
-	    }
-        
-    	// set the text for the notifications
-    	rv.setTextViewText(R.id.firstLine, trackName);
-    	rv.setTextViewText(R.id.secondLine, album);
-    	rv.setTextViewText(R.id.thirdLine, artist);
+    }
 
-    	rv.setOnClickPendingIntent(R.id.prev, createPendingIntent(1, CMDPREVIOUS));
-    	rv.setOnClickPendingIntent(R.id.play_pause, createPendingIntent(2, CMDTOGGLEPAUSE));
-    	rv.setOnClickPendingIntent(R.id.next, createPendingIntent(3, CMDNEXT));
-    	rv.setOnClickPendingIntent(R.id.close, createPendingIntent(4, CMDSTOP));
+    private NotificationCompat.Action createPendingIntent(int icon, String title, int requestCode, String command) {
+        Intent intent = new Intent(this, MediaPlaybackService.class);
+        intent.setAction(MediaPlaybackService.SERVICECMD);
+        intent.putExtra(MediaPlaybackService.CMDNOTIF, requestCode);
+        intent.putExtra(MediaPlaybackService.CMDNAME, command);
+        PendingIntent pendingIntent = PendingIntent.getService(this, requestCode, intent, 0);
+
+        return new NotificationCompat.Action.Builder(icon, title, pendingIntent).build();
     }
-    
+
     private PendingIntent createPendingIntent(int requestCode, String command) {
         Intent intent = new Intent(this, MediaPlaybackService.class);
         intent.setAction(MediaPlaybackService.SERVICECMD);
diff --git a/app/src/main/java/net/sourceforge/servestream/utils/Constants.java b/app/src/main/java/net/sourceforge/servestream/utils/Constants.java
index de8030f4..8f45edd1 100644
--- a/app/src/main/java/net/sourceforge/servestream/utils/Constants.java
+++ b/app/src/main/java/net/sourceforge/servestream/utils/Constants.java
@@ -20,7 +20,7 @@
 public class Constants {
 
 	public static final String SERVESTREAM_PLAYSTORE_URI = "market://details?id=net.sourceforge.servestream";
-	public static final String SERVESTREAM_PROJECT_PAGE = "http://sourceforge.net/projects/servestream";
+	public static final String SERVESTREAM_PROJECT_PAGE = "https://github.com/wseemann/ServeStream";
 	
 	public static final String SERVESTREAM_DONATE_PAGE = "https://sourceforge.net/p/servestream/donate";
 	
diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index 5053e7d6..088df4c2 100644
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -1 +1,20 @@
 include $(call all-subdir-makefiles)
+
+ifeq ($(TARGET_ARCH),arm)
+    APP_PLATFORM=12
+endif
+
+ifeq ($(TARGET_ARCH),x86)
+    APP_PLATFORM=12
+endif
+
+ifeq ($(TARGET_ARCH),mips)
+    APP_PLATFORM=12
+endif
+
+ifeq ($(TARGET_ARCH),x86_64)
+    APP_PLATFORM=21
+endif
+
+$(info $(TARGET_ARCH))
+$(info $(APP_PLATFORM))
\ No newline at end of file
diff --git a/app/src/main/jni/metadata/Android.mk b/app/src/main/jni/metadata/Android.mk
index 57dad0b3..f45bd822 100644
--- a/app/src/main/jni/metadata/Android.mk
+++ b/app/src/main/jni/metadata/Android.mk
@@ -4,11 +4,14 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := ffmpeg_mediametadataretriever_jni
 LOCAL_CFLAGS := 
-LOCAL_SRC_FILES := net_sourceforge_servestream_media_MediaMetadataRetriever.cpp \
+LOCAL_SRC_FILES := wseemann_media_MediaMetadataRetriever.cpp \
 	mediametadataretriever.cpp \
-        ffmpeg_mediametadataretriever.c
+        ffmpeg_mediametadataretriever.c \
+        ffmpeg_utils.c
 LOCAL_SHARED_LIBRARIES := libswscale libavcodec libavformat libavutil
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../ffmpeg/ffmpeg/$(TARGET_ARCH_ABI)/include
 LOCAL_LDLIBS := -llog
+LOCAL_LDLIBS += -landroid
+LOCAL_LDLIBS += -ljnigraphics
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/app/src/main/jni/metadata/ffmpeg_mediametadataretriever.c b/app/src/main/jni/metadata/ffmpeg_mediametadataretriever.c
old mode 100644
new mode 100755
index 02ceec78..1214d435
--- a/app/src/main/jni/metadata/ffmpeg_mediametadataretriever.c
+++ b/app/src/main/jni/metadata/ffmpeg_mediametadataretriever.c
@@ -2,7 +2,7 @@
  * FFmpegMediaMetadataRetriever: A unified interface for retrieving frame 
  * and meta data from an input media file.
  *
- * Copyright 2014 William Seemann
+ * Copyright 2016 William Seemann
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,142 +22,67 @@
 #include <libswscale/swscale.h>
 #include <libavutil/opt.h>
 #include <ffmpeg_mediametadataretriever.h>
+#include <ffmpeg_utils.h>
 
 #include <stdio.h>
+#include <unistd.h>
 
-const int TARGET_IMAGE_FORMAT = PIX_FMT_RGB24;
-const int TARGET_IMAGE_CODEC = CODEC_ID_PNG;
+#include <android/log.h>
 
-const char *DURATION = "duration";
-const char *AUDIO_CODEC = "audio_codec";
-const char *VIDEO_CODEC = "video_codec";
-const char *ICY_METADATA = "icy_metadata";
-//const char *ICY_ARTIST = "icy_artist";
-//const char *ICY_TITLE = "icy_title";
-const char *ROTATE = "rotate";
-const char *FRAMERATE = "framerate";
+const int TARGET_IMAGE_FORMAT = AV_PIX_FMT_RGBA; //AV_PIX_FMT_RGB24;
+const int TARGET_IMAGE_CODEC = AV_CODEC_ID_PNG;
 
-const int SUCCESS = 0;
-const int FAILURE = -1;
+void convert_image(State *state, AVCodecContext *pCodecCtx, AVFrame *pFrame, AVPacket *avpkt, int *got_packet_ptr, int width, int height);
 
-void convert_image(AVCodecContext *pCodecCtx, AVFrame *pFrame, AVPacket *avpkt, int *got_packet_ptr);
-
-int is_supported_format(int codec_id) {
-	if (codec_id == CODEC_ID_PNG ||
-			codec_id == CODEC_ID_MJPEG ||
-	        codec_id == CODEC_ID_BMP) {
+int is_supported_format(int codec_id, int pix_fmt) {
+	if ((codec_id == AV_CODEC_ID_PNG ||
+		 codec_id == AV_CODEC_ID_MJPEG ||
+		 codec_id == AV_CODEC_ID_BMP) &&
+		pix_fmt == AV_PIX_FMT_RGBA) {
 		return 1;
 	}
-	
-	return 0;
-}
-
-size_t first_char_pos(const char *value, const char ch) {
-    char *chptr = strchr(value, ch);
-    return chptr - value;
-}
-
-size_t last_char_pos(const char *value, const char ch) {
-    char *chptr = strrchr(value, ch);
-    return chptr - value;
-}
 
-void get_shoutcast_metadata(AVFormatContext *ic) {
-    char *value = NULL;
-    
-    if (av_opt_get(ic, "icy_metadata_packet", 1, (uint8_t **) &value) < 0) {
-        value = NULL;
-    }
-	
-    if (value && value[0]) {
-    	av_dict_set(&ic->metadata, ICY_METADATA, value, 0);
-    	
-    	/*int first_pos = first_char_pos(value, '\'');
-        int last_pos = first_char_pos(value, ';') - 2;
-        int pos = last_pos - first_pos;
-        
-        if (pos == 0) {
-        	return;
-        }
-        
-        char temp[pos];
-        memcpy(temp, value + first_pos + 1 , pos);
-        temp[pos] = '\0';
-        value = temp;
-
-    	first_pos = first_char_pos(value, '-') - 1;
-        
-        char artist[first_pos];
-        memcpy(artist, value, first_pos);
-        artist[first_pos] = '\0';
-        
-		av_dict_set(&ic->metadata, ICY_ARTIST, artist, 0);
-        
-        pos = strlen(value) - first_char_pos(value, '-') + 2;
-         
-        char album[pos];
-        memcpy(album, value + first_char_pos(value, '-') + 2, pos);
-        album[pos] = '\0';
-        
-		av_dict_set(&ic->metadata, ICY_TITLE, album, 0);*/
-    }
+	return 0;
 }
 
-void get_duration(AVFormatContext *ic, char * value) {
-	int duration = 0;
-
-	if (ic) {
-		if (ic->duration != AV_NOPTS_VALUE) {
-			duration = ((ic->duration / AV_TIME_BASE) * 1000);
-		}
+int get_scaled_context(State *s, AVCodecContext *pCodecCtx, int width, int height) {
+	AVCodec *targetCodec = avcodec_find_encoder(TARGET_IMAGE_CODEC);
+	if (!targetCodec) {
+		printf("avcodec_find_decoder() failed to find encoder\n");
+		return FAILURE;
 	}
 
-	sprintf(value, "%d", duration); // %i
-}
-
-void set_codec(AVFormatContext *ic, int i) {
-    const char *codec_type = av_get_media_type_string(ic->streams[i]->codec->codec_type);
-
-	if (!codec_type) {
-		return;
+	s->scaled_codecCtx = avcodec_alloc_context3(targetCodec);
+	if (!s->scaled_codecCtx) {
+		printf("avcodec_alloc_context3 failed\n");
+		return FAILURE;
 	}
 
-    const char *codec_name = avcodec_get_name(ic->streams[i]->codec->codec_id);
+	s->scaled_codecCtx->bit_rate = s->video_st->codec->bit_rate;
+	s->scaled_codecCtx->width = width;
+	s->scaled_codecCtx->height = height;
+	s->scaled_codecCtx->pix_fmt = TARGET_IMAGE_FORMAT;
+	s->scaled_codecCtx->codec_type = AVMEDIA_TYPE_VIDEO;
+	s->scaled_codecCtx->time_base.num = s->video_st->codec->time_base.num;
+	s->scaled_codecCtx->time_base.den = s->video_st->codec->time_base.den;
 
-	if (strcmp(codec_type, "audio") == 0) {
-		av_dict_set(&ic->metadata, AUDIO_CODEC, codec_name, 0);
-    } else if (codec_type && strcmp(codec_type, "video") == 0) {
-	   	av_dict_set(&ic->metadata, VIDEO_CODEC, codec_name, 0);
+	if (!targetCodec || avcodec_open2(s->scaled_codecCtx, targetCodec, NULL) < 0) {
+		printf("avcodec_open2() failed\n");
+		return FAILURE;
 	}
-}
 
-void set_rotation(State *s) {
-    
-	if (!extract_metadata(&s, ROTATE) && s->video_st && s->video_st->metadata) {
-		AVDictionaryEntry *entry = av_dict_get(s->video_st->metadata, ROTATE, NULL, AV_DICT_IGNORE_SUFFIX);
-        
-        if (entry && entry->value) {
-            av_dict_set(&s->pFormatCtx->metadata, ROTATE, entry->value, 0);
-        }
-	}
-}
+	s->scaled_sws_ctx = sws_getContext(s->video_st->codec->width,
+			s->video_st->codec->height,
+			s->video_st->codec->pix_fmt,
+			width,
+			height,
+			TARGET_IMAGE_FORMAT,
+			SWS_BILINEAR,
+			NULL,
+			NULL,
+			NULL);
 
-void set_framerate(State *s) {
-	char value[30] = "0";
-	
-	if (s->video_st && s->video_st->avg_frame_rate.den && s->video_st->avg_frame_rate.num) {
-		double d = av_q2d(s->video_st->avg_frame_rate);
-		uint64_t v = lrintf(d * 100);
-		if (v % 100) {
-			sprintf(value, "%3.2f", d);
-		} else if (v % (100 * 1000)) {
-			sprintf(value,  "%1.0f", d);
-		} else {
-			sprintf(value, "%1.0fk", d / 1000);
-		}
-		
-	    av_dict_set(&s->pFormatCtx->metadata, FRAMERATE, value, 0);
-	}
+	return SUCCESS;
 }
 
 int stream_component_open(State *s, int stream_index) {
@@ -172,12 +97,15 @@ int stream_component_open(State *s, int stream_index) {
 	// Get a pointer to the codec context for the stream
 	codecCtx = pFormatCtx->streams[stream_index]->codec;
 
-	printf("avcodec_find_decoder %s\n", codecCtx->codec_name);
+    const AVCodecDescriptor *codesc = avcodec_descriptor_get(codecCtx->codec_id);
+    if (codesc) {
+        printf("avcodec_find_decoder %s\n", codesc->name);
+    }
 
 	// Find the decoder for the audio stream
 	codec = avcodec_find_decoder(codecCtx->codec_id);
 
-	if(codec == NULL) {
+	if (codec == NULL) {
 	    printf("avcodec_find_decoder() failed to find audio decoder\n");
 	    return FAILURE;
 	}
@@ -196,6 +124,42 @@ int stream_component_open(State *s, int stream_index) {
 		case AVMEDIA_TYPE_VIDEO:
 			s->video_stream = stream_index;
 		    s->video_st = pFormatCtx->streams[stream_index];
+
+			AVCodec *targetCodec = avcodec_find_encoder(TARGET_IMAGE_CODEC);
+			if (!targetCodec) {
+			    printf("avcodec_find_decoder() failed to find encoder\n");
+				return FAILURE;
+			}
+
+		    s->codecCtx = avcodec_alloc_context3(targetCodec);
+			if (!s->codecCtx) {
+				printf("avcodec_alloc_context3 failed\n");
+				return FAILURE;
+			}
+
+			s->codecCtx->bit_rate = s->video_st->codec->bit_rate;
+			s->codecCtx->width = s->video_st->codec->width;
+			s->codecCtx->height = s->video_st->codec->height;
+			s->codecCtx->pix_fmt = TARGET_IMAGE_FORMAT;
+			s->codecCtx->codec_type = AVMEDIA_TYPE_VIDEO;
+			s->codecCtx->time_base.num = s->video_st->codec->time_base.num;
+			s->codecCtx->time_base.den = s->video_st->codec->time_base.den;
+
+			if (!targetCodec || avcodec_open2(s->codecCtx, targetCodec, NULL) < 0) {
+			  	printf("avcodec_open2() failed\n");
+				return FAILURE;
+			}
+
+		    s->sws_ctx = sws_getContext(s->video_st->codec->width,
+		    		s->video_st->codec->height,
+		    		s->video_st->codec->pix_fmt,
+		    		s->video_st->codec->width,
+		    		s->video_st->codec->height,
+		    		TARGET_IMAGE_FORMAT,
+		    		SWS_BILINEAR,
+		    		NULL,
+		    		NULL,
+		    		NULL);
 			break;
 		default:
 			break;
@@ -212,8 +176,6 @@ int set_data_source_l(State **ps, const char* path) {
 
 	State *state = *ps;
 	
-	char duration[30] = "0";
-
     printf("Path: %s\n", path);
 
     AVDictionary *options = NULL;
@@ -242,10 +204,9 @@ int set_data_source_l(State **ps, const char* path) {
     	return FAILURE;
 	}
 
-	get_duration(state->pFormatCtx, duration);
-	av_dict_set(&state->pFormatCtx->metadata, DURATION, duration, 0);
+	set_duration(state->pFormatCtx);
 	
-	get_shoutcast_metadata(state->pFormatCtx);
+	set_shoutcast_metadata(state->pFormatCtx);
 
 	//av_dump_format(state->pFormatCtx, 0, path, 0);
 	
@@ -276,8 +237,11 @@ int set_data_source_l(State **ps, const char* path) {
 		return FAILURE;
 	}*/
 
-    set_rotation(state);
-    set_framerate(state);
+    set_rotation(state->pFormatCtx, state->audio_st, state->video_st);
+    set_framerate(state->pFormatCtx, state->audio_st, state->video_st);
+    set_filesize(state->pFormatCtx);
+    set_chapter_count(state->pFormatCtx);
+    set_video_dimensions(state->pFormatCtx, state->video_st);
     
 	/*printf("Found metadata\n");
 	AVDictionaryEntry *tag = NULL;
@@ -320,8 +284,16 @@ void init(State **ps) {
 int set_data_source_uri(State **ps, const char* path, const char* headers) {
 	State *state = *ps;
 	
+	ANativeWindow *native_window = NULL;
+
+	if (state && state->native_window) {
+		native_window = state->native_window;
+	}
+
 	init(&state);
 	
+	state->native_window = native_window;
+
 	state->headers = headers;
 	
 	*ps = state;
@@ -334,7 +306,15 @@ int set_data_source_fd(State **ps, int fd, int64_t offset, int64_t length) {
 
 	State *state = *ps;
 	
+	ANativeWindow *native_window = NULL;
+
+	if (state && state->native_window) {
+		native_window = state->native_window;
+	}
+
 	init(&state);
+
+	state->native_window = native_window;
     	
     int myfd = dup(fd);
 
@@ -360,17 +340,38 @@ const char* extract_metadata(State **ps, const char* key) {
 		return value;
 	}
 
-	if (key) {
-		if (av_dict_get(state->pFormatCtx->metadata, key, NULL, AV_DICT_IGNORE_SUFFIX)) {
-			value = av_dict_get(state->pFormatCtx->metadata, key, NULL, AV_DICT_IGNORE_SUFFIX)->value;
-		} else if (state->audio_st && av_dict_get(state->audio_st->metadata, key, NULL, AV_DICT_IGNORE_SUFFIX)) {
-			value = av_dict_get(state->audio_st->metadata, key, NULL, AV_DICT_IGNORE_SUFFIX)->value;
-		} else if (state->video_st && av_dict_get(state->video_st->metadata, key, NULL, AV_DICT_IGNORE_SUFFIX)) {
-			value = av_dict_get(state->video_st->metadata, key, NULL, AV_DICT_IGNORE_SUFFIX)->value;
-		}
+	return extract_metadata_internal(state->pFormatCtx, state->audio_st, state->video_st, key);
+}
+
+const char* extract_metadata_from_chapter(State **ps, const char* key, int chapter) {
+	printf("extract_metadata_from_chapter\n");
+    char* value = NULL;
+	
+	State *state = *ps;
+	
+	if (!state || !state->pFormatCtx || state->pFormatCtx->nb_chapters <= 0) {
+		return value;
 	}
 
-	return value;
+	if (chapter < 0 || chapter >= state->pFormatCtx->nb_chapters) {
+		return value;
+	}
+
+	return extract_metadata_from_chapter_internal(state->pFormatCtx, state->audio_st, state->video_st, key, chapter);
+}
+
+int get_metadata(State **ps, AVDictionary **metadata) {
+    printf("get_metadata\n");
+    
+    State *state = *ps;
+    
+    if (!state || !state->pFormatCtx) {
+        return FAILURE;
+    }
+    
+    get_metadata_internal(state->pFormatCtx, metadata);
+    
+    return SUCCESS;
 }
 
 int get_embedded_picture(State **ps, AVPacket *pkt) {
@@ -385,29 +386,36 @@ int get_embedded_picture(State **ps, AVPacket *pkt) {
 		return FAILURE;
 	}
 
+    // TODO commented out 5/31/16, do we actully need this since the context
+    // has been initialized
     // read the format headers
-    if (state->pFormatCtx->iformat->read_header(state->pFormatCtx) < 0) {
+    /*if (state->pFormatCtx->iformat->read_header(state->pFormatCtx) < 0) {
     	printf("Could not read the format header\n");
     	return FAILURE;
-    }
+    }*/
 
     // find the first attached picture, if available
     for (i = 0; i < state->pFormatCtx->nb_streams; i++) {
         if (state->pFormatCtx->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC) {
         	printf("Found album art\n");
-        	*pkt = state->pFormatCtx->streams[i]->attached_pic;
+        	if (pkt) {
+        		av_packet_unref(pkt);
+        		av_init_packet(pkt);
+        	}
+            av_copy_packet(pkt, &state->pFormatCtx->streams[i]->attached_pic);
+			// TODO is this right
+			got_packet = 1;
         	
         	// Is this a packet from the video stream?
         	if (pkt->stream_index == state->video_stream) {
         		int codec_id = state->video_st->codec->codec_id;
-        		
+				int pix_fmt = state->video_st->codec->pix_fmt;
+
         		// If the image isn't already in a supported format convert it to one
-        		if (!is_supported_format(codec_id)) {
+        		if (!is_supported_format(codec_id, pix_fmt)) {
         			int got_frame = 0;
         			
-                    av_init_packet(pkt);
-        			
-   			        frame = avcodec_alloc_frame();
+   			        frame = av_frame_alloc();
         			    	
    			        if (!frame) {
    			        	break;
@@ -419,18 +427,25 @@ int get_embedded_picture(State **ps, AVPacket *pkt) {
 
         			// Did we get a video frame?
         			if (got_frame) {
-        				AVPacket packet;
-        	            av_init_packet(&packet);
-        	            packet.data = NULL;
-        	            packet.size = 0;
-        				convert_image(state->video_st->codec, frame, &packet, &got_packet);
-        				*pkt = packet;
+        				AVPacket convertedPkt;
+        	            av_init_packet(&convertedPkt);
+        	            convertedPkt.size = 0;
+        	            convertedPkt.data = NULL;
+
+        	            convert_image(state, state->video_st->codec, frame, &convertedPkt, &got_packet, -1, -1);
+
+        				av_packet_unref(pkt);
+        				av_init_packet(pkt);
+        				av_copy_packet(pkt, &convertedPkt);
+
+        				av_packet_unref(&convertedPkt);
+
         				break;
         			}
         		} else {
+        			av_packet_unref(pkt);
                 	av_init_packet(pkt);
-                	pkt->data = state->pFormatCtx->streams[i]->attached_pic.data;
-                	pkt->size = state->pFormatCtx->streams[i]->attached_pic.size;
+                    av_copy_packet(pkt, &state->pFormatCtx->streams[i]->attached_pic);
         			
         			got_packet = 1;
         			break;
@@ -439,7 +454,7 @@ int get_embedded_picture(State **ps, AVPacket *pkt) {
         }
     }
 
-	av_free(frame);
+	av_frame_free(&frame);
 
 	if (got_packet) {
 		return SUCCESS;
@@ -448,65 +463,50 @@ int get_embedded_picture(State **ps, AVPacket *pkt) {
 	}
 }
 
-void convert_image(AVCodecContext *pCodecCtx, AVFrame *pFrame, AVPacket *avpkt, int *got_packet_ptr) {
+void convert_image(State *state, AVCodecContext *pCodecCtx, AVFrame *pFrame, AVPacket *avpkt, int *got_packet_ptr, int width, int height) {
 	AVCodecContext *codecCtx;
-	AVCodec *codec;
-	AVPicture dst_picture;
+	struct SwsContext *scalerCtx;
 	AVFrame *frame;
 	
 	*got_packet_ptr = 0;
 
-	codec = avcodec_find_encoder(TARGET_IMAGE_CODEC);
-	if (!codec) {
-	    printf("avcodec_find_decoder() failed to find decoder\n");
-		goto fail;
-	}
+	if (width != -1 && height != -1) {
+		if (state->scaled_codecCtx == NULL ||
+				state->scaled_sws_ctx == NULL) {
+			get_scaled_context(state, pCodecCtx, width, height);
+		}
 
-    codecCtx = avcodec_alloc_context3(codec);
-	if (!codecCtx) {
-		printf("avcodec_alloc_context3 failed\n");
-		goto fail;
+		codecCtx = state->scaled_codecCtx;
+		scalerCtx = state->scaled_sws_ctx;
+	} else {
+		codecCtx = state->codecCtx;
+		scalerCtx = state->sws_ctx;
 	}
 
-	codecCtx->bit_rate = pCodecCtx->bit_rate;
-	codecCtx->width = pCodecCtx->width;
-	codecCtx->height = pCodecCtx->height;
-	codecCtx->pix_fmt = TARGET_IMAGE_FORMAT;
-	codecCtx->codec_type = AVMEDIA_TYPE_VIDEO;
-	codecCtx->time_base.num = pCodecCtx->time_base.num;
-	codecCtx->time_base.den = pCodecCtx->time_base.den;
-
-	if (!codec || avcodec_open2(codecCtx, codec, NULL) < 0) {
-	  	printf("avcodec_open2() failed\n");
-		goto fail;
+	if (width == -1) {
+		width = pCodecCtx->width;
 	}
 
-	frame = avcodec_alloc_frame();
-	
-	if (!frame) {
-		goto fail;
+	if (height == -1) {
+		height = pCodecCtx->height;
 	}
+
+	frame = av_frame_alloc();
 	
-    avpicture_alloc(&dst_picture,
-    		TARGET_IMAGE_FORMAT,
-    		codecCtx->width,
-    		codecCtx->height);
-    
-    /* copy data and linesize picture pointers to frame */
-    *((AVPicture *)frame) = dst_picture;
-    
-	struct SwsContext *scalerCtx = sws_getContext(pCodecCtx->width, 
-			pCodecCtx->height, 
-			pCodecCtx->pix_fmt, 
-			pCodecCtx->width, 
-			pCodecCtx->height, 
-			TARGET_IMAGE_FORMAT, 
-	        SWS_FAST_BILINEAR, 0, 0, 0);
-	
-	if (!scalerCtx) {
-		printf("sws_getContext() failed\n");
-		goto fail;
-	}
+	// Determine required buffer size and allocate buffer
+	int numBytes = avpicture_get_size(TARGET_IMAGE_FORMAT, codecCtx->width, codecCtx->height);
+	void * buffer = (uint8_t *) av_malloc(numBytes * sizeof(uint8_t));
+
+	// set the frame parameters
+	frame->format = TARGET_IMAGE_FORMAT;
+	frame->width = codecCtx->width;
+	frame->height = codecCtx->height;
+
+	avpicture_fill(((AVPicture *)frame),
+			buffer,
+			TARGET_IMAGE_FORMAT,
+			codecCtx->width,
+			codecCtx->height);
     
     sws_scale(scalerCtx,
     		(const uint8_t * const *) pFrame->data,
@@ -514,37 +514,49 @@ void convert_image(AVCodecContext *pCodecCtx, AVFrame *pFrame, AVPacket *avpkt,
     		0,
     		pFrame->height,
     		frame->data,
-    		frame->linesize);
-	
+            frame->linesize);
+
 	int ret = avcodec_encode_video2(codecCtx, avpkt, frame, got_packet_ptr);
 	
-	if (ret < 0) {
-		*got_packet_ptr = 0;
+	if (ret >= 0 && state->native_window) {
+		ANativeWindow_setBuffersGeometry(state->native_window, width, height, WINDOW_FORMAT_RGBA_8888);
+
+		ANativeWindow_Buffer windowBuffer;
+
+		if (ANativeWindow_lock(state->native_window, &windowBuffer, NULL) == 0) {
+			//__android_log_print(ANDROID_LOG_VERBOSE, "LOG_TAG", "width %d", windowBuffer.width);
+			//__android_log_print(ANDROID_LOG_VERBOSE, "LOG_TAG", "height %d", windowBuffer.height);
+
+			int h = 0;
+
+			for (h = 0; h < height; h++)  {
+			  memcpy(windowBuffer.bits + h * windowBuffer.stride * 4,
+			         buffer + h * frame->linesize[0],
+			         width*4);
+			}
+
+			ANativeWindow_unlockAndPost(state->native_window);
+		}
 	}
 	
-    av_free(dst_picture.data[0]);
-	
-	// TODO is this right?
-	fail:
-    av_free(frame);
-	
-	if (codecCtx) {
-		avcodec_close(codecCtx);
-	    av_free(codecCtx);
+	if (ret < 0) {
+		*got_packet_ptr = 0;
 	}
 	
-	if (scalerCtx) {
-		sws_freeContext(scalerCtx);
-	}
+    av_frame_free(&frame);
 	
+    if (buffer) {
+    	free(buffer);
+    }
+
 	if (ret < 0 || !*got_packet_ptr) {
-		av_free_packet(avpkt);
+		av_packet_unref(avpkt);
 	}
 }
 
-void decode_frame(State *state, AVPacket *pkt, int *got_frame, int64_t desired_frame_number) {
+void decode_frame(State *state, AVPacket *pkt, int *got_frame, int64_t desired_frame_number, int width, int height) {
 	// Allocate video frame
-	AVFrame *frame = avcodec_alloc_frame();
+	AVFrame *frame = av_frame_alloc();
 
 	*got_frame = 0;
 	
@@ -558,9 +570,10 @@ void decode_frame(State *state, AVPacket *pkt, int *got_frame, int64_t desired_f
 		// Is this a packet from the video stream?
 		if (pkt->stream_index == state->video_stream) {
 			int codec_id = state->video_st->codec->codec_id;
+			int pix_fmt = state->video_st->codec->pix_fmt;
 			        		
 			// If the image isn't already in a supported format convert it to one
-			if (!is_supported_format(codec_id)) {
+			if (!is_supported_format(codec_id, pix_fmt)) {
 	            *got_frame = 0;
 	            
 				// Decode video frame
@@ -573,10 +586,11 @@ void decode_frame(State *state, AVPacket *pkt, int *got_frame, int64_t desired_f
 				if (*got_frame) {
 					if (desired_frame_number == -1 ||
 							(desired_frame_number != -1 && frame->pkt_pts >= desired_frame_number)) {
+						if (pkt->data) {
+							av_packet_unref(pkt);
+						}
 					    av_init_packet(pkt);
-						pkt->data = NULL;
-      	            	pkt->size = 0;
-						convert_image(state->video_st->codec, frame, pkt, got_frame);
+						convert_image(state, state->video_st->codec, frame, pkt, got_frame, width, height);
 						break;
 					}
 				}
@@ -588,10 +602,14 @@ void decode_frame(State *state, AVPacket *pkt, int *got_frame, int64_t desired_f
 	}
 	
 	// Free the frame
-	avcodec_free_frame(&frame);
+	av_frame_free(&frame);
 }
 
 int get_frame_at_time(State **ps, int64_t timeUs, int option, AVPacket *pkt) {
+	return get_scaled_frame_at_time(ps, timeUs, option, pkt, -1, -1);
+}
+
+int get_scaled_frame_at_time(State **ps, int64_t timeUs, int option, AVPacket *pkt, int width, int height) {
 	printf("get_frame_at_time\n");
 	int got_packet = 0;
     int64_t desired_frame_number = -1;
@@ -649,7 +667,7 @@ int get_frame_at_time(State **ps, int64_t timeUs, int option, AVPacket *pkt) {
     	}
     }
     
-    decode_frame(state, pkt, &got_packet, desired_frame_number);
+    decode_frame(state, pkt, &got_packet, desired_frame_number, width, height);
     
     if (got_packet) {
     	//const char *filename = "/Users/wseemann/Desktop/one.png";
@@ -665,6 +683,26 @@ int get_frame_at_time(State **ps, int64_t timeUs, int option, AVPacket *pkt) {
 	}
 }
 
+int set_native_window(State **ps, ANativeWindow* native_window) {
+    printf("set_native_window\n");
+
+	State *state = *ps;
+
+	if (native_window == NULL) {
+		return FAILURE;
+	}
+
+	if (!state) {
+		init(&state);
+	}
+
+	state->native_window = native_window;
+
+	*ps = state;
+
+	return SUCCESS;
+}
+
 void release(State **ps) {
 	printf("release\n");
 
@@ -679,6 +717,35 @@ void release(State **ps) {
     		close(state->fd);
     	}
     	
+    	if (state->sws_ctx) {
+    		sws_freeContext(state->sws_ctx);
+    		state->sws_ctx = NULL;
+	    }
+
+    	if (state->codecCtx) {
+    		avcodec_close(state->codecCtx);
+    	    av_free(state->codecCtx);
+    	}
+
+    	if (state->sws_ctx) {
+    		sws_freeContext(state->sws_ctx);
+    	}
+
+    	if (state->scaled_codecCtx) {
+    		avcodec_close(state->scaled_codecCtx);
+    	    av_free(state->scaled_codecCtx);
+    	}
+
+    	if (state->scaled_sws_ctx) {
+    		sws_freeContext(state->scaled_sws_ctx);
+    	}
+
+        // make sure we don't leak native windows
+        if (state->native_window != NULL) {
+            ANativeWindow_release(state->native_window);
+            state->native_window = NULL;
+        }
+
     	av_freep(&state);
         ps = NULL;
     }
diff --git a/app/src/main/jni/metadata/ffmpeg_mediametadataretriever.h b/app/src/main/jni/metadata/ffmpeg_mediametadataretriever.h
index 894333c2..ccdd215a 100644
--- a/app/src/main/jni/metadata/ffmpeg_mediametadataretriever.h
+++ b/app/src/main/jni/metadata/ffmpeg_mediametadataretriever.h
@@ -2,7 +2,7 @@
  * FFmpegMediaMetadataRetriever: A unified interface for retrieving frame 
  * and meta data from an input media file.
  *
- * Copyright 2014 William Seemann
+ * Copyright 2016 William Seemann
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,9 @@
 
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavutil/dict.h>
+
+#include <android/native_window_jni.h>
 
 // Keep these in synch with the constants defined in FFmpegMediaMetadataRetriever.java
 // class.
@@ -43,13 +46,28 @@ typedef struct State {
 	int             fd;
 	int64_t         offset;
 	const char      *headers;
+	struct SwsContext *sws_ctx;
+	AVCodecContext  *codecCtx;
+
+	struct SwsContext *scaled_sws_ctx;
+	AVCodecContext  *scaled_codecCtx;
+	ANativeWindow   *native_window;
 } State;
 
+struct AVDictionary {
+	int count;
+	AVDictionaryEntry *elems;
+};
+
 int set_data_source_uri(State **ps, const char* path, const char* headers);
 int set_data_source_fd(State **ps, int fd, int64_t offset, int64_t length);
 const char* extract_metadata(State **ps, const char* key);
+const char* extract_metadata_from_chapter(State **ps, const char* key, int chapter);
+int get_metadata(State **ps, AVDictionary **metadata);
 int get_embedded_picture(State **ps, AVPacket *pkt);
 int get_frame_at_time(State **ps, int64_t timeUs, int option, AVPacket *pkt);
+int get_scaled_frame_at_time(State **ps, int64_t timeUs, int option, AVPacket *pkt, int width, int height);
+int set_native_window(State **ps, ANativeWindow* native_window);
 void release(State **ps);
 
 #endif /*FFMPEG_MEDIAMETADATARETRIEVER_H_*/
diff --git a/app/src/main/jni/metadata/mediametadataretriever.cpp b/app/src/main/jni/metadata/mediametadataretriever.cpp
index ea785d20..27c69eb3 100644
--- a/app/src/main/jni/metadata/mediametadataretriever.cpp
+++ b/app/src/main/jni/metadata/mediametadataretriever.cpp
@@ -2,7 +2,7 @@
  * FFmpegMediaMetadataRetriever: A unified interface for retrieving frame 
  * and meta data from an input media file.
  *
- * Copyright 2014 William Seemann
+ * Copyright 2016 William Seemann
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,13 +23,9 @@
 #include <mediametadataretriever.h>
 
 extern "C" {
-	#include "libavcodec/avcodec.h"
-	#include "libavformat/avformat.h"
 	#include "ffmpeg_mediametadataretriever.h"
 }
 
-using namespace std;
-
 MediaMetadataRetriever::MediaMetadataRetriever()
 {
 	state = NULL;
@@ -55,12 +51,32 @@ int MediaMetadataRetriever::getFrameAtTime(int64_t timeUs, int option, AVPacket
     return ::get_frame_at_time(&state, timeUs, option, pkt);
 }
 
+int MediaMetadataRetriever::getScaledFrameAtTime(int64_t timeUs, int option, AVPacket *pkt, int width, int height)
+{
+    return ::get_scaled_frame_at_time(&state, timeUs, option, pkt, width, height);
+}
+
 const char* MediaMetadataRetriever::extractMetadata(const char *key)
 {
     return ::extract_metadata(&state, key);
 }
 
+const char* MediaMetadataRetriever::extractMetadataFromChapter(const char *key, int chapter)
+{
+    return ::extract_metadata_from_chapter(&state, key, chapter);
+}
+
 int MediaMetadataRetriever::extractAlbumArt(AVPacket *pkt)
 {
     return ::get_embedded_picture(&state, pkt);
 }
+
+int MediaMetadataRetriever::getMetadata(bool update_only, bool apply_filter, AVDictionary **metadata)
+{
+    return get_metadata(&state, metadata);
+}
+
+int MediaMetadataRetriever::setNativeWindow(ANativeWindow* native_window)
+{
+	return ::set_native_window(&state, native_window);
+}
diff --git a/app/src/main/jni/metadata/mediametadataretriever.h b/app/src/main/jni/metadata/mediametadataretriever.h
index a438cf3b..266f1816 100644
--- a/app/src/main/jni/metadata/mediametadataretriever.h
+++ b/app/src/main/jni/metadata/mediametadataretriever.h
@@ -2,7 +2,7 @@
  * FFmpegMediaMetadataRetriever: A unified interface for retrieving frame 
  * and meta data from an input media file.
  *
- * Copyright 2014 William Seemann
+ * Copyright 2016 William Seemann
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,14 +20,12 @@
 #ifndef MEDIAMETADATARETRIEVER_H
 #define MEDIAMETADATARETRIEVER_H
 
+#include <android/native_window_jni.h>
+
 extern "C" {
-	#include "libavcodec/avcodec.h"
-	#include "libavformat/avformat.h"
     #include "ffmpeg_mediametadataretriever.h"
 }
 
-using namespace std;
-
 class MediaMetadataRetriever
 {
 	State* state;
@@ -38,8 +36,12 @@ class MediaMetadataRetriever
     int setDataSource(const char* dataSourceUrl, const char* headers);
     int setDataSource(int fd, int64_t offset, int64_t length);
     int getFrameAtTime(int64_t timeUs, int option, AVPacket *pkt);
+    int getScaledFrameAtTime(int64_t timeUs, int option, AVPacket *pkt, int width, int height);
     int extractAlbumArt(AVPacket *pkt);
     const char* extractMetadata(const char* key);
+    const char* extractMetadataFromChapter(const char* key, int chapter);
+    int getMetadata(bool update_only, bool apply_filter, AVDictionary **metadata);
+    int setNativeWindow(ANativeWindow* native_window);
 };
 
 #endif // MEDIAMETADATARETRIEVER_H
diff --git a/app/src/main/jni/player/ffmpeg_mediaplayer.c b/app/src/main/jni/player/ffmpeg_mediaplayer.c
index a36c4671..91cbfec3 100644
--- a/app/src/main/jni/player/ffmpeg_mediaplayer.c
+++ b/app/src/main/jni/player/ffmpeg_mediaplayer.c
@@ -266,7 +266,7 @@ int decode_frame_from_packet(State *state, AVPacket *aPacket, int *frame_size_pt
     if (aPacket->stream_index == state->audio_stream) {
         	
     	if (!decoded_frame) {
-    		if (!(decoded_frame = avcodec_alloc_frame())) {
+    		if (!(decoded_frame = av_frame_alloc())) {
     			__android_log_print(ANDROID_LOG_INFO, "TAG", "Could not allocate audio frame\n");
     	        return -2;
     		}
@@ -407,7 +407,7 @@ int decode_frame_from_packet(State *state, AVPacket *aPacket, int *frame_size_pt
         //*frame_size_ptr = data_size;
         state->write_audio_callback(state->clazz, samples, data_size, from_thread);
         
-    	avcodec_free_frame(&decoded_frame);
+    	av_frame_free(&decoded_frame);
         
         free(samples);
         
diff --git a/app/src/main/jni/player/net_sourceforge_servestream_media_FFmpegMediaPlayer.cpp b/app/src/main/jni/player/net_sourceforge_servestream_media_FFmpegMediaPlayer.cpp
index cf2f1e09..6797c47c 100644
--- a/app/src/main/jni/player/net_sourceforge_servestream_media_FFmpegMediaPlayer.cpp
+++ b/app/src/main/jni/player/net_sourceforge_servestream_media_FFmpegMediaPlayer.cpp
@@ -1043,8 +1043,8 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
     assert(env != NULL);
 
     if (register_net_sourceforge_servestream_media_FFmpegMediaPlayer(env) < 0) {
-        __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, "ERROR: FFmpegMediaPlayer native registration failed\n");
-        goto bail;
+        //__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, "ERROR: FFmpegMediaPlayer native registration failed\n");
+        //goto bail;
     }
 
     /* success -- return valid version number */
diff --git a/app/src/main/res/layout-sw600dp/mini_controller.xml b/app/src/main/res/layout-sw600dp/mini_controller.xml
index 61443fb3..75473717 100644
--- a/app/src/main/res/layout-sw600dp/mini_controller.xml
+++ b/app/src/main/res/layout-sw600dp/mini_controller.xml
@@ -10,8 +10,7 @@
         android:layout_width="@dimen/mini_controller_icon_width"
         android:layout_height="@dimen/mini_controller_icon_height"
         android:layout_alignParentLeft="true"
-        android:layout_marginLeft="7dp"
-        android:src="@drawable/albumart_mp_unknown_list"/>
+        android:layout_marginLeft="7dp"/>
 
     <ImageView
         android:id="@+id/previousView"
diff --git a/app/src/main/res/layout-sw720dp/mini_controller.xml b/app/src/main/res/layout-sw720dp/mini_controller.xml
index 61443fb3..75473717 100644
--- a/app/src/main/res/layout-sw720dp/mini_controller.xml
+++ b/app/src/main/res/layout-sw720dp/mini_controller.xml
@@ -10,8 +10,7 @@
         android:layout_width="@dimen/mini_controller_icon_width"
         android:layout_height="@dimen/mini_controller_icon_height"
         android:layout_alignParentLeft="true"
-        android:layout_marginLeft="7dp"
-        android:src="@drawable/albumart_mp_unknown_list"/>
+        android:layout_marginLeft="7dp"/>
 
     <ImageView
         android:id="@+id/previousView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1d1c8cf5..79691c09 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,58 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * ServeStream: A HTTP stream browser/player for Android
- * Copyright 2013 William Seemann
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/drawer_layout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:fitsSystemWindows="true"
+	tools:openDrawer="start">
 
-<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
-<android.support.v4.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+	<include
+		layout="@layout/app_bar_main"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent" />
+
+	<android.support.design.widget.NavigationView
+		android:id="@+id/nav_view"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_gravity="start"
+		android:fitsSystemWindows="true"
+		app:headerLayout="@layout/nav_header_main"
+		app:menu="@menu/activity_main_drawer" />
 
-    <LinearLayout
-    	android:layout_width="match_parent"
-    	android:layout_height="match_parent"
-    	android:orientation="vertical" >
-    
-    	<FrameLayout
-        	android:id="@+id/content_frame"
-        	android:layout_width="match_parent"
-        	android:layout_height="0dip"
-        	android:layout_weight="1" />
-    
-    	<fragment
-            android:id="@+id/mini_controller"
-    	    android:name="net.sourceforge.servestream.fragment.MiniControllerFragment"
-        	android:layout_width="fill_parent"
-        	android:layout_height="wrap_content" />
-    
-    </LinearLayout>
-    
-    <ListView
-        android:id="@+id/left_drawer"
-        android:layout_width="240dp"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:choiceMode="singleChoice"
-        android:background="?attr/nav_drawer_background"
-        android:scrollbarStyle="outsideOverlay"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"/>
-    
 </android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/fragment_browse.xml b/app/src/main/res/layout/fragment_browse.xml
index 15b512c7..602a9bf3 100644
--- a/app/src/main/res/layout/fragment_browse.xml
+++ b/app/src/main/res/layout/fragment_browse.xml
@@ -3,7 +3,7 @@
 /*
  * ServeStream: A HTTP stream browser/player for Android
  * Copyright 2013 William Seemann
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -18,23 +18,29 @@
  */
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:gravity="center_vertical" >
+<android.support.v4.widget.SwipeRefreshLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/swiperefresh"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 
-	<ListView
-		android:id="@android:id/list"
+	<LinearLayout
+		android:layout_height="match_parent"
 		android:layout_width="match_parent"
-		android:layout_height="0dip"
-		android:layout_weight="1" />
+		android:orientation="vertical">
 
-	<TextView
-		android:id="@android:id/empty"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:text="@string/no_items_label"
-		android:gravity="center" />
+		<ListView
+			android:id="@android:id/list"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"/>
+
+		<TextView
+			android:id="@android:id/empty"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:text="@string/no_items_label"
+			android:gravity="center" />
+
+	</LinearLayout>
 
-</LinearLayout>
+</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_mini_controller.xml b/app/src/main/res/layout/fragment_mini_controller.xml
index e93fe2f0..0e08902a 100644
--- a/app/src/main/res/layout/fragment_mini_controller.xml
+++ b/app/src/main/res/layout/fragment_mini_controller.xml
@@ -1,6 +1,5 @@
 <net.sourceforge.servestream.widgets.MiniController
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/miniController1"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_uri_list.xml b/app/src/main/res/layout/fragment_uri_list.xml
index f7191920..f74a3e0e 100644
--- a/app/src/main/res/layout/fragment_uri_list.xml
+++ b/app/src/main/res/layout/fragment_uri_list.xml
@@ -18,7 +18,7 @@
  */
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -27,8 +27,7 @@
 	<com.mobeta.android.dslv.DragSortListView
 		android:id="@android:id/list"
 		android:layout_width="match_parent"
-		android:layout_height="0dip"
-		android:layout_weight="1" />
+		android:layout_height="match_parent"/>
 
 	<TextView
 		android:id="@android:id/empty"
@@ -37,4 +36,15 @@
 		android:text="@string/no_urls_label"
 		android:gravity="center" />
 
-</LinearLayout>
+	<android.support.design.widget.FloatingActionButton
+		xmlns:app="http://schemas.android.com/apk/res-auto"
+		android:id="@+id/fab"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom|end"
+		android:layout_margin="@dimen/fab_margin"
+		android:src="@android:drawable/ic_input_add"
+		android:tint="@android:color/white"
+		app:backgroundTint="#ff484848"/>
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/list_item_now_playing.xml b/app/src/main/res/layout/list_item_now_playing.xml
index f5bc4105..55f019e6 100644
--- a/app/src/main/res/layout/list_item_now_playing.xml
+++ b/app/src/main/res/layout/list_item_now_playing.xml
@@ -33,7 +33,9 @@
         <ImageView
         	android:layout_width="wrap_content"
         	android:layout_height="match_parent"
-        	android:background="@drawable/ic_reorder" />
+        	android:src="@drawable/ic_reorder"
+			android:background="@null"
+			android:scaleType="center" />
         
     	<net.sourceforge.servestream.bitmap.RecyclingImageView
         	android:id="@+id/icon"
diff --git a/app/src/main/res/layout/mini_controller.xml b/app/src/main/res/layout/mini_controller.xml
index 1e2ddede..f16c9a5e 100644
--- a/app/src/main/res/layout/mini_controller.xml
+++ b/app/src/main/res/layout/mini_controller.xml
@@ -10,8 +10,7 @@
         android:layout_width="@dimen/mini_controller_icon_width"
         android:layout_height="@dimen/mini_controller_icon_height"
         android:layout_alignParentLeft="true"
-        android:layout_marginLeft="7dp"
-        android:src="@drawable/albumart_mp_unknown_list"/>
+        android:layout_marginLeft="7dp"/>
 
     <ImageView
         android:id="@+id/playPauseView"
diff --git a/app/src/main/res/menu/browse.xml b/app/src/main/res/menu/browse.xml
index 97fd7c33..35b9aeb9 100644
--- a/app/src/main/res/menu/browse.xml
+++ b/app/src/main/res/menu/browse.xml
@@ -20,11 +20,6 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:yourapp="http://schemas.android.com/apk/res-auto" >
-    <item
-        android:id="@+id/menu_item_refresh"
-        android:title="@string/list_menu_refresh"
-        android:icon="?attr/ic_action_refresh"
-        yourapp:showAsAction="always" />
     <item
         android:id="@+id/menu_search"
         android:title="@string/list_menu_search"
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 61e1a3f5..7f4f9e50 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -6,7 +6,7 @@
     -->
     <dimen name="mini_controller_font_size_line1">15sp</dimen>
     <dimen name="mini_controller_font_size_line2">13sp</dimen>
-    <dimen name="mini_controller_icon_width">124dp</dimen>
+    <dimen name="mini_controller_icon_width">70dp</dimen>
     <dimen name="mini_controller_icon_height">70dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2b6d17a1..cfc526de 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -36,7 +36,7 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="mini_controller_font_size_line1">15sp</dimen>
     <dimen name="mini_controller_font_size_line2">13sp</dimen>
-    <dimen name="mini_controller_icon_width">89dp</dimen>
+    <dimen name="mini_controller_icon_width">50dp</dimen>
     <dimen name="mini_controller_icon_height">50dp</dimen>
     
     <dimen name="text_size_small">14sp</dimen>
@@ -46,4 +46,9 @@
     <dimen name="image_thumbnail_size">64dp</dimen>
     <dimen name="image_notification_size">128dip</dimen>
 
+    <dimen name="fab_margin">16dp</dimen>
+
+    <dimen name="nav_header_vertical_spacing">16dp</dimen>
+    <dimen name="nav_header_height">160dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3d027e58..3a9c5bfb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -163,6 +163,7 @@
     <!-- Empty list labels -->
     <string name="no_items_label">There are no items in this list.</string>
     <string name="no_urls_label">You haven\'t entered any urls yet.</string>
+    <string name="no_alarms_label">No alarms set.</string>
     <string name="no_results_label">No results found.</string>
     <string name="no_paired_devices_label">No paired devices found.</string>
     
@@ -321,6 +322,9 @@
     <string name="failed_no_connection">No connection to the cast device is present</string>
     <string name="failed_no_connection_trans">Connection to the cast device has been lost. Application is trying to re-establish the connection, if possible. Please wait for a few seconds and try again.</string>
     <string name="failed_perform_action">Failed to perform the action</string>
-    
+
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+
 </resources>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4a9c9f18..e6624bd1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -56,8 +56,8 @@
     	
     	<item name="attr/nav_drawer_background">#3B3B3B</item>
     </style>
-    
-    <style name="Theme.ServeStream.DarkActionBar" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+
+    <style name="Theme.ServeStream.DarkActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="attr/ic_action_search">@drawable/ic_action_search_dark</item>
         <item name="attr/ic_action_new">@drawable/ic_action_new_dark</item>
         <item name="attr/drawer_shadow">@drawable/drawer_shadow_dark</item>
@@ -99,5 +99,23 @@
         <item name="android:actionModePasteDrawable" tools:targetApi="11">@drawable/ic_action_paste</item>
         <item name="android:actionModeSelectAllDrawable" tools:targetApi="14">@drawable/ic_action_select_all</item>
     </style>
-    
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/blue</item>
+        <item name="colorPrimaryDark">@color/blue</item>
+        <item name="colorAccent">@color/blue</item>
+    </style>
+
+    <style name="Theme.ServeStream.DarkActionBar.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionModeOverlay">true</item>
+    </style>
+
+    <style name="Theme.ServeStream.DarkActionBar.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="Theme.ServeStream.DarkActionBar.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 13e0e3dc..a3d19b33 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -20,7 +20,7 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory android:title="@string/pref_ui_category">
+    <!--<PreferenceCategory android:title="@string/pref_ui_category">
     
         <ListPreference
             android:key="theme"
@@ -30,7 +30,7 @@
             android:entryValues="@array/theme_values"
             android:entries="@array/theme_options" />
     
-    </PreferenceCategory>
+    </PreferenceCategory>-->
     
 	<PreferenceCategory
 		android:title="@string/pref_general_settings_category" >
diff --git a/build.gradle b/build.gradle
index f4d8c542..aa141380 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
     }
 }
 
diff --git a/drag-sort-listview/build.gradle b/drag-sort-listview/build.gradle
index 6a5c233c..aa141380 100644
--- a/drag-sort-listview/build.gradle
+++ b/drag-sort-listview/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
     }
 }
 
diff --git a/drag-sort-listview/dslv/dslv.iml b/drag-sort-listview/dslv/dslv.iml
index 3037882a..b3b5f049 100644
--- a/drag-sort-listview/dslv/dslv.iml
+++ b/drag-sort-listview/dslv/dslv.iml
@@ -12,10 +12,7 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
         <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
           <task>generateDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -29,7 +26,7 @@
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -51,6 +48,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -58,6 +64,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -65,18 +80,19 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f23df6e4..785025ae 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Tue Jul 19 22:47:26 CDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/local.properties b/local.properties
index 7bf2ec67..e04b917b 100644
--- a/local.properties
+++ b/local.properties
@@ -5,4 +5,4 @@
 #
 #Sat Jan 02 22:34:13 CST 2016
 sdk.dir=/Users/wseemann/Library/Android/sdk
-ndk.dir=/Users/wseemann/Android/android-ndk-r10d
\ No newline at end of file
+ndk.dir=/Users/wseemann/Android/android-ndk-r11c
\ No newline at end of file