diff options
Diffstat (limited to 'src/de/danoeh/antennapod/activity/AudioplayerActivity.java')
| -rw-r--r-- | src/de/danoeh/antennapod/activity/AudioplayerActivity.java | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java b/src/de/danoeh/antennapod/activity/AudioplayerActivity.java index 6f98777af..469acc9fb 100644 --- a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/AudioplayerActivity.java @@ -22,11 +22,11 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.ChapterListAdapter; import de.danoeh.antennapod.asynctask.ImageLoader; import de.danoeh.antennapod.feed.Chapter; -import de.danoeh.antennapod.feed.FeedMedia; import de.danoeh.antennapod.feed.SimpleChapter; import de.danoeh.antennapod.fragment.CoverFragment; import de.danoeh.antennapod.fragment.ItemDescriptionFragment; import de.danoeh.antennapod.service.PlaybackService; +import de.danoeh.antennapod.util.Playable; /** Activity for playing audio files. */ public class AudioplayerActivity extends MediaplayerActivity { @@ -101,7 +101,7 @@ public class AudioplayerActivity extends MediaplayerActivity { if (AppConfig.DEBUG) Log.d(TAG, "Switching contentView to position " + pos); if (currentlyShownPosition != pos) { - FeedMedia media = controller.getMedia(); + Playable media = controller.getMedia(); if (media != null) { FragmentTransaction ft = getSupportFragmentManager() .beginTransaction(); @@ -113,15 +113,14 @@ public class AudioplayerActivity extends MediaplayerActivity { case POS_COVER: if (coverFragment == null) { Log.i(TAG, "Using new coverfragment"); - coverFragment = CoverFragment.newInstance(media - .getItem()); + coverFragment = CoverFragment.newInstance(media); } currentlyShownFragment = coverFragment; break; case POS_DESCR: if (descriptionFragment == null) { descriptionFragment = ItemDescriptionFragment - .newInstance(media.getItem()); + .newInstance(media); } currentlyShownFragment = descriptionFragment; break; @@ -140,7 +139,7 @@ public class AudioplayerActivity extends MediaplayerActivity { }; chapterFragment.setListAdapter(new ChapterListAdapter( - AudioplayerActivity.this, 0, media.getItem() + AudioplayerActivity.this, 0, media .getChapters(), media)); } currentlyShownFragment = chapterFragment; @@ -167,7 +166,7 @@ public class AudioplayerActivity extends MediaplayerActivity { private void updateNavButtonDrawable() { TypedArray drawables = obtainStyledAttributes(new int[] { R.attr.navigation_shownotes, R.attr.navigation_chapters }); - final FeedMedia media = controller.getMedia(); + final Playable media = controller.getMedia(); if (butNavLeft != null && butNavRight != null && media != null) { switch (currentlyShownPosition) { case POS_COVER: @@ -182,8 +181,7 @@ public class AudioplayerActivity extends MediaplayerActivity { @Override public void run() { ImageLoader.getInstance().loadThumbnailBitmap( - media.getItem().getFeed().getImage(), - butNavLeft); + media.getImageFileUrl(), butNavLeft); } }); butNavRight.setImageDrawable(drawables.getDrawable(1)); @@ -195,7 +193,7 @@ public class AudioplayerActivity extends MediaplayerActivity { @Override public void run() { ImageLoader.getInstance().loadThumbnailBitmap( - media.getItem().getFeed().getImage(), + media.getImageFileUrl(), butNavLeft); } }); @@ -251,11 +249,11 @@ public class AudioplayerActivity extends MediaplayerActivity { @Override protected void loadMediaInfo() { super.loadMediaInfo(); - final FeedMedia media = controller.getMedia(); + final Playable media = controller.getMedia(); if (media != null) { - txtvTitle.setText(media.getItem().getTitle()); - txtvFeed.setText(media.getItem().getFeed().getTitle()); - if (media.getItem().getChapters() != null) { + txtvTitle.setText(media.getEpisodeTitle()); + txtvFeed.setText(media.getFeedTitle()); + if (media.getChapters() != null) { butNavRight.setVisibility(View.VISIBLE); } else { butNavRight.setVisibility(View.GONE); @@ -302,7 +300,7 @@ public class AudioplayerActivity extends MediaplayerActivity { } public interface AudioplayerContentFragment { - public void onDataSetChanged(FeedMedia media); + public void onDataSetChanged(Playable media); } } |