Merge pull request #92 from soundcloud/update-playback-lib

update playback library

Author: tjenkinson

Makefile

@@ -51,8 +51,8 @@ sc-vendor-libs: node_modules
 		@sc/scaudio-public-api-stream-url-retriever \
 		@sc/maestro-core \
 		@sc/maestro-loaders \
-		@sc/maestro-html5-player \
-		@sc/maestro-hls-mse-player
+		@sc/scaudio-controller-html5-player \
+		@sc/scaudio-controller-hls-mse-player
 	$(NPM_BIN) run buildPlayback
 
 $(NPM_BIN): $(DESTDIR)/usr/lib/$(NODE)/bin/node

src/player-api.js

@@ -1,6 +1,6 @@
 const BackboneEvents = require('backbone-events-standalone');
 const { errors: { PlayerFatalError }, State } = require('../vendor/playback/playback').MaestroCore;
-const { errors: { GeoBlockedError, NoStreamsError, TimedOutError, NotSupportedError } } = require('../vendor/playback/playback').SCAudio;
+const { errors: { NoStreamsError, NotSupportedError } } = require('../vendor/playback/playback').SCAudio;
 
 const TIMEUPDATE_INTERVAL = 1000 / 60;
 
@@ -57,12 +57,8 @@ module.exports = function(scaudioPlayer) {
   scaudioPlayer.onLoadEnd.subscribe(() => playerApi.trigger('buffering_end'));
   scaudioPlayer.onEnded.subscribe(() => playerApi.trigger('finish'));
   scaudioPlayer.onError.subscribe((error) => {
-    if (error instanceof GeoBlockedError) {
-      playerApi.trigger('geo_blocked');
-    } else if (error instanceof NoStreamsError) {
+    if (error instanceof NoStreamsError) {
       playerApi.trigger('no_streams');
-    } else if (error instanceof TimedOutError) {
-      playerApi.trigger('no_connection');
     } else if (error instanceof NotSupportedError) {
       playerApi.trigger('no_protocol');
     } else if (error instanceof PlayerFatalError) {

src/stream.js

@@ -2,12 +2,14 @@ const api = require('./api');
 const config = require('./config');
 const playerApi = require('./player-api');
 const SCAudio = require('../vendor/playback/playback').SCAudio;
+const maestroLogger = require('../vendor/playback/playback').MaestroCore.logger;
 const StreamUrlRetriever = require('../vendor/playback/playback').SCAudioPublicApiStreamURLRetriever.StreamUrlRetriever;
-const MaestroHTML5Player = require('../vendor/playback/playback').MaestroHTML5Player.HTML5Player;
-const MaestroHLSMSEPlayer = require('../vendor/playback/playback').MaestroHLSMSEPlayer.HLSMSEPlayer;
+const MediaElementManager = require('../vendor/playback/playback').SCAudioControllerHTML5Player.MediaElementManager;
+const HTML5PlayerController = require('../vendor/playback/playback').SCAudioControllerHTML5Player.HTML5PlayerController;
+const HLSMSEPlayerController = require('../vendor/playback/playback').SCAudioControllerHLSMSEPlayer.HLSMSEPlayerController;
 const stringLoader = require('../vendor/playback/playback').MaestroLoaders.stringLoader;
 
-const SNIPPET_FADEOUT = 3000; // ms
+const mediaElementManager = new MediaElementManager('audio', maestroLogger.noOpLogger);
 
 /**
  * Fetches track info and instantiates a player for the track
@@ -42,11 +44,18 @@ module.exports = (trackPath, secretToken) => {
       loader: stringLoader
     });
 
-    const player = SCAudio.buildPlayer({
-      playerClasses: [ MaestroHTML5Player, MaestroHLSMSEPlayer ],
+    const player = new SCAudio.Player({
+      controllers: [
+        new HLSMSEPlayerController(mediaElementManager),
+        new HTML5PlayerController(mediaElementManager)
+      ],
       streamUrlRetriever,
-      fadeOutDuration: track.policy === 'SNIP' ? SNIPPET_FADEOUT : 0
+      getURLOpts: { preview: track.policy === 'SNIP' },
+      streamUrlsExpire: true,
+      mediaSessionEnabled: true,
+      logger: maestroLogger.noOpLogger
     });
+
     player.onPlay.subscribe(() => {
       if (!playRegistered) {
         playRegistered = true;
@@ -72,5 +81,5 @@ module.exports = (trackPath, secretToken) => {
  * can start even if `play()` is not from a user interaction.
  */
 module.exports.activateAudioElement = () => {
-  SCAudio.activateAudioElement();
+  mediaElementManager.activate();
 };

vendor/playback/index.js

@@ -1,8 +1,8 @@
 module.exports = {
   SCAudio: require('@sc/scaudio'),
+  SCAudioControllerHTML5Player: require('@sc/scaudio-controller-html5-player'),
+  SCAudioControllerHLSMSEPlayer: require('@sc/scaudio-controller-hls-mse-player'),
   SCAudioPublicApiStreamURLRetriever: require('@sc/scaudio-public-api-stream-url-retriever'),
   MaestroCore: require('@sc/maestro-core'),
-  MaestroLoaders: require('@sc/maestro-loaders'),
-  MaestroHTML5Player: require('@sc/maestro-html5-player'),
-  MaestroHLSMSEPlayer: require('@sc/maestro-hls-mse-player')
-};
+  MaestroLoaders: require('@sc/maestro-loaders')
+};