diff options
| -rw-r--r-- | AndroidManifest.xml | 9 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/activity/VideoplayerActivity.java | 27 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/util/playback/Playable.java | 14 |
3 files changed, 44 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b0bc8ddf4..ff7d890d1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -326,6 +326,15 @@ android:name=".activity.VideoplayerActivity" android:configChanges="keyboardHidden|orientation" android:screenOrientation="landscape" > + <intent-filter> + <action android:name="android.intent.action.VIEW" /> + + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.BROWSABLE" /> + + <data android:scheme="file" /> + <data android:mimeType="video/*" /> + </intent-filter> </activity> <activity android:name=".activity.PlaybackHistoryActivity" diff --git a/src/de/danoeh/antennapod/activity/VideoplayerActivity.java b/src/de/danoeh/antennapod/activity/VideoplayerActivity.java index a663d1012..2d9834a3e 100644 --- a/src/de/danoeh/antennapod/activity/VideoplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/VideoplayerActivity.java @@ -19,9 +19,11 @@ import com.actionbarsherlock.view.Window; import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; +import de.danoeh.antennapod.feed.MediaType; import de.danoeh.antennapod.preferences.UserPreferences; import de.danoeh.antennapod.service.PlaybackService; import de.danoeh.antennapod.service.PlayerStatus; +import de.danoeh.antennapod.util.playback.ExternalMedia; import de.danoeh.antennapod.util.playback.Playable; /** Activity for playing audio files. */ @@ -55,13 +57,34 @@ public class VideoplayerActivity extends MediaplayerActivity implements } @Override + protected void onResume() { + super.onResume(); + if (getIntent().getAction() != null + && getIntent().getAction().equals(Intent.ACTION_VIEW)) { + Intent intent = getIntent(); + if (AppConfig.DEBUG) + Log.d(TAG, "Received VIEW intent: " + + intent.getData().getPath()); + ExternalMedia media = new ExternalMedia(intent.getData().getPath(), + MediaType.VIDEO); + Intent launchIntent = new Intent(this, PlaybackService.class); + launchIntent.putExtra(PlaybackService.EXTRA_PLAYABLE, media); + launchIntent.putExtra(PlaybackService.EXTRA_START_WHEN_PREPARED, + true); + launchIntent.putExtra(PlaybackService.EXTRA_SHOULD_STREAM, false); + launchIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY, + true); + startService(launchIntent); + } + } + + @Override protected void loadMediaInfo() { super.loadMediaInfo(); Playable media = controller.getMedia(); if (media != null) { getSupportActionBar().setSubtitle(media.getEpisodeTitle()); - getSupportActionBar() - .setTitle(media.getFeedTitle()); + getSupportActionBar().setTitle(media.getFeedTitle()); } } diff --git a/src/de/danoeh/antennapod/util/playback/Playable.java b/src/de/danoeh/antennapod/util/playback/Playable.java index c92b3cfef..ba2674d9b 100644 --- a/src/de/danoeh/antennapod/util/playback/Playable.java +++ b/src/de/danoeh/antennapod/util/playback/Playable.java @@ -67,7 +67,10 @@ public interface Playable extends Parcelable { /** Return position of object or 0 if position is unknown. */ public int getPosition(); - /** Returns the type of media. */ + /** + * Returns the type of media. This method should return the correct value + * BEFORE loadMetadata() is called. + */ public MediaType getMediaType(); /** @@ -151,11 +154,14 @@ public interface Playable extends Parcelable { } break; case ExternalMedia.PLAYABLE_TYPE_EXTERNAL_MEDIA: - String source = pref.getString(ExternalMedia.PREF_SOURCE_URL, null); - String mediaType = pref.getString(ExternalMedia.PREF_MEDIA_TYPE, null); + String source = pref.getString(ExternalMedia.PREF_SOURCE_URL, + null); + String mediaType = pref.getString( + ExternalMedia.PREF_MEDIA_TYPE, null); if (source != null && mediaType != null) { int position = pref.getInt(ExternalMedia.PREF_POSITION, 0); - return new ExternalMedia(source,MediaType.valueOf(mediaType), position); + return new ExternalMedia(source, + MediaType.valueOf(mediaType), position); } break; } |