Added option to play videos with external player

4 files changed, 18 insertions, 24 deletions

diff --git a/subsonic-android/res/menu/select_video_context.xml b/subsonic-android/res/menu/select_video_context.xml
index 2edcb10a..ed04b6ff 100644
--- a/subsonic-android/res/menu/select_video_context.xml
+++ b/subsonic-android/res/menu/select_video_context.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item 
+		android:id="@+id/song_menu_play_external"
+		android:title="@string/common.play_external"/>
+	
+	<item 
 		android:id="@+id/song_menu_webview"
 		android:title="@string/common.webview"
 		/>
diff --git a/subsonic-android/res/menu/select_video_context_offline.xml b/subsonic-android/res/menu/select_video_context_offline.xml
index 2edcb10a..1f0b3ebd 100644
--- a/subsonic-android/res/menu/select_video_context_offline.xml
+++ b/subsonic-android/res/menu/select_video_context_offline.xml
@@ -1,25 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item 
-		android:id="@+id/song_menu_webview"
-		android:title="@string/common.webview"
-		/>
-
-	<item 
-		android:id="@+id/song_menu_download"
-		android:title="@string/common.download"
-		/>
-
-	<item 
-		android:id="@+id/song_menu_pin"
-		android:title="@string/common.pin"
-		/>
-
-	<item 
-		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
-
-	<item 
-		android:id="@+id/song_menu_star"
-		android:title="@string/common.star"/> 
+		android:id="@+id/song_menu_play_external"
+		android:title="@string/common.play_external"/>
 </menu>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 26301b17..531c84eb 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -18,6 +18,7 @@
 	<string name="common.name">Name</string>

 	<string name="common.comment">Comment</string>

 	<string name="common.webview">Play Web View (Flash)</string>

+	<string name="common.play_external">Play External Player</string>

 

     <string name="button_bar.home">Home</string>

     <string name="button_bar.browse">Library</string>

diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
index 2d87c263..cd71db36 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
@@ -78,7 +78,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
                         intent.putExtra(Constants.INTENT_EXTRA_NAME_NAME, entry.getTitle());
                         Util.startActivityWithoutTransition(SelectAlbumActivity.this, intent);
                     } else if (entry.isVideo()) {
-                        playVideo(entry);
+                        playExternalPlayer(entry);
                     }
                 }
             }
@@ -291,7 +291,10 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
                 toggleStarred(entry);
                 break;
 			case R.id.song_menu_webview:
-				playVideo(entry);
+				playWebView(entry);
+				break;
+			case R.id.song_menu_play_external:
+				playExternalPlayer(entry);
 				break;
             default:
                 return super.onContextItemSelected(menuItem);
@@ -492,12 +495,17 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
         }
     }
 
-    private void playVideo(MusicDirectory.Entry entry) {
+    private void playWebView(MusicDirectory.Entry entry) {
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setData(Uri.parse(MusicServiceFactory.getMusicService(this).getVideoUrl(this, entry.getId())));
 		
         startActivity(intent);
     }
+	private void playExternalPlayer(MusicDirectory.Entry entry) {
+		Intent intent = new Intent(Intent.ACTION_VIEW);
+		intent.setDataAndType(Uri.parse(entry.getPath()), "video/*");
+		startActivity(intent);
+	}
 
     private void checkLicenseAndTrialPeriod(Runnable onValid) {
         if (licenseValid) {