Exposed the API to the JS module and general fixes

Author: Guichaguri

.jshintrc

@@ -0,0 +1,11 @@
+{
+    "esversion": 6,
+    "node": true,
+    "eqnull": true,
+    "-W041": false,
+    "-W069": false,
+    "globals": {
+        "path": true,
+        "load": true
+    }
+}

README.md

@@ -11,11 +11,11 @@ This is a work-in-progress project not ready for production yet.
 
 * [x] Multi-player support
 * [x] Android MediaSession support
-* [x] Android MediaBrowser support (required for Android Auto)
+* [ ] Android MediaBrowser support (required for Android Auto)
 * [x] Android MediaStyle Notification support
 * [x] Media buttons fully handled (bluetooth, smartwatches, headphones)
 * [x] Android MediaPlayer support
-* [ ] *Optional* ExoPlayer (DASH streams, etc) support
+* [ ] *Optional* ExoPlayer (DASH, HLS, SmoothStreaming, etc) support
 * [ ] *Optional* Caching for MediaPlayer
 * [ ] *Optional* Caching for ExoPlayer
 * [ ] *Optional* Chromecast support (Default/Styled Media Receiver)

Video.js

@@ -0,0 +1,17 @@
+const React = require('react');
+const ReactNative = require('react-native');
+
+// TODO: make video work
+class Video extends React.Component {
+    render() {
+        return <NativeVideo {...this.props} />;
+    }
+}
+
+Video.propTypes = {
+    player: React.PropTypes.number
+};
+
+const NativeVideo = ReactNative.requireNativeComponent('TrackPlayerView', Video);
+
+module.exports = Video;

android/build.gradle

@@ -36,5 +36,8 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     compile 'com.facebook.react:react-native:+'
-    //compile 'com.google.android.exoplayer:exoplayer:r2.2.0'
+
+    provided 'com.danikula:videocache:2.6.4' // Caching for MediaPlayer
+    provided 'com.google.android.exoplayer:exoplayer:r2.3.1' // ExoPlayer
+    provided 'com.google.android.gms:play-services-cast-framework:10.2.1' // Chromecast
 }

android/src/main/java/guichaguri/trackplayer/TrackModule.java

@@ -8,25 +8,25 @@
 import android.support.v4.media.RatingCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
 import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import guichaguri.trackplayer.logic.PlayerService;
 import guichaguri.trackplayer.logic.components.MediaWrapper;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nullable;
 
 /**
  * @author Guilherme Chaguri
  */
