From 087c4c60a1863108d7ea9568ee6c864f298b798c Mon Sep 17 00:00:00 2001 From: Corey Johnson & Matt Colyer Date: Tue, 23 Jul 2013 16:34:59 -0700 Subject: [PATCH] Don't turn on the web cam until sharing is begun --- src/packages/collaboration/lib/guest-session.coffee | 1 + src/packages/collaboration/lib/host-session.coffee | 1 + src/packages/collaboration/lib/media-connection.coffee | 2 ++ 3 files changed, 4 insertions(+) diff --git a/src/packages/collaboration/lib/guest-session.coffee b/src/packages/collaboration/lib/guest-session.coffee index ecd73c1b7..06ff88bf1 100644 --- a/src/packages/collaboration/lib/guest-session.coffee +++ b/src/packages/collaboration/lib/guest-session.coffee @@ -33,6 +33,7 @@ class GuestSession guest = doc.get('collaborationState.guest') host = doc.get('collaborationState.host') @mediaConnection = new MediaConnection(guest, host, isHost: false) + @mediaConnection.start() waitForStream: (callback) -> @mediaConnection.waitForStream callback diff --git a/src/packages/collaboration/lib/host-session.coffee b/src/packages/collaboration/lib/host-session.coffee index ea868b8c7..dda166751 100644 --- a/src/packages/collaboration/lib/host-session.coffee +++ b/src/packages/collaboration/lib/host-session.coffee @@ -37,6 +37,7 @@ class HostSession start: -> return if @isSharing() + @mediaConnection.start() patrick.snapshot project.getPath(), (error, repoSnapshot) => throw new Error(error) if error diff --git a/src/packages/collaboration/lib/media-connection.coffee b/src/packages/collaboration/lib/media-connection.coffee index e73a05e79..23594a44d 100644 --- a/src/packages/collaboration/lib/media-connection.coffee +++ b/src/packages/collaboration/lib/media-connection.coffee @@ -13,6 +13,8 @@ class MediaConnection isHost: null constructor: (@local, @remote, {@isHost}={}) -> + + start: -> constraints = {video: true, audio: true} navigator.webkitGetUserMedia constraints, @onUserMediaAvailable, @onUserMediaUnavailable