@jwplayer/jwplayer-react-native 1.0.0 → 1.0.2

package/android/src/main/java/com/jwplayer/rnjwplayer/RNJWPlayerViewManager.java

@@ -159,6 +159,10 @@ public class RNJWPlayerViewManager extends SimpleViewManager<RNJWPlayerView> {
                     MapBuilder.of(
                             "phasedRegistrationNames",
                             MapBuilder.of("bubbled", "onCasting")))
+            .put("topFirstFrame",
+                    MapBuilder.of(
+                            "phasedRegistrationNames",
+                            MapBuilder.of("bubbled", "onLoaded")))
             .build();
   }
 

package/android/src/main/java/com/jwplayer/rnjwplayer/Util.java

@@ -21,6 +21,7 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Locale;
 
 public class Util {
 
@@ -98,7 +99,7 @@ public class Util {
                     if (sourceProp.hasKey("file")) {
                         String file = sourceProp.getString("file");
                         String label = sourceProp.getString("label");
-                        boolean isDefault = sourceProp.getBoolean("default");
+                        boolean isDefault = sourceProp.hasKey("default") ? sourceProp.getBoolean("default") : false;
                         MediaSource source = new MediaSource.Builder().file(file).label(label).isDefault(isDefault).build();
                         sources.add(source);
                     }
@@ -147,8 +148,13 @@ public class Util {
                     if (trackProp.hasKey("file")) {
                         String file = trackProp.getString("file");
                         String label = trackProp.getString("label");
-                        boolean isDefault = trackProp.getBoolean("default");
-                        Caption caption = new Caption.Builder().file(file).label(label).kind(CaptionType.CAPTIONS).isDefault(isDefault).build();
+                        CaptionType kind = CaptionType.CAPTIONS;
+                        // Being safe to old implementations though this should be required. 
+                        if (trackProp.hasKey("kind")) {
+                            kind = getCaptionType(trackProp.getString("kind").toUpperCase(Locale.US));
+                        }
+                        boolean isDefault = trackProp.hasKey("default") ? trackProp.getBoolean("default") : false;
+                        Caption caption = new Caption.Builder().file(file).label(label).kind(kind).isDefault(isDefault).build();
                         tracks.add(caption);
                     }
                 }
@@ -186,6 +192,21 @@ public class Util {
         return itemBuilder.build();
     }
 
+    /**
+     * Internal helper for parsing a caption type from a known string
+     * @param type one of "CAPTIONS", "CHAPTERS", "THUMBNAILS"
+     * @return the correct Enum CaptionType
+     */
+    public static CaptionType getCaptionType(String type){
+        for (CaptionType captionType: CaptionType.values()) {
+            if (captionType.name().equals(type)) {
+                return CaptionType.valueOf(type);
+            }
+        }
+        // This should never happen. If a null is returned, expect a crash. Check `type` is specified type
+        return null;
+    }
+
     public enum AdEventType {
         JWAdEventTypeAdBreakEnd(0),
         JWAdEventTypeAdBreakStart(1),

package/badges/version.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="20" role="img" aria-label="version: 1.0.0"><title>version: 1.0.0</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="90" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="51" height="20" fill="#555"/><rect x="51" width="39" height="20" fill="#007ec6"/><rect width="90" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="265" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">version</text><text x="265" y="140" transform="scale(.1)" fill="#fff" textLength="410">version</text><text aria-hidden="true" x="695" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="290">1.0.0</text><text x="695" y="140" transform="scale(.1)" fill="#fff" textLength="290">1.0.0</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="90" height="20" role="img" aria-label="version: 1.0.2"><title>version: 1.0.2</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="90" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="51" height="20" fill="#555"/><rect x="51" width="39" height="20" fill="#007ec6"/><rect width="90" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="265" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">version</text><text x="265" y="140" transform="scale(.1)" fill="#fff" textLength="410">version</text><text aria-hidden="true" x="695" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="290">1.0.2</text><text x="695" y="140" transform="scale(.1)" fill="#fff" textLength="290">1.0.2</text></g></svg>

package/index.d.ts

@@ -1,4 +1,4 @@
-declare module "jwplayer-react-native" {
+declare module "@jwplayer/jwplayer-react-native" {
   import React from "react";
   import { ViewStyle } from "react-native";
 
@@ -216,7 +216,7 @@ declare module "jwplayer-react-native" {
   interface JwTrack {
     id?: string;
     file?: string;
-    kind: string;
+    kind: TrackKind;
     label?: string;
     default?: boolean;
   }
@@ -251,9 +251,13 @@ declare module "jwplayer-react-native" {
     label: string;
     default?: boolean;
   }
+
+  type TrackKind = "captions" | "chapters" | "thumbnails";
+
   interface Track {
     file: string;
     label: string;
+    kind: TrackKind;
     default?: boolean;
   }
   interface JWAdSettings {
@@ -349,6 +353,9 @@ declare module "jwplayer-react-native" {
     size?: number;
   }
   type EdgeStyles = "none" | "dropshadow" | "raised" | "depressed" | "uniform";
+
+  // All `Styling` is only intended to be used with iOS. Android requires overloading
+  // of the JWP IDs seen here: https://docs.jwplayer.com/players/docs/android-styling-guide
   interface Styling {
     colors?: {
       buttons?: string;
@@ -441,6 +448,7 @@ declare module "jwplayer-react-native" {
     landscapeOnFullScreen?: boolean;
     portraitOnExitFullScreen?: boolean;
     exitFullScreenOnPortrait?: boolean;
+    playerInModal?: boolean;
     playlist?: PlaylistItem[];
     stretching?: string;
     related?: Related;
@@ -479,6 +487,9 @@ declare module "jwplayer-react-native" {
   interface PlaylistEventProps {
     playlist: PlaylistItem[]
   }
+  interface LoadEventProps {
+    loadTime: number;
+  }
   interface PlaylistItemEventProps {
     playlistItem: PlaylistItem
   }
@@ -504,6 +515,7 @@ declare module "jwplayer-react-native" {
     forceLegacyConfig?: boolean;
     onPlayerReady?: () => void;
     onPlaylist?: (event: BaseEvent<PlaylistEventProps>) => void;
+    onLoaded? : (event: BaseEvent<LoadEventProps>) => void;
     onBeforePlay?: () => void;
     onBeforeComplete?: () => void;
     onComplete?: () => void;

package/index.js

@@ -6,7 +6,7 @@ import {
 	findNodeHandle,
 } from 'react-native';
 import PropTypes from 'prop-types';
-import _ from 'lodash';
+import isEqualWith from 'lodash.isequalwith';
 
 const RNJWPlayerManager =
 	Platform.OS === 'ios'
@@ -232,6 +232,8 @@ export default class JWPlayer extends Component {
 						PropTypes.shape({
 							file: PropTypes.string,
 							label: PropTypes.string,
+							kind: PropTypes.oneOf(['captions', 'thumbnails', 'chapters']),
+							default: PropTypes.bool
 						})
 					),
 					adSchedule: PropTypes.arrayOf(
@@ -252,6 +254,8 @@ export default class JWPlayer extends Component {
 				'hidden',
 				'onscreen',
 			]),
+			// All `Styling` is only intended to be used with iOS. Android requires overloading
+			// of the JWP IDs seen here: https://docs.jwplayer.com/players/docs/android-styling-guide
 			styling: PropTypes.shape({
 				colors: PropTypes.shape({
 					buttons: PropTypes.string,
@@ -302,6 +306,7 @@ export default class JWPlayer extends Component {
 			offlineImage: PropTypes.string,
 			forceFullScreenOnLandscape: PropTypes.bool,
 			forceLandscapeOnFullScreen: PropTypes.bool,
+			playerInModal: PropTypes.bool,
 			enableLockScreenControls: PropTypes.bool,
 			stretching: PropTypes.oneOf([
 				'uniform',
@@ -315,6 +320,7 @@ export default class JWPlayer extends Component {
 		}),
 		onPlayerReady: PropTypes.func,
 		onPlaylist: PropTypes.func,
+		onLoaded: PropTypes.func,
 		changePlaylist: PropTypes.func,
 		play: PropTypes.func,
 		pause: PropTypes.func,
@@ -385,7 +391,7 @@ export default class JWPlayer extends Component {
 		var { config, controls } = nextProps;
 		var thisConfig = this.props.config || {};
 
-		var result = !_.isEqualWith(
+		var result = !isEqualWith(
 			config,
 			thisConfig,
 			(value1, value2, key) => {

package/ios/RNJWPlayer/RNJWPlayerView.swift

@@ -10,14 +10,17 @@ import AVFoundation
 import AVKit
 import MediaPlayer
 import React
-import GoogleCast
 import JWPlayerKit
 
-class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDelegate, JWCastDelegate, JWAVDelegate, JWPlayerViewDelegate, JWPlayerViewControllerDelegate, JWDRMContentKeyDataSource, AVPictureInPictureControllerDelegate {
+#if USE_GOOGLE_CAST
+    import GoogleCast
+#endif
+
+class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDelegate, JWAVDelegate, JWPlayerViewDelegate, JWPlayerViewControllerDelegate, JWDRMContentKeyDataSource, JWTimeEventListener, AVPictureInPictureControllerDelegate {
     
     // MARK: - RNJWPlayer allocation
 
-    var playerViewController:RNJWPlayerViewController!
+    var playerViewController: RNJWPlayerViewController!
     var playerView: JWPlayerView!
     var audioSession: AVAudioSession!
     var pipEnabled: Bool = true
@@ -39,49 +42,49 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
     var isCasting: Bool = false
     var availableDevices: [AnyObject]!
     
-    @objc var onBuffer:RCTDirectEventBlock?
-    @objc var onUpdateBuffer:RCTDirectEventBlock?
-    @objc var onPlay:RCTDirectEventBlock?
-    @objc var onBeforePlay:RCTDirectEventBlock?
-    @objc var onAttemptPlay:RCTDirectEventBlock?
-    @objc var onPause:RCTDirectEventBlock?
-    @objc var onIdle:RCTDirectEventBlock?
-    @objc var onPlaylistItem:RCTDirectEventBlock?
-    @objc var onLoaded:RCTDirectEventBlock?
-    @objc var onVisible:RCTDirectEventBlock?
-    @objc var onTime:RCTDirectEventBlock?
-    @objc var onSeek:RCTDirectEventBlock?
-    @objc var onSeeked:RCTDirectEventBlock?
-    @objc var onRateChanged:RCTDirectEventBlock?
-    @objc var onPlaylist:RCTDirectEventBlock?
-    @objc var onPlaylistComplete:RCTDirectEventBlock?
-    @objc var onBeforeComplete:RCTDirectEventBlock?
-    @objc var onComplete:RCTDirectEventBlock?
-    @objc var onAudioTracks:RCTDirectEventBlock?
-    @objc var onPlayerReady:RCTDirectEventBlock?
-    @objc var onSetupPlayerError:RCTDirectEventBlock?
-    @objc var onPlayerError:RCTDirectEventBlock?
-    @objc var onPlayerWarning:RCTDirectEventBlock?
-    @objc var onPlayerAdWarning:RCTDirectEventBlock?
-    @objc var onPlayerAdError:RCTDirectEventBlock?
-    @objc var onAdEvent:RCTDirectEventBlock?
-    @objc var onAdTime:RCTDirectEventBlock?
-    @objc var onScreenTapped:RCTDirectEventBlock?
-    @objc var onControlBarVisible:RCTDirectEventBlock?
-    @objc var onFullScreen:RCTDirectEventBlock?
-    @objc var onFullScreenRequested:RCTDirectEventBlock?
-    @objc var onFullScreenExit:RCTDirectEventBlock?
-    @objc var onFullScreenExitRequested:RCTDirectEventBlock?
-    @objc var onPlayerSizeChange:RCTDirectEventBlock?
-    @objc var onCastingDevicesAvailable:RCTDirectEventBlock?
-    @objc var onConnectedToCastingDevice:RCTDirectEventBlock?
-    @objc var onDisconnectedFromCastingDevice:RCTDirectEventBlock?
-    @objc var onConnectionTemporarilySuspended:RCTDirectEventBlock?
-    @objc var onConnectionRecovered:RCTDirectEventBlock?
-    @objc var onConnectionFailed:RCTDirectEventBlock?
-    @objc var onCasting:RCTDirectEventBlock?
-    @objc var onCastingEnded:RCTDirectEventBlock?
-    @objc var onCastingFailed:RCTDirectEventBlock?
+    @objc var onBuffer: RCTDirectEventBlock?
+    @objc var onUpdateBuffer: RCTDirectEventBlock?
+    @objc var onPlay: RCTDirectEventBlock?
+    @objc var onBeforePlay: RCTDirectEventBlock?
+    @objc var onAttemptPlay: RCTDirectEventBlock?
+    @objc var onPause: RCTDirectEventBlock?
+    @objc var onIdle: RCTDirectEventBlock?
+    @objc var onPlaylistItem: RCTDirectEventBlock?
+    @objc var onLoaded: RCTDirectEventBlock?
+    @objc var onVisible: RCTDirectEventBlock?
+    @objc var onTime: RCTDirectEventBlock?
+    @objc var onSeek: RCTDirectEventBlock?
+    @objc var onSeeked: RCTDirectEventBlock?
+    @objc var onRateChanged: RCTDirectEventBlock?
+    @objc var onPlaylist: RCTDirectEventBlock?
+    @objc var onPlaylistComplete: RCTDirectEventBlock?
+    @objc var onBeforeComplete: RCTDirectEventBlock?
+    @objc var onComplete: RCTDirectEventBlock?
+    @objc var onAudioTracks: RCTDirectEventBlock?
+    @objc var onPlayerReady: RCTDirectEventBlock?
+    @objc var onSetupPlayerError: RCTDirectEventBlock?
+    @objc var onPlayerError: RCTDirectEventBlock?
+    @objc var onPlayerWarning: RCTDirectEventBlock?
+    @objc var onPlayerAdWarning: RCTDirectEventBlock?
+    @objc var onPlayerAdError: RCTDirectEventBlock?
+    @objc var onAdEvent: RCTDirectEventBlock?
+    @objc var onAdTime: RCTDirectEventBlock?
+    @objc var onScreenTapped: RCTDirectEventBlock?
+    @objc var onControlBarVisible: RCTDirectEventBlock?
+    @objc var onFullScreen: RCTDirectEventBlock?
+    @objc var onFullScreenRequested: RCTDirectEventBlock?
+    @objc var onFullScreenExit: RCTDirectEventBlock?
+    @objc var onFullScreenExitRequested: RCTDirectEventBlock?
+    @objc var onPlayerSizeChange: RCTDirectEventBlock?
+    @objc var onCastingDevicesAvailable: RCTDirectEventBlock?
+    @objc var onConnectedToCastingDevice: RCTDirectEventBlock?
+    @objc var onDisconnectedFromCastingDevice: RCTDirectEventBlock?
+    @objc var onConnectionTemporarilySuspended: RCTDirectEventBlock?
+    @objc var onConnectionRecovered: RCTDirectEventBlock?
+    @objc var onConnectionFailed: RCTDirectEventBlock?
+    @objc var onCasting: RCTDirectEventBlock?
+    @objc var onCastingEnded: RCTDirectEventBlock?
+    @objc var onCastingFailed: RCTDirectEventBlock?
     
     init() {
         super.init(frame: CGRect(x: 20, y: 0, width: UIScreen.main.bounds.width - 40, height: 300))
@@ -279,7 +282,7 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
     func setNewConfig(config: [String : Any]) {
         let forceLegacyConfig = config["forceLegacyConfig"] as? Bool?
         let data:Data! = try? JSONSerialization.data(withJSONObject: config, options:.prettyPrinted)
-        let jwConfig = try? JWJSONParser.configFromJSON(data)
+        let jwConfig = try? JWJSONParser.config(from:data)
         
         currentConfig = config
 
@@ -1071,11 +1074,11 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
     
     // MARK: Time events
 
-    func onAdTimeEvent(time:JWTimeData) {
+    func onAdTimeEvent(_ time:JWTimeData) {
         self.onAdTime?(["position": time.position, "duration": time.duration])
     }
 
-    func onMediaTimeEvent(time:JWTimeData) {
+    func onMediaTimeEvent(_ time:JWTimeData) {
         self.onTime?(["position": time.position, "duration": time.duration])
     }
 
@@ -1189,7 +1192,7 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
     }
 
     func jwplayer(_ player:JWPlayer, didFinishLoadingWithTime loadTime:TimeInterval) {
-        self.onLoaded?([:])
+        self.onLoaded?(["loadTime":loadTime])
     }
 
     func jwplayer(_ player:JWPlayer, isAttemptingToPlay playlistItem:JWPlayerItem, reason:JWPlayReason) {
@@ -1382,152 +1385,6 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
         self.onAdEvent?(["client": event.client, "type": event.type])
     }
 
-// pragma Mark - Casting methods
-
-    func setUpCastController() {
-        if (playerView != nil) && playerView.player as! Bool && (castController == nil) {
-           castController = JWCastController(player:playerView.player)
-           castController.delegate = self
-       }
-
-       self.scanForDevices()
-    }
-
-    func scanForDevices() {
-       if castController != nil {
-           castController.startDiscovery()
-       }
-    }
-
-    func stopScanForDevices() {
-       if castController != nil {
-           castController.stopDiscovery()
-       }
-    }
-
-    func presentCastDialog() {
-        GCKCastContext.sharedInstance().presentCastDialog()
-    }
-
-    func startDiscovery() {
-        GCKCastContext.sharedInstance().discoveryManager.startDiscovery()
-    }
-
-    func stopDiscovery() {
-        GCKCastContext.sharedInstance().discoveryManager.stopDiscovery()
-    }
-
-    func discoveryActive() -> Bool {
-        return GCKCastContext.sharedInstance().discoveryManager.discoveryActive
-    }
-
-    func hasDiscoveredDevices() -> Bool {
-        return GCKCastContext.sharedInstance().discoveryManager.hasDiscoveredDevices
-    }
-
-    func discoveryState() -> GCKDiscoveryState {
-        return GCKCastContext.sharedInstance().discoveryManager.discoveryState
-    }
-
-    func setPassiveScan(passive:Bool) {
-        GCKCastContext.sharedInstance().discoveryManager.passiveScan = passive
-    }
-
-    func castState() -> GCKCastState {
-        return GCKCastContext.sharedInstance().castState
-    }
-
-    func deviceCount() -> UInt {
-        return GCKCastContext.sharedInstance().discoveryManager.deviceCount
-    }
-
-    func getAvailableDevices() -> [JWCastingDevice]! {
-        return castController.availableDevices
-    }
-
-    func connectedDevice() -> JWCastingDevice! {
-        return castController.connectedDevice
-    }
-
-    func connectToDevice(device:JWCastingDevice!) {
-        return castController.connectToDevice(device)
-    }
-
-    func cast() {
-        return castController.cast()
-    }
-
-    func stopCasting() {
-        return castController.stopCasting()
-    }
-
-    // MARK: - JWPlayer Cast Delegate
-    
-    func castController(_ controller: JWCastController, castingBeganWithDevice device: JWCastingDevice) {
-        self.onCasting?([:])
-    }
-    
-    func castController(_ controller:JWCastController, castingEndedWithError error: Error?) {
-        self.onCastingEnded?(["error": error as Any])
-    }
-
-    func castController(_ controller:JWCastController, castingFailedWithError error: Error) {
-        self.onCastingFailed?(["error": error as Any])
-    }
-
-    func castController(_ controller:JWCastController, connectedTo device: JWCastingDevice) {
-        let dict:NSMutableDictionary! = NSMutableDictionary()
-
-        dict.setObject(device.name, forKey:"name" as NSCopying)
-        dict.setObject(device.identifier, forKey:"identifier" as NSCopying)
-        
-        do {
-            let data:Data! = try JSONSerialization.data(withJSONObject: dict as Any, options:.prettyPrinted)
-
-            self.onConnectedToCastingDevice?(["device": String(data:data as Data, encoding:String.Encoding.utf8) as Any])
-        } catch {
-            print("Error converting dictionary to JSON data: \(error)")
-        }
-    }
-    
-    func castController(_ controller:JWCastController, connectionFailedWithError error: Error) {
-        self.onConnectionFailed?(["error": error as Any])
-    }
-
-    func castController(_ controller: JWCastController, connectionRecoveredWithDevice device:JWCastingDevice) {
-        self.onConnectionRecovered?([:])
-    }
-
-    func castController(_ controller: JWCastController, connectionSuspendedWithDevice device: JWCastingDevice) {
-        self.onConnectionTemporarilySuspended?([:])
-    }
-
-    func castController(_ controller: JWCastController, devicesAvailable devices:[JWCastingDevice]) {
-        self.availableDevices = devices
-
-        var devicesInfo: [[String: Any]] = []
-        for device in devices {
-            var dict: [String: Any] = [:]
-
-            dict["name"] = device.name
-            dict["identifier"] = device.identifier
-
-            devicesInfo.append(dict)
-        }
-
-        do {
-            let data:Data! = try JSONSerialization.data(withJSONObject: devicesInfo as Any, options:.prettyPrinted)
-
-            self.onCastingDevicesAvailable?(["devices": String(data:data as Data, encoding:String.Encoding.utf8) as Any])
-        } catch {
-            print("Error converting dictionary to JSON data: \(error)")
-        }
-    }
-    
-    func castController(_ controller: JWCastController, disconnectedWithError error: (Error)?) {
-        self.onDisconnectedFromCastingDevice?(["error": error as Any])
-    }
-
     // MARK: - JWPlayer AV Delegate
 
     func jwplayer(_ player:JWPlayer, audioTracksUpdated levels:[JWMediaSelectionOption]) {
@@ -1835,3 +1692,152 @@ class RNJWPlayerView : UIView, JWPlayerDelegate, JWPlayerStateDelegate, JWAdDele
     }
 
 }
+
+#if USE_GOOGLE_CAST
+extension RNJWPlayerView: JWCastDelegate {
+    // pragma Mark - Casting methods
+    func setUpCastController() {
+        if (playerView != nil) && playerView.player as! Bool && (castController == nil) {
+           castController = JWCastController(player:playerView.player)
+           castController.delegate = self
+       }
+
+       self.scanForDevices()
+    }
+
+    func scanForDevices() {
+       if castController != nil {
+           castController.startDiscovery()
+       }
+    }
+
+    func stopScanForDevices() {
+       if castController != nil {
+           castController.stopDiscovery()
+       }
+    }
+
+    func presentCastDialog() {
+        GCKCastContext.sharedInstance().presentCastDialog()
+    }
+
+    func startDiscovery() {
+        GCKCastContext.sharedInstance().discoveryManager.startDiscovery()
+    }
+
+    func stopDiscovery() {
+        GCKCastContext.sharedInstance().discoveryManager.stopDiscovery()
+    }
+
+    func discoveryActive() -> Bool {
+        return GCKCastContext.sharedInstance().discoveryManager.discoveryActive
+    }
+
+    func hasDiscoveredDevices() -> Bool {
+        return GCKCastContext.sharedInstance().discoveryManager.hasDiscoveredDevices
+    }
+
+    func discoveryState() -> GCKDiscoveryState {
+        return GCKCastContext.sharedInstance().discoveryManager.discoveryState
+    }
+
+    func setPassiveScan(passive:Bool) {
+        GCKCastContext.sharedInstance().discoveryManager.passiveScan = passive
+    }
+
+    func castState() -> GCKCastState {
+        return GCKCastContext.sharedInstance().castState
+    }
+
+    func deviceCount() -> UInt {
+        return GCKCastContext.sharedInstance().discoveryManager.deviceCount
+    }
+
+    func getAvailableDevices() -> [JWCastingDevice]! {
+        return castController.availableDevices
+    }
+
+    func connectedDevice() -> JWCastingDevice! {
+        return castController.connectedDevice
+    }
+
+    func connectToDevice(device:JWCastingDevice!) {
+        return castController.connectToDevice(device)
+    }
+
+    func cast() {
+        return castController.cast()
+    }
+
+    func stopCasting() {
+        return castController.stopCasting()
+    }
+
+    // MARK: - JWPlayer Cast Delegate
+    
+    func castController(_ controller: JWCastController, castingBeganWithDevice device: JWCastingDevice) {
+        self.onCasting?([:])
+    }
+    
+    func castController(_ controller:JWCastController, castingEndedWithError error: Error?) {
+        self.onCastingEnded?(["error": error as Any])
+    }
+
+    func castController(_ controller:JWCastController, castingFailedWithError error: Error) {
+        self.onCastingFailed?(["error": error as Any])
+    }
+
+    func castController(_ controller:JWCastController, connectedTo device: JWCastingDevice) {
+        let dict:NSMutableDictionary! = NSMutableDictionary()
+
+        dict.setObject(device.name, forKey:"name" as NSCopying)
+        dict.setObject(device.identifier, forKey:"identifier" as NSCopying)
+        
+        do {
+            let data:Data! = try JSONSerialization.data(withJSONObject: dict as Any, options:.prettyPrinted)
+
+            self.onConnectedToCastingDevice?(["device": String(data:data as Data, encoding:String.Encoding.utf8) as Any])
+        } catch {
+            print("Error converting dictionary to JSON data: \(error)")
+        }
+    }
+    
+    func castController(_ controller:JWCastController, connectionFailedWithError error: Error) {
+        self.onConnectionFailed?(["error": error as Any])
+    }
+
+    func castController(_ controller: JWCastController, connectionRecoveredWithDevice device:JWCastingDevice) {
+        self.onConnectionRecovered?([:])
+    }
+
+    func castController(_ controller: JWCastController, connectionSuspendedWithDevice device: JWCastingDevice) {
+        self.onConnectionTemporarilySuspended?([:])
+    }
+
+    func castController(_ controller: JWCastController, devicesAvailable devices:[JWCastingDevice]) {
+        self.availableDevices = devices
+
+        var devicesInfo: [[String: Any]] = []
+        for device in devices {
+            var dict: [String: Any] = [:]
+
+            dict["name"] = device.name
+            dict["identifier"] = device.identifier
+
+            devicesInfo.append(dict)
+        }
+
+        do {
+            let data:Data! = try JSONSerialization.data(withJSONObject: devicesInfo as Any, options:.prettyPrinted)
+
+            self.onCastingDevicesAvailable?(["devices": String(data:data as Data, encoding:String.Encoding.utf8) as Any])
+        } catch {
+            print("Error converting dictionary to JSON data: \(error)")
+        }
+    }
+    
+    func castController(_ controller: JWCastController, disconnectedWithError error: (Error)?) {
+        self.onDisconnectedFromCastingDevice?(["error": error as Any])
+    }
+}
+#endif