Moved videotrack unwrapping out of VC

MattGson · Jul 23, 2017 · 4d66e28 · 4d66e28
1 parent 7a51b7d
commit 4d66e28
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/RTClient.swift b/RTClient.swift
@@ -11,7 +11,7 @@ import SocketRocket
 
 protocol RTClientDelegate {
 
-    func addedStream(stream:RTCMediaStream);
+    func addedRemoteVideoTrack(videoTrack:RTCVideoTrack);
     func didConnect();
     func didDisconnect();
 }
@@ -201,8 +201,10 @@ extension RTClient:WebRTCDelegate {
     func addedStream(stream: RTCMediaStream) {
 
         self.remoteStream = stream;
-        self.delegate.addedStream(stream: self.remoteStream!);
-
+        if (stream.videoTracks.count > 0) {
+            let remoteTrack:RTCVideoTrack = stream.videoTracks[0] as! RTCVideoTrack;
+            self.delegate.addedRemoteVideoTrack(videoTrack: remoteTrack);
+        }
     }
 
 }
diff --git a/ViewController.swift b/ViewController.swift
@@ -72,22 +72,18 @@ class ViewController: UIViewController {
 
 extension ViewController:RTClientDelegate {
 
-    func addedStream(stream: RTCMediaStream) {
-
-        if (stream.videoTracks.count > 0) {
-        let remoteTrack:RTCVideoTrack = stream.videoTracks[0] as! RTCVideoTrack;
+    func addedRemoteVideoTrack(videoTrack:RTCVideoTrack) {
 
         if (self.remoteVideoTrack != nil) {
             self.remoteVideoTrack?.remove(self.remoteView);
             self.remoteVideoTrack = nil;
             self.remoteView.renderFrame(nil);
         }
-
-        self.remoteVideoTrack = remoteTrack;
+        self.remoteVideoTrack = videoTrack;
         self.remoteVideoTrack?.add(self.remoteView);
-        }
     }
-
+
+
 
     func didConnect() {
         self.setLocalPreview();