diff --git a/desktop/main.js b/desktop/main.js index d0cfba2..33934bd 100644 --- a/desktop/main.js +++ b/desktop/main.js @@ -1,7 +1,6 @@ const { app, BrowserWindow, webFrame, Menu } = require('electron') const path = require('path') const url = require('url') -const osc = require('osc') const shell = require('electron').shell let isShown = true diff --git a/desktop/package.json b/desktop/package.json index b846576..15dcd32 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -4,7 +4,6 @@ "main": "main.js", "scripts": { "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'", "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'", @@ -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" }, "dependencies": { - "osc": "^2.3.1" + "node-osc": "^4.1.0" }, "devDependencies": { - "electron": "^5.0.6", - "electron-packager": "^13.1.1", - "electron-rebuild": "^1.8.5" + "electron": "^5.0.1", + "electron-packager": "^13.1.1" } } diff --git a/desktop/sources/scripts/osc.js b/desktop/sources/scripts/osc.js index 77651de..a508d82 100644 --- a/desktop/sources/scripts/osc.js +++ b/desktop/sources/scripts/osc.js @@ -1,18 +1,18 @@ 'use strict' function Osc (ronin) { - const osc = require('osc') + const osc = require('node-osc') this.msg = {} this.start = function () { - const udpPort = new osc.UDPPort({ - localAddress: '0.0.0.0', - localPort: 49162, - metadata: true - }) + + const udpPort = new osc.Server( + 49162, + '0.0.0.0' + ) + udpPort.on('message', this.onMsg) - udpPort.open() ronin.log('OSC', 'Started.') }