summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-05-21 18:52:57 +0200
committerJules Laplace <julescarbon@gmail.com>2018-05-21 18:52:57 +0200
commitef4dccb818f391cd3c94d6d28d280b5e7c323b47 (patch)
tree996ccb025cc832d42f3dc489cbe0e62a5cccc1c8 /app
parent5e6608c740017c989e68f847e940294f5ca5489e (diff)
meta meta meta
Diffstat (limited to 'app')
-rw-r--r--app/client/socket.js4
-rw-r--r--app/relay/index.js4
2 files changed, 6 insertions, 2 deletions
diff --git a/app/client/socket.js b/app/client/socket.js
index aaff41c..627694c 100644
--- a/app/client/socket.js
+++ b/app/client/socket.js
@@ -51,6 +51,10 @@ socket.on('frame', (data) => {
const url = URL.createObjectURL(blob)
const img = new Image ()
img.onload = function() {
+ store.dispatch({
+ type: 'CURRENT_FRAME',
+ meta: data.meta,
+ })
URL.revokeObjectURL(url)
const player = document.querySelector('.player canvas')
const ctx = player.getContext('2d')
diff --git a/app/relay/index.js b/app/relay/index.js
index 9c0e071..b38f0c8 100644
--- a/app/relay/index.js
+++ b/app/relay/index.js
@@ -56,10 +56,10 @@ let relay = new zerorpc.Server({
return true
},
- send_frame: function (fn, frame, reply) {
+ send_frame: function (fn, meta, frame, reply) {
reply()
// console.log('got frame, ' + frame.length + ' bytes')
- remote.emit('frame', { fn: fn, frame: frame })
+ remote.emit('frame', { fn: fn, meta: meta, frame: frame })
}
})
relay.on('error', function(error) {