Skip to content

Commit

Permalink
Merge pull request #6 from bmctigue/fix_remote_video_view
Browse files Browse the repository at this point in the history 
Remote video view never showing.
  • Loading branch information
@llSourcell
llSourcell committed Dec 23, 2015
2 parents 71a5c44 + bb44aa7 commit 943dcf9
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 11 deletions.
35 changes: 24 additions & 11 deletions VideoQuickStart/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="mzC-mj-NL1">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="mzC-mj-NL1">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
Expand Down Expand Up @@ -36,27 +37,39 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vOh-lc-Vfa" userLabel="Remote Media">
<rect key="frame" x="0.0" y="64" width="600" height="536"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="logging in..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1nY-vJ-sQd">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="logging in..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1nY-vJ-sQd">
<rect key="frame" x="8" y="507" width="100" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="WgO-dh-0wB"/>
<constraint firstAttribute="width" constant="100" id="svs-Jb-bUW"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zl1-A1-2oU" userLabel="Local Media">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zl1-A1-2oU" userLabel="Local Media">
<rect key="frame" x="8" y="419" width="80" height="80"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="width" constant="80" id="3hh-su-uL4"/>
<constraint firstAttribute="height" constant="80" id="aZR-1M-PUL"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="zl1-A1-2oU" firstAttribute="leading" secondItem="vOh-lc-Vfa" secondAttribute="leading" constant="8" id="Kjf-Mz-EiR"/>
<constraint firstItem="1nY-vJ-sQd" firstAttribute="leading" secondItem="vOh-lc-Vfa" secondAttribute="leading" constant="8" id="hGJ-Hb-td7"/>
<constraint firstItem="1nY-vJ-sQd" firstAttribute="top" secondItem="zl1-A1-2oU" secondAttribute="bottom" constant="8" id="lM2-iU-An1"/>
<constraint firstAttribute="bottom" secondItem="1nY-vJ-sQd" secondAttribute="bottom" constant="8" id="wa0-GV-8Gy"/>
<constraint firstItem="zl1-A1-2oU" firstAttribute="leading" secondItem="vOh-lc-Vfa" secondAttribute="leading" constant="8" id="YtY-Ue-068"/>
<constraint firstItem="1nY-vJ-sQd" firstAttribute="leading" secondItem="vOh-lc-Vfa" secondAttribute="leading" constant="8" id="cBD-zr-j6Q"/>
<constraint firstAttribute="bottom" secondItem="1nY-vJ-sQd" secondAttribute="bottom" constant="8" id="h4o-1P-2VG"/>
<constraint firstItem="1nY-vJ-sQd" firstAttribute="top" secondItem="zl1-A1-2oU" secondAttribute="bottom" constant="8" id="uOy-PR-5XL"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="P2D-Xo-yZb">
<rect key="frame" x="269" y="285" width="61" height="30"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="P2D-Xo-yZb">
<rect key="frame" x="511" y="562" width="61" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="61" id="Ldb-xG-WAk"/>
<constraint firstAttribute="height" constant="30" id="ehv-zh-qRR"/>
</constraints>
<state key="normal" title="Hang Up">
<color key="titleColor" red="0.90196079015731812" green="0.90196079015731812" blue="0.90196079015731812" alpha="1" colorSpace="calibratedRGB"/>
</state>
Expand All @@ -67,12 +80,12 @@
</subviews>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailingMargin" secondItem="P2D-Xo-yZb" secondAttribute="trailing" constant="8" id="K3d-pg-hkM"/>
<constraint firstAttribute="trailingMargin" secondItem="P2D-Xo-yZb" secondAttribute="trailing" constant="8" id="Ny2-XC-RVE"/>
<constraint firstAttribute="trailingMargin" secondItem="vOh-lc-Vfa" secondAttribute="trailing" constant="-20" id="W7e-yS-wxR"/>
<constraint firstItem="Wix-pe-Zli" firstAttribute="top" secondItem="vOh-lc-Vfa" secondAttribute="bottom" id="ZG4-YT-KZT"/>
<constraint firstItem="Wix-pe-Zli" firstAttribute="top" secondItem="P2D-Xo-yZb" secondAttribute="bottom" constant="8" id="iwG-Aj-OYX"/>
<constraint firstItem="vOh-lc-Vfa" firstAttribute="top" secondItem="o13-Ok-Waj" secondAttribute="bottom" id="kDE-wy-1sa"/>
<constraint firstItem="vOh-lc-Vfa" firstAttribute="leading" secondItem="Xsf-JP-SIm" secondAttribute="leadingMargin" constant="-20" id="lmV-UR-igV"/>
<constraint firstItem="Wix-pe-Zli" firstAttribute="top" secondItem="P2D-Xo-yZb" secondAttribute="bottom" constant="8" id="vx1-6n-Ing"/>
</constraints>
</view>
<navigationItem key="navigationItem" title="no call connected" id="aX4-35-7eE">
Expand Down
1 change: 1 addition & 0 deletions VideoQuickStart/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ class ViewController: UIViewController {
self.outgoingInvite = self.client?.inviteToConversation(invitee!, localMedia:self.localMedia!)
{ conversation, err in
if err == nil {
conversation!.delegate = self
self.conversation = conversation
} else {
print("error creating conversation")
Expand Down

0 comments on commit 943dcf9

Please sign in to comment.