From 345084b8feb3a6e49f35593564b3857eb5ae7cab Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 27 Oct 2017 03:15:44 -0700 Subject: [PATCH] Align naming across demo apps. - Dropped class name prefixes that correspond to whole app name - Anything that wraps the player is called PlayerManager ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=173652288 --- .../{CastDemoUtil.java => DemoUtil.java} | 4 ++-- .../exoplayer2/castdemo/MainActivity.java | 6 +++--- .../exoplayer2/castdemo/PlayerManager.java | 18 +++++++++--------- .../exoplayer2/imademo/MainActivity.java | 6 +++--- .../{DemoPlayer.java => PlayerManager.java} | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) rename demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/{CastDemoUtil.java => DemoUtil.java} (97%) rename demos/ima/src/main/java/com/google/android/exoplayer2/imademo/{DemoPlayer.java => PlayerManager.java} (98%) diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java similarity index 97% rename from demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java rename to demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java index 68c5904362..d36f8c319e 100644 --- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java +++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java @@ -24,7 +24,7 @@ import java.util.List; /** * Utility methods and constants for the Cast demo application. */ -/* package */ final class CastDemoUtil { +/* package */ final class DemoUtil { public static final String MIME_TYPE_DASH = "application/dash+xml"; public static final String MIME_TYPE_HLS = "application/vnd.apple.mpegurl"; @@ -87,6 +87,6 @@ import java.util.List; } - private CastDemoUtil() {} + private DemoUtil() {} } diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java index 2894bb8e5f..094e9f9e6e 100644 --- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java +++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java @@ -91,10 +91,10 @@ public class MainActivity extends AppCompatActivity { // User controls. - private final class SampleListAdapter extends ArrayAdapter { + private final class SampleListAdapter extends ArrayAdapter { public SampleListAdapter() { - super(getApplicationContext(), android.R.layout.simple_list_item_1, CastDemoUtil.SAMPLES); + super(getApplicationContext(), android.R.layout.simple_list_item_1, DemoUtil.SAMPLES); } @Override @@ -112,7 +112,7 @@ public class MainActivity extends AppCompatActivity { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { if (parent.getSelectedItemPosition() != position) { - CastDemoUtil.Sample currentSample = CastDemoUtil.SAMPLES.get(position); + DemoUtil.Sample currentSample = DemoUtil.SAMPLES.get(position); playerManager.setCurrentSample(currentSample, 0, true); } } diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java index 2538b03102..77dc018a73 100644 --- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java +++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java @@ -61,7 +61,7 @@ import com.google.android.gms.cast.framework.CastContext; private final CastPlayer castPlayer; private int playbackLocation; - private CastDemoUtil.Sample currentSample; + private DemoUtil.Sample currentSample; /** * @param exoPlayerView The {@link SimpleExoPlayerView} for local playback. @@ -88,11 +88,11 @@ import com.google.android.gms.cast.framework.CastContext; /** * Starts playback of the given sample at the given position. * - * @param currentSample The {@link CastDemoUtil} to play. + * @param currentSample The {@link DemoUtil} to play. * @param positionMs The position at which playback should start. * @param playWhenReady Whether the player should proceed when ready to do so. */ - public void setCurrentSample(CastDemoUtil.Sample currentSample, long positionMs, + public void setCurrentSample(DemoUtil.Sample currentSample, long positionMs, boolean playWhenReady) { this.currentSample = currentSample; if (playbackLocation == PLAYBACK_REMOTE) { @@ -144,7 +144,7 @@ import com.google.android.gms.cast.framework.CastContext; // Internal methods. - private static MediaQueueItem buildMediaQueueItem(CastDemoUtil.Sample sample) { + private static MediaQueueItem buildMediaQueueItem(DemoUtil.Sample sample) { MediaMetadata movieMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE); movieMetadata.putString(MediaMetadata.KEY_TITLE, sample.name); MediaInfo mediaInfo = new MediaInfo.Builder(sample.uri) @@ -153,18 +153,18 @@ import com.google.android.gms.cast.framework.CastContext; return new MediaQueueItem.Builder(mediaInfo).build(); } - private static MediaSource buildMediaSource(CastDemoUtil.Sample sample) { + private static MediaSource buildMediaSource(DemoUtil.Sample sample) { Uri uri = Uri.parse(sample.uri); switch (sample.mimeType) { - case CastDemoUtil.MIME_TYPE_SS: + case DemoUtil.MIME_TYPE_SS: return new SsMediaSource(uri, DATA_SOURCE_FACTORY, new DefaultSsChunkSource.Factory(DATA_SOURCE_FACTORY), null, null); - case CastDemoUtil.MIME_TYPE_DASH: + case DemoUtil.MIME_TYPE_DASH: return new DashMediaSource(uri, DATA_SOURCE_FACTORY, new DefaultDashChunkSource.Factory(DATA_SOURCE_FACTORY), null, null); - case CastDemoUtil.MIME_TYPE_HLS: + case DemoUtil.MIME_TYPE_HLS: return new HlsMediaSource(uri, DATA_SOURCE_FACTORY, null, null); - case CastDemoUtil.MIME_TYPE_VIDEO_MP4: + case DemoUtil.MIME_TYPE_VIDEO_MP4: return new ExtractorMediaSource(uri, DATA_SOURCE_FACTORY, new DefaultExtractorsFactory(), null, null); default: { diff --git a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java index b1e3a53694..fb9cd05cd4 100644 --- a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java +++ b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java @@ -22,19 +22,19 @@ import com.google.android.exoplayer2.ui.SimpleExoPlayerView; /** * Main Activity for the IMA plugin demo. {@link ExoPlayer} objects are created by - * {@link DemoPlayer}, which this class instantiates. + * {@link PlayerManager}, which this class instantiates. */ public final class MainActivity extends Activity { private SimpleExoPlayerView playerView; - private DemoPlayer player; + private PlayerManager player; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.main_activity); playerView = findViewById(R.id.player_view); - player = new DemoPlayer(this); + player = new PlayerManager(this); } @Override diff --git a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java similarity index 98% rename from demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java rename to demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java index 67d96d7f68..e11c840d12 100644 --- a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java +++ b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java @@ -40,14 +40,14 @@ import com.google.android.exoplayer2.util.Util; /** * Manages the {@link ExoPlayer}, the IMA plugin and all video playback. */ -/* package */ final class DemoPlayer { +/* package */ final class PlayerManager { private final ImaAdsLoader adsLoader; private SimpleExoPlayer player; private long contentPosition; - public DemoPlayer(Context context) { + public PlayerManager(Context context) { String adTag = context.getString(R.string.ad_tag_url); adsLoader = new ImaAdsLoader(context, Uri.parse(adTag)); }