From 827e777079a16d5ceaed69cbc239d22f8629f3a7 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 17 Jul 2015 16:42:16 +0100 Subject: [PATCH] Implement ringing audio. Add other audio tags. --- examples/trivial/index.html | 12 ++++++++++++ {media => examples/trivial/media}/busy.mp3 | Bin {media => examples/trivial/media}/busy.ogg | Bin {media => examples/trivial/media}/callend.mp3 | Bin {media => examples/trivial/media}/callend.ogg | Bin {media => examples/trivial/media}/message.mp3 | Bin {media => examples/trivial/media}/message.ogg | Bin {media => examples/trivial/media}/ring.mp3 | Bin {media => examples/trivial/media}/ring.ogg | Bin {media => examples/trivial/media}/ringback.mp3 | Bin {media => examples/trivial/media}/ringback.ogg | Bin .../base/views/molecules/voip/IncomingCallBox.js | 15 ++++++++++++++- .../molecules/voip/IncomingCallBox.js | 9 +++++++++ 13 files changed, 35 insertions(+), 1 deletion(-) rename {media => examples/trivial/media}/busy.mp3 (100%) rename {media => examples/trivial/media}/busy.ogg (100%) rename {media => examples/trivial/media}/callend.mp3 (100%) rename {media => examples/trivial/media}/callend.ogg (100%) rename {media => examples/trivial/media}/message.mp3 (100%) rename {media => examples/trivial/media}/message.ogg (100%) rename {media => examples/trivial/media}/ring.mp3 (100%) rename {media => examples/trivial/media}/ring.ogg (100%) rename {media => examples/trivial/media}/ringback.mp3 (100%) rename {media => examples/trivial/media}/ringback.ogg (100%) diff --git a/examples/trivial/index.html b/examples/trivial/index.html index 502c8605..b5a48296 100644 --- a/examples/trivial/index.html +++ b/examples/trivial/index.html @@ -6,6 +6,18 @@ + + +
diff --git a/media/busy.mp3 b/examples/trivial/media/busy.mp3 similarity index 100% rename from media/busy.mp3 rename to examples/trivial/media/busy.mp3 diff --git a/media/busy.ogg b/examples/trivial/media/busy.ogg similarity index 100% rename from media/busy.ogg rename to examples/trivial/media/busy.ogg diff --git a/media/callend.mp3 b/examples/trivial/media/callend.mp3 similarity index 100% rename from media/callend.mp3 rename to examples/trivial/media/callend.mp3 diff --git a/media/callend.ogg b/examples/trivial/media/callend.ogg similarity index 100% rename from media/callend.ogg rename to examples/trivial/media/callend.ogg diff --git a/media/message.mp3 b/examples/trivial/media/message.mp3 similarity index 100% rename from media/message.mp3 rename to examples/trivial/media/message.mp3 diff --git a/media/message.ogg b/examples/trivial/media/message.ogg similarity index 100% rename from media/message.ogg rename to examples/trivial/media/message.ogg diff --git a/media/ring.mp3 b/examples/trivial/media/ring.mp3 similarity index 100% rename from media/ring.mp3 rename to examples/trivial/media/ring.mp3 diff --git a/media/ring.ogg b/examples/trivial/media/ring.ogg similarity index 100% rename from media/ring.ogg rename to examples/trivial/media/ring.ogg diff --git a/media/ringback.mp3 b/examples/trivial/media/ringback.mp3 similarity index 100% rename from media/ringback.mp3 rename to examples/trivial/media/ringback.mp3 diff --git a/media/ringback.ogg b/examples/trivial/media/ringback.ogg similarity index 100% rename from media/ringback.ogg rename to examples/trivial/media/ringback.ogg diff --git a/skins/base/views/molecules/voip/IncomingCallBox.js b/skins/base/views/molecules/voip/IncomingCallBox.js index 95263fb6..5adc71af 100644 --- a/skins/base/views/molecules/voip/IncomingCallBox.js +++ b/skins/base/views/molecules/voip/IncomingCallBox.js @@ -26,14 +26,27 @@ module.exports = React.createClass({ displayName: 'IncomingCallBox', mixins: [IncomingCallBoxController], + getRingAudio: function() { + return this.refs.ringAudio.getDOMNode(); + }, + render: function() { if (!this.state.incomingCallRoomId) { return ( -
+
+ +
); } return (
+
diff --git a/src/controllers/molecules/voip/IncomingCallBox.js b/src/controllers/molecules/voip/IncomingCallBox.js index dc993936..1d6cca9e 100644 --- a/src/controllers/molecules/voip/IncomingCallBox.js +++ b/src/controllers/molecules/voip/IncomingCallBox.js @@ -43,8 +43,17 @@ module.exports = { this.setState({ incomingCallRoomId: null }); + this.getRingAudio().pause(); return; } + if (call.call_state === "ringing") { + this.getRingAudio().load(); + this.getRingAudio().play(); + } + else { + this.getRingAudio().pause(); + } + this.setState({ incomingCallRoomId: call.roomId });