summaryrefslogtreecommitdiff
path: root/src/de/danoeh/antennapod/activity
diff options
context:
space:
mode:
authordaniel oeh <daniel.oeh@gmail.com>2012-07-29 15:43:28 +0200
committerdaniel oeh <daniel.oeh@gmail.com>2012-07-29 15:43:28 +0200
commit328172332698301baa556db53748ad26dc3571bb (patch)
treeb8707d348ef556c68170d2b7dbd2878203e5d192 /src/de/danoeh/antennapod/activity
parentf564c9a6e2d0add73856970be0876b2325432307 (diff)
downloadAntennaPod-328172332698301baa556db53748ad26dc3571bb.zip
- Bugfix : Player did not always display the current chapter correctly.
- Added support for links in SimpleChapters
Diffstat (limited to 'src/de/danoeh/antennapod/activity')
-rw-r--r--src/de/danoeh/antennapod/activity/MediaplayerActivity.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 1023fd8f7..1ce365c2a 100644
--- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -28,6 +28,8 @@ import android.view.SurfaceHolder;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter;
import android.widget.ImageButton;
import android.widget.LinearLayout;
@@ -166,9 +168,8 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements
AlertDialog.Builder stDialog = new AlertDialog.Builder(this);
stDialog.setTitle(R.string.sleep_timer_label);
stDialog.setMessage(getString(R.string.time_left_label)
- + Converter
- .getDurationStringLong((int) playbackService
- .getSleepTimerTimeLeft()));
+ + Converter.getDurationStringLong((int) playbackService
+ .getSleepTimerTimeLeft()));
stDialog.setPositiveButton(R.string.disable_sleeptimer_label,
new DialogInterface.OnClickListener() {
@@ -367,9 +368,11 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements
@Override
protected void onProgressUpdate(Void... v) {
super.onProgressUpdate();
+ int currentPosition = playbackService.getPlayer()
+ .getCurrentPosition();
+ media.setPosition(currentPosition);
txtvPosition.setText(Converter
- .getDurationStringLong(playbackService.getPlayer()
- .getCurrentPosition()));
+ .getDurationStringLong(currentPosition));
txtvLength.setText(Converter
.getDurationStringLong(playbackService.getPlayer()
.getDuration()));
@@ -788,6 +791,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements
sCChapterFragment.setListAdapter(new SCListAdapter(
activity, 0, activity.media.getItem()
.getSimpleChapters()));
+
return sCChapterFragment;
default:
return CoverFragment.newInstance(null);