-public class TrackModule extends ReactContextBaseJavaModule implements ServiceConnection, LifecycleEventListener {
+public class TrackModule extends ReactContextBaseJavaModule implements ServiceConnection {
 
     private MediaWrapper manager = null;
-    private Callback initCallback = null;
+    private Callback[] initCallbacks = null;
 
     public TrackModule(ReactApplicationContext context) {
         super(context);
@@ -43,46 +43,25 @@ public void initialize() {
 
         ReactApplicationContext context = getReactApplicationContext();
 
-        context.addLifecycleEventListener(this);
-
         Intent intent = new Intent(context, PlayerService.class);
         intent.setAction(PlayerService.ACTION_MEDIA);
         context.bindService(intent, this, Service.BIND_AUTO_CREATE);
     }
 
     @Override
     public void onCatalystInstanceDestroy() {
-        ReactApplicationContext context = getReactApplicationContext();
-
-        context.removeLifecycleEventListener(this);
-        context.unbindService(this);
-    }
-
-    @Override
-    public void onHostResume() {
-
-    }
-
-    @Override
-    public void onHostPause() {
-
-    }
-
-    @Override
-    public void onHostDestroy() {
-        ReactApplicationContext context = getReactApplicationContext();
-
-        context.removeLifecycleEventListener(this);
-        context.unbindService(this);
+        getReactApplicationContext().unbindService(this);
     }
 
     @Override
     public void onServiceConnected(ComponentName name, IBinder service) {
         manager = (MediaWrapper)service;
 
-        if(initCallback != null) {
-            initCallback.invoke();
-            initCallback = null;
+        if(initCallbacks != null) {
+            for(Callback cb : initCallbacks) {
+                cb.invoke();
+            }
+            initCallbacks = null;
         }
     }
 
@@ -91,6 +70,8 @@ public void onServiceDisconnected(ComponentName name) {
         manager = null;
     }
 
+    /* ****************************** API ****************************** */
+
     @Nullable
     @Override
     public Map<String, Object> getConstants() {
@@ -123,14 +104,19 @@ public Map<String, Object> getConstants() {
         return constants;
     }
 
-    /* ****************************** Native Functions ****************************** */
-
     @ReactMethod
     public void onReady(Callback callback) {
         if(manager != null) {
             callback.invoke();
+            return;
+        }
+
+        if(initCallbacks == null) {
+            initCallbacks = new Callback[]{callback};
         } else {
-            initCallback = callback;
+            int index = initCallbacks.length;
+            initCallbacks = Arrays.copyOf(initCallbacks, index + 1);
+            initCallbacks[index] = callback;
         }
     }
 

android/src/main/java/guichaguri/trackplayer/TrackPackage.java

@@ -29,7 +29,8 @@ public List<Class<? extends JavaScriptModule>> createJSModules() {
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext context) {
         List<ViewManager> views = new ArrayList<>();
-        views.add(new VideoManager(context));
+        // TODO make video work
+        //views.add(new VideoManager(context));
         return views;
     }
 }

android/src/main/java/guichaguri/trackplayer/VideoManager.java

@@ -5,98 +5,77 @@
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import guichaguri.trackplayer.logic.PlayerService;
 import guichaguri.trackplayer.logic.components.VideoWrapper;
-import guichaguri.trackplayer.player.view.PlayerView;
+import guichaguri.trackplayer.player.components.PlayerView;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Guilherme Chaguri
  */
-public class VideoManager extends SimpleViewManager<PlayerView> implements ServiceConnection, LifecycleEventListener {
+public class VideoManager extends SimpleViewManager<PlayerView> implements ServiceConnection {
 
     private final ReactApplicationContext context;
 
     private VideoWrapper video;
-    private int boundPlayer = -1;
+    private List<PlayerView> views = new ArrayList<>();
 
     public VideoManager(ReactApplicationContext context) {
         this.context = context;
     }
 
     @Override
     public String getName() {
-        return "PlayerView";
+        return "TrackPlayerView";
     }
 
     @Override
     public void initialize() {
         super.initialize();
 
-        context.addLifecycleEventListener(this);
-
         Intent intent = new Intent(context, PlayerService.class);
         intent.setAction(PlayerService.ACTION_VIDEO);
         context.bindService(intent, this, Service.BIND_AUTO_CREATE);
     }
 
     @Override
     public void onCatalystInstanceDestroy() {
-        context.removeLifecycleEventListener(this);
         context.unbindService(this);
     }
 
     @Override
     protected PlayerView createViewInstance(ThemedReactContext context) {
-        return new PlayerView(context);
+        PlayerView view = new PlayerView(context);
+        views.add(view);
+        return view;
     }
 
     @Override
     public void onDropViewInstance(PlayerView view) {
         // Unbind the player
-        if(boundPlayer != -1) {
-            video.setView(boundPlayer, null);
-        }
+        view.bindPlayer(video, -1);
+        views.remove(view);
     }
 
     @ReactProp(name = "player", defaultInt = -1)
     public void setPlayer(PlayerView view, int id) {
-        // Unbind the old player
-        if(boundPlayer != -1) {
-            video.setView(boundPlayer, null);
-        }
-
-        // Bind the new player
-        if(id != -1) {
-            video.setView(id, view);
-        }
-
-        boundPlayer = id;
-    }
-
-    @Override
-    public void onHostResume() {
-
-    }
-
-    @Override
-    public void onHostPause() {
-
-    }
-
-    @Override
-    public void onHostDestroy() {
-        context.removeLifecycleEventListener(this);
-        context.unbindService(this);
+        // Bind the player
+        view.bindPlayer(video, id);
     }
 
     @Override
     public void onServiceConnected(ComponentName name, IBinder service) {
         video = (VideoWrapper)service;
+
+        // Update the views
+        for(PlayerView view : views) {
+            view.updatePlayer(video);
+        }
     }
 
     @Override

android/src/main/java/guichaguri/trackplayer/logic/MediaManager.java

@@ -8,7 +8,9 @@
 import guichaguri.trackplayer.player.Player;
 import guichaguri.trackplayer.player.RemotePlayer;
 import guichaguri.trackplayer.player.players.AndroidPlayer;
-import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author Guilherme Chaguri
@@ -18,8 +20,9 @@ public class MediaManager {
     private final PlayerService service;
     private final FocusManager focus;
     private final Metadata metadata;
-    private Player[] players = new Player[0];
+    private final Map<Integer, Player> players = new HashMap<>();
 
+    private int lastId = 0;
     private Player mainPlayer;
 
     public MediaManager(PlayerService service) {
@@ -43,39 +46,30 @@ public void resetMetadata() {
     }
 
     public int createPlayer() {
-        int id = players.length;
-        players = Arrays.copyOf(players, id + 1);
-        players[id] = new AndroidPlayer(service, this); // TODO type
+        int id = lastId++;
+        players.put(id, new AndroidPlayer(service, this)); // TODO type
         return id;
     }
 
     public void destroyPlayer(int id) {
         if(id == -1) {
             // Destroys all players
-            for(Player p : players) p.destroy();
-            players = new Player[0];
+            for(Player p : players.values()) p.destroy();
+            players.clear();
         } else {
-            Player[] pls = new Player[players.length - 1];
-            for(int o = 0; o < players.length; o++) {
-                if(id == o) {
-                    players[o].destroy();
-                } else {
-                    pls[o > id ? o - 1 : o] = players[o];
-                }
-            }
-            players = pls;
+            players.remove(id).destroy();
         }
     }
 
     public Player getPlayer(int id) {
-        if(id < 0 || id >= players.length) {
+        if(id < 0 || !players.containsKey(id)) {
             throw new IllegalArgumentException();
         }
-        return players[id];
+        return players.get(id);
     }
 
-    public Player[] getPlayers() {
-        return players;
+    public Collection<Player> getPlayers() {
+        return players.values();
     }
 
     public void setMainPlayer(Player player) {
@@ -118,7 +112,7 @@ public void onCommand(Intent intent) {
     }
 
     public void onServiceDestroy() {
-        for(Player player : players) {
+        for(Player player : getPlayers()) {
             player.destroy();
         }
         metadata.destroy();
@@ -167,7 +161,7 @@ private void onMainPlayerStop() {
     }
 
     private boolean isPlayingLocal() {
-        for(Player p : players) {
+        for(Player p : getPlayers()) {
             if(p instanceof RemotePlayer) continue;
             if(Utils.isPlaying(p.getState())) return true;
         }

android/src/main/java/guichaguri/trackplayer/logic/components/VideoWrapper.java

@@ -2,9 +2,10 @@
 
 import android.os.Binder;
 import guichaguri.trackplayer.logic.MediaManager;
-import guichaguri.trackplayer.player.view.PlayerView;
+import guichaguri.trackplayer.player.components.PlayerView;
 
 /**
+ * A wrapper of {@link MediaManager} to be used as a lightweight {@link android.os.IBinder} for binding views to players
  * @author Guilherme Chaguri
  */
 public class VideoWrapper extends Binder {