Skip to content

Updates node-osc to prevent refresh crash #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ffd8 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updates node-osc to prevent refresh crash #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
.DS_Store
6 changes: 3 additions & 3 deletions bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var osc = require('node-osc');
var io = require('socket.io')(8081);
var io = require('socket.io')(8082);


var oscServer, oscClient;
Expand All @@ -23,8 +23,8 @@ io.sockets.on('connection', function (socket) {
});
socket.on('disconnect', function(){
if (isConnected) {
oscServer.kill();
oscClient.kill();
oscServer.close();
oscClient.close();
}
});
});
Binary file removed p5-ableton/.DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion p5-ableton/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<head>
<meta charset="UTF-8">
<script src="http://127.0.0.1:8081/socket.io/socket.io.js"></script>
<script src="http://127.0.0.1:8082/socket.io/socket.io.js"></script>
<script language="javascript" type="text/javascript" src="libraries/p5.js"></script>
<script language="javascript" type="text/javascript" src="sketch.js"></script>
<style> body {padding: 0; margin: 0;} </style>
Expand Down
Binary file removed p5-ableton/libraries/.DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion p5-ableton/sketch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function sendOsc(address, value) {
}

function setupOsc(oscPortIn, oscPortOut) {
socket = io.connect('http://127.0.0.1:8081', { port: 8081, rememberTransport: false });
socket = io.connect('http://127.0.0.1:8082', { port: 8082, rememberTransport: false });
socket.on('connect', function() {
socket.emit('config', {
server: { port: oscPortIn, host: '127.0.0.1'},
Expand Down
2 changes: 1 addition & 1 deletion p5-basic/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<head>
<meta charset="UTF-8">
<script src="http://127.0.0.1:8081/socket.io/socket.io.js"></script>
<script src="http://127.0.0.1:8082/socket.io/socket.io.js"></script>
<script language="javascript" type="text/javascript" src="libraries/p5.js"></script>
<script language="javascript" type="text/javascript" src="sketch.js"></script>
<style> body {padding: 0; margin: 0;} </style>
Expand Down
2 changes: 1 addition & 1 deletion p5-basic/sketch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function sendOsc(address, value) {
}

function setupOsc(oscPortIn, oscPortOut) {
var socket = io.connect('http://127.0.0.1:8081', { port: 8081, rememberTransport: false });
var socket = io.connect('http://127.0.0.1:8082', { port: 8082, rememberTransport: false });
socket.on('connect', function() {
socket.emit('config', {
server: { port: oscPortIn, host: '127.0.0.1'},
Expand Down
Binary file removed p5-faceOsc-flocking/.DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion p5-faceOsc-flocking/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<head>
<meta charset="UTF-8">
<script src="http://127.0.0.1:8081/socket.io/socket.io.js"></script>
<script src="http://127.0.0.1:8082/socket.io/socket.io.js"></script>
<script language="javascript" type="text/javascript" src="libraries/p5.js"></script>
<script language="javascript" type="text/javascript" src="sketch.js"></script>
<style> body {padding: 0; margin: 0;} </style>
Expand Down
Binary file removed p5-faceOsc-flocking/libraries/.DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion p5-faceOsc-flocking/sketch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ function receiveOsc(address, value) {
}

function setupOsc(oscPortIn, oscPortOut) {
var socket = io.connect('http://127.0.0.1:8081', { port: 8081, rememberTransport: false });
var socket = io.connect('http://127.0.0.1:8082', { port: 8082, rememberTransport: false });
socket.on('connect', function() {
socket.emit('config', {
server: { port: oscPortIn, host: '127.0.0.1'},
Expand Down
Binary file removed p5-faceOsc/.DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion p5-faceOsc/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<head>
<meta charset="UTF-8">
<script src="http://127.0.0.1:8081/socket.io/socket.io.js"></script>
<script src="http://127.0.0.1:8082/socket.io/socket.io.js"></script>
<script language="javascript" type="text/javascript" src="libraries/p5.js"></script>
<script language="javascript" type="text/javascript" src="sketch.js"></script>
<style> body {padding: 0; margin: 0;} </style>
Expand Down
Binary file removed p5-faceOsc/libraries/.DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion p5-faceOsc/sketch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function receiveOsc(address, value) {
}

function setupOsc(oscPortIn, oscPortOut) {
var socket = io.connect('http://127.0.0.1:8081', { port: 8081, rememberTransport: false });
var socket = io.connect('http://127.0.0.1:8082', { port: 8082, rememberTransport: false });
socket.on('connect', function() {
socket.emit('config', {
server: { port: oscPortIn, host: '127.0.0.1'},
Expand Down
Binary file removed p5-kinect/.DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion p5-kinect/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<head>
<meta charset="UTF-8">
<script src="http://127.0.0.1:8081/socket.io/socket.io.js"></script>
<script src="http://127.0.0.1:8082/socket.io/socket.io.js"></script>
<script language="javascript" type="text/javascript" src="libraries/p5.js"></script>
<script language="javascript" type="text/javascript" src="sketch.js"></script>
<style> body {padding: 0; margin: 0;} </style>
Expand Down
Binary file removed p5-kinect/libraries/.DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion p5-kinect/sketch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function receiveOsc(address, value) {
}

function setupOsc(oscPortIn, oscPortOut) {
var socket = io.connect('http://127.0.0.1:8081', { port: 8081, rememberTransport: false });
var socket = io.connect('http://127.0.0.1:8082', { port: 8082, rememberTransport: false });
socket.on('connect', function() {
socket.emit('config', {
server: { port: oscPortIn, host: '127.0.0.1'},
Expand Down
Loading