Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switching between players should now work

Browse Source
This commit is contained in:
daniel oeh 2012-08-05 14:57:42 +02:00
parent be7ff097b9
commit 3bcd77c0d2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/de/danoeh/antennapod/activity/VideoplayerActivity.java
View File

@ -44,7 +44,6 @@ public class VideoplayerActivity extends MediaplayerActivity implements
if (videoControlsToggler != null) {
videoControlsToggler.cancel(true);
}
finish();
}
@Override

12
src/de/danoeh/antennapod/service/PlaybackService.java
View File

@ -68,7 +68,7 @@ public class PlaybackService extends Service {
public static final String ACTION_PLAYER_NOTIFICATION = "action.de.danoeh.antennapod.service.playerNotification";
public static final String EXTRA_NOTIFICATION_CODE = "extra.de.danoeh.antennapod.service.notificationCode";
public static final String EXTRA_NOTIFICATION_TYPE = "extra.de.danoeh.antennapod.service.notificationType";
/** Used in NOTIFICATION_TYPE_RELOAD. */
public static final int EXTRA_CODE_AUDIO = 1;
public static final int EXTRA_CODE_VIDEO = 2;
@ -362,8 +362,12 @@ public class PlaybackService extends Service {
/** Called after service has extracted the media it is supposed to play. */
private void setupMediaplayer() {
if (AppConfig.DEBUG)
Log.d(TAG, "Setting up media player");
try {
if (media.getMime_type().startsWith("audio")) {
if (AppConfig.DEBUG)
Log.d(TAG, "Mime type is audio");
playingVideo = false;
if (shouldStream) {
player.setDataSource(media.getDownload_url());
@ -375,6 +379,8 @@ public class PlaybackService extends Service {
player.prepare();
}
} else if (media.getMime_type().startsWith("video")) {
if (AppConfig.DEBUG)
Log.d(TAG, "Mime type is video");
playingVideo = true;
setStatus(PlayerStatus.AWAITING_VIDEO_SURFACE);
player.setScreenOnWhilePlaying(true);
@ -485,11 +491,13 @@ public class PlaybackService extends Service {
int notificationCode = 0;
if (media.getMime_type().startsWith("audio")) {
notificationCode = EXTRA_CODE_AUDIO;
playingVideo = false;
} else if (media.getMime_type().startsWith("video")) {
notificationCode = EXTRA_CODE_VIDEO;
}
resetVideoSurface();
sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD, notificationCode);
sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD,
notificationCode);
} else {
if (AppConfig.DEBUG)
Log.d(TAG, "Stopping playback");