dakedres/ronin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74 from msarchet/fix-electron-build

Browse Source 
Replace osc with node-osc, like orca
This commit is contained in:
Лu Лinveгa 2019-07-23 15:41:32 +12:00 committed by GitHub
commit 790fa0d897
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desktop/main.js
View File

@ -1,7 +1,6 @@
const { app, BrowserWindow, webFrame, Menu } = require('electron') const { app, BrowserWindow, webFrame, Menu } = require('electron')
const path = require('path') const path = require('path')
const url = require('url') const url = require('url')
const osc = require('osc')
const shell = require('electron').shell const shell = require('electron').shell
let isShown = true let isShown = true

8
desktop/package.json
View File

@ -4,7 +4,6 @@
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
"start": "electron .", "start": "electron .",
"install": "electron-rebuild",
"clean": "rm -r ~/Desktop/Ronin-darwin-x64/ ; rm -r ~/Desktop/Ronin-linux-x64/ ; rm -r ~/Desktop/Ronin-win32-x64/ ; echo 'cleaned build location'", "clean": "rm -r ~/Desktop/Ronin-darwin-x64/ ; rm -r ~/Desktop/Ronin-linux-x64/ ; rm -r ~/Desktop/Ronin-win32-x64/ ; echo 'cleaned build location'",
"build_osx": "electron-packager . Ronin --platform=darwin --arch=x64 --out ~/Desktop/ --overwrite --icon=icon.icns ; echo 'Built for OSX'", "build_osx": "electron-packager . Ronin --platform=darwin --arch=x64 --out ~/Desktop/ --overwrite --icon=icon.icns ; echo 'Built for OSX'",
"build_linux": "electron-packager . Ronin --platform=linux --arch=x64 --out ~/Desktop/ --overwrite --icon=icon.ico ; echo 'Built for LINUX'", "build_linux": "electron-packager . Ronin --platform=linux --arch=x64 --out ~/Desktop/ --overwrite --icon=icon.ico ; echo 'Built for LINUX'",
@ -18,11 +17,10 @@
"push": "npm run build ; npm run push_theme ; npm run push_osx ; npm run push_linux ; npm run push_win ; npm run clean ; npm run push_status" "push": "npm run build ; npm run push_theme ; npm run push_osx ; npm run push_linux ; npm run push_win ; npm run clean ; npm run push_status"
}, },
"dependencies": { "dependencies": {
"osc": "^2.3.1" "node-osc": "^4.1.0"
}, },
"devDependencies": { "devDependencies": {
"electron": "^5.0.6", "electron": "^5.0.1",
"electron-packager": "^13.1.1", "electron-packager": "^13.1.1"
"electron-rebuild": "^1.8.5"
} }
} }

14
desktop/sources/scripts/osc.js
View File

@ -1,18 +1,18 @@
'use strict' 'use strict'
function Osc (ronin) { function Osc (ronin) {
const osc = require('osc') const osc = require('node-osc')
this.msg = {} this.msg = {}
this.start = function () { this.start = function () {
const udpPort = new osc.UDPPort({
localAddress: '0.0.0.0', const udpPort = new osc.Server(
localPort: 49162, 49162,
metadata: true '0.0.0.0'
}) )
udpPort.on('message', this.onMsg) udpPort.on('message', this.onMsg)
udpPort.open()
ronin.log('OSC', 'Started.') ronin.log('OSC', 'Started.')
} }