From c5b0ea7e9fa1784a0b1a32f1fcb609b37531cb71 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 26 Nov 2015 15:24:32 +0000
Subject: [PATCH] Move VideoFeed to React SDK

---
 src/skins/vector/skindex.js                   |  2 +-
 .../vector/views/atoms/voip/VideoFeed.js      | 31 -------------------
 .../vector/views/molecules/voip/VideoView.js  |  2 +-
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 src/skins/vector/views/atoms/voip/VideoFeed.js

diff --git a/src/skins/vector/skindex.js b/src/skins/vector/skindex.js
index 3cce47dcc6..2f18e3d2e7 100644
--- a/src/skins/vector/skindex.js
+++ b/src/skins/vector/skindex.js
@@ -33,12 +33,12 @@ skin['avatars.RoomAvatar'] = require('matrix-react-sdk/lib/components/views/avat
 skin['avatars.MemberAvatar'] = require('matrix-react-sdk/lib/components/views/avatars/MemberAvatar');
 skin['settings.EnableNotificationsButton'] = require('matrix-react-sdk/lib/components/views/settings/EnableNotificationsButton');
 skin['elements.EditableText'] = require('matrix-react-sdk/lib/components/views/elements/EditableText');
+skin['voip.VideoFeed'] = require('matrix-react-sdk/lib/components/views/voip/VideoFeed');
 
 // Old style stuff
 skin['atoms.create_room.CreateRoomButton'] = require('./views/atoms/create_room/CreateRoomButton');
 skin['atoms.create_room.Presets'] = require('./views/atoms/create_room/Presets');
 skin['atoms.create_room.RoomAlias'] = require('./views/atoms/create_room/RoomAlias');
-skin['atoms.voip.VideoFeed'] = require('./views/atoms/voip/VideoFeed');
 skin['molecules.BottomLeftMenu'] = require('./views/molecules/BottomLeftMenu');
 skin['molecules.BottomLeftMenuTile'] = require('./views/molecules/BottomLeftMenuTile');
 skin['molecules.ChangeAvatar'] = require('./views/molecules/ChangeAvatar');
diff --git a/src/skins/vector/views/atoms/voip/VideoFeed.js b/src/skins/vector/views/atoms/voip/VideoFeed.js
deleted file mode 100644
index 9cf28d1ba4..0000000000
--- a/src/skins/vector/views/atoms/voip/VideoFeed.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2015 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-'use strict';
-
-var React = require('react');
-
-module.exports = React.createClass({
-    displayName: 'VideoFeed',
-
-    render: function() {
-        return (
-            <video>
-            </video>
-        );
-    },
-});
-
diff --git a/src/skins/vector/views/molecules/voip/VideoView.js b/src/skins/vector/views/molecules/voip/VideoView.js
index 75a2500d10..d7960518e5 100644
--- a/src/skins/vector/views/molecules/voip/VideoView.js
+++ b/src/skins/vector/views/molecules/voip/VideoView.js
@@ -77,7 +77,7 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var VideoFeed = sdk.getComponent('atoms.voip.VideoFeed');
+        var VideoFeed = sdk.getComponent('voip.VideoFeed');
         return (
             <div className="mx_VideoView" ref={this.setContainer} onClick={ this.props.onClick }>
                 <div className="mx_VideoView_remoteVideoFeed">