Exo-player two facade and forwarders

core/src/main/java/com/novoda/noplayer/NoPlayerView.java

@@ -9,13 +9,13 @@
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.SimpleExoPlayerView;
 import com.google.android.exoplayer2.ui.SubtitleView;
-import com.novoda.noplayer.exoplayer.AspectRatioChangeForwarder;
+import com.novoda.noplayer.exoplayer.AspectRatioChangeCalculator;
 import com.novoda.notils.caster.Views;
 
-public class NoPlayerView extends FrameLayout implements AspectRatioChangeForwarder.Listener, PlayerView {
+public class NoPlayerView extends FrameLayout implements AspectRatioChangeCalculator.Listener, PlayerView {
 
     private final PlayerViewSurfaceHolder surfaceHolderProvider;
-    private final AspectRatioChangeForwarder aspectRatioChangeForwarder;
+    private final AspectRatioChangeCalculator aspectRatioChangeCalculator;
 
     private AspectRatioFrameLayout videoFrame;
     private SimpleExoPlayerView playerView;
@@ -30,7 +30,7 @@ public NoPlayerView(Context context, AttributeSet attrs) {
     public NoPlayerView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         surfaceHolderProvider = new PlayerViewSurfaceHolder();
-        aspectRatioChangeForwarder = new AspectRatioChangeForwarder(this);
+        aspectRatioChangeCalculator = new AspectRatioChangeCalculator(this);
     }
 
     @Override
@@ -93,7 +93,7 @@ public void removeControls() {
     private final Player.VideoSizeChangedListener videoSizeChangedListener = new Player.VideoSizeChangedListener() {
         @Override
         public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees, float pixelWidthHeightRatio) {
-            aspectRatioChangeForwarder.onVideoSizeChanged(width, height, unappliedRotationDegrees, pixelWidthHeightRatio);
+            aspectRatioChangeCalculator.onVideoSizeChanged(width, height, unappliedRotationDegrees, pixelWidthHeightRatio);
         }
     };
 

core/src/main/java/com/novoda/noplayer/Player.java

@@ -2,7 +2,7 @@
 
 import android.net.Uri;
 
-import com.novoda.noplayer.exoplayer.Bitrate;
+import com.novoda.noplayer.exoplayer.forwarder.Bitrate;
 import com.novoda.noplayer.player.PlayerInformation;
 
 import java.util.List;

core/src/main/java/com/novoda/noplayer/PlayerListeners.java

@@ -1,6 +1,6 @@
 package com.novoda.noplayer;
 
-import com.novoda.noplayer.exoplayer.InfoListener;
+import com.novoda.noplayer.exoplayer.forwarder.InfoListener;
 
 public interface PlayerListeners {
 

core/src/main/java/com/novoda/noplayer/PlayerListenersHolder.java

@@ -1,7 +1,7 @@
 package com.novoda.noplayer;
 
 import com.novoda.noplayer.Player.BitrateChangedListener;
-import com.novoda.noplayer.exoplayer.InfoListener;
+import com.novoda.noplayer.exoplayer.forwarder.InfoListener;
 import com.novoda.noplayer.listeners.BitrateChangedListeners;
 import com.novoda.noplayer.listeners.BufferStateListeners;
 import com.novoda.noplayer.listeners.CompletionListeners;

core/src/main/java/com/novoda/noplayer/exoplayer/AspectRatioChangeForwarder.java → core/src/main/java/com/novoda/noplayer/exoplayer/AspectRatioChangeCalculator.java

@@ -1,14 +1,13 @@
 package com.novoda.noplayer.exoplayer;
 
-public class AspectRatioChangeForwarder extends ExoPlayerEventForwarder {
+public class AspectRatioChangeCalculator {
 
     private final Listener listener;
 
-    public AspectRatioChangeForwarder(Listener listener) {
+    public AspectRatioChangeCalculator(Listener listener) {
         this.listener = listener;
     }
 
-    @Override
     public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees, float pixelWidthHeightRatio) {
         float aspectRatio = determineAspectRatio(width, height, pixelWidthHeightRatio);
         listener.onNewAspectRatio(aspectRatio);