From: jordan lavatai Date: Mon, 19 Jun 2017 17:04:43 +0000 (-0700) Subject: still debugging ipc.send X-Git-Url: https://git.kengrimes.com/?p=henge%2Fkiak.git;a=commitdiff_plain;h=da14f1d54cc481505f4038303b3c4d785b8dba4f still debugging ipc.send --- diff --git a/admin.js b/admin.js index a870de6..163bf13 100644 --- a/admin.js +++ b/admin.js @@ -19,7 +19,7 @@ console.log('Making ajax request') document.addEventListener('DOMContentLoaded', function() { - let streamlist = document.getElementById("streamlist") console.log('Document is ready') + let streamlist = document.getElementById("streamlist") document.getElementById("streams").addEventListener('click', makeRequest); }) diff --git a/main.js b/main.js index 13bcaa3..064e2c2 100644 --- a/main.js +++ b/main.js @@ -23,8 +23,7 @@ function captureStream() { mainWindow.webContents.send('defaultStreamRequest', 'slr') let p = new Promise((resolve,reject) => { ipcMain.on('defaultStreamResponse', (event, arg) => { - console.log('defaultStreamResponse') - console.log(arg) + console.log('received defaultStreamResponse') resolve(arg) }) }) diff --git a/renderer.js b/renderer.js index c6d45c5..7358437 100644 --- a/renderer.js +++ b/renderer.js @@ -1,6 +1,7 @@ const ipcRenderer = require('electron').ipcRenderer const {desktopCapturer} = require('electron') +let mediaStream function getDefaultStream(event) { console.log('getDefaultStream') @@ -24,7 +25,8 @@ function getDefaultStream(event) { } } }).then((stream) => { - console.log(stream) + mediaStream = stream + console.log('sending defaultStreamResponse' + stream) event.sender.send('defaultStreamResponse', stream) }) }