From 1d30a5e32ca023ff0e39f072a528c0008ddefefc Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Tue, 18 Dec 2018 23:17:56 +0900
Subject: [PATCH] refs #769 Switch public streaming method
---
src/main/index.js | 9 +++++----
src/renderer/store/TimelineSpace.js | 5 ++++-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/index.js b/src/main/index.js
index 0666d862..3168d9c0 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -507,20 +507,21 @@ ipcMain.on('stop-local-streaming', (event, _) => {
let publicStreaming = null
-ipcMain.on('start-public-streaming', (event, ac) => {
- accountManager.getAccount(ac._id)
+ipcMain.on('start-public-streaming', (event, obj) => {
+ const { account, useWebsocket } = obj
+ accountManager.getAccount(account._id)
.catch((err) => {
log.error(err)
event.sender.send('error-start-public-streaming', err)
})
- .then((account) => {
+ .then((acct) => {
// Stop old public streaming
if (publicStreaming !== null) {
publicStreaming.stop()
publicStreaming = null
}
- publicStreaming = new StreamingManager(account)
+ publicStreaming = new StreamingManager(acct, useWebsocket)
publicStreaming.start(
'public',
'',
diff --git a/src/renderer/store/TimelineSpace.js b/src/renderer/store/TimelineSpace.js
index bbf2556a..68a2d99d 100644
--- a/src/renderer/store/TimelineSpace.js
+++ b/src/renderer/store/TimelineSpace.js
@@ -296,7 +296,10 @@ const TimelineSpace = {
},
startPublicStreaming ({ state }) {
return new Promise((resolve, reject) => {
- ipcRenderer.send('start-public-streaming', state.account)
+ ipcRenderer.send('start-public-streaming', {
+ account: state.account,
+ useWebsocket: state.useWebsocket
+ })
ipcRenderer.once('error-start-public-streaming', (event, err) => {
reject(err)
})