Minor layout improvements

3 files changed, 12 insertions, 10 deletions

diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
index a9b7df205..952cddf8b 100644
--- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -365,9 +365,6 @@ public abstract class MediaplayerActivity extends SherlockFragmentActivity
 			Log.d(TAG, "Loading media info");
 		FeedMedia media = controller.getMedia();
 		if (media != null) {
-			getSupportActionBar().setSubtitle(media.getItem().getTitle());
-			getSupportActionBar()
-					.setTitle(media.getItem().getFeed().getTitle());
 			txtvPosition.setText(Converter.getDurationStringLong((media
 					.getPosition())));
 
diff --git a/src/de/danoeh/antennapod/activity/VideoplayerActivity.java b/src/de/danoeh/antennapod/activity/VideoplayerActivity.java
index b9e207c52..f6ea4f69e 100644
--- a/src/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -20,6 +20,7 @@ import com.actionbarsherlock.view.Window;
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.feed.FeedMedia;
 import de.danoeh.antennapod.service.PlaybackService;
 import de.danoeh.antennapod.service.PlayerStatus;
 
@@ -54,6 +55,17 @@ public class VideoplayerActivity extends MediaplayerActivity implements
 	}
 
 	@Override
+	protected void loadMediaInfo() {
+		super.loadMediaInfo();
+		FeedMedia media = controller.getMedia();
+		if (media != null) {
+			getSupportActionBar().setSubtitle(media.getItem().getTitle());
+			getSupportActionBar()
+					.setTitle(media.getItem().getFeed().getTitle());
+		}
+	}
+
+	@Override
 	protected void setupGUI() {
 		super.setupGUI();
 		videoOverlay = (LinearLayout) findViewById(R.id.overlay);
diff --git a/src/de/danoeh/antennapod/fragment/CoverFragment.java b/src/de/danoeh/antennapod/fragment/CoverFragment.java
index e324a2928..0c3398edf 100644
--- a/src/de/danoeh/antennapod/fragment/CoverFragment.java
+++ b/src/de/danoeh/antennapod/fragment/CoverFragment.java
@@ -29,8 +29,6 @@ public class CoverFragment extends SherlockFragment implements
 
 	private FeedMedia media;
 
-	private TextView txtvTitle;
-	private TextView txtvFeed;
 	private ImageView imgvCover;
 
 	private boolean viewCreated = false;
@@ -72,8 +70,6 @@ public class CoverFragment extends SherlockFragment implements
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
 		View root = inflater.inflate(R.layout.cover_fragment, container, false);
-		txtvTitle = (TextView) root.findViewById(R.id.txtvTitle);
-		txtvFeed = (TextView) root.findViewById(R.id.txtvFeed);
 		imgvCover = (ImageView) root.findViewById(R.id.imgvCover);
 		viewCreated = true;
 		return root;
@@ -89,9 +85,6 @@ public class CoverFragment extends SherlockFragment implements
 							media.getItem().getFeed().getImage(), imgvCover);
 				}
 			});
-
-			txtvTitle.setText(media.getItem().getTitle());
-			txtvFeed.setText(media.getItem().getFeed().getTitle());
 		} else {
 			Log.w(TAG, "loadMediaInfo was called while media was null");
 		}