removing small bugs

This commit is contained in:
Fabian Stamm
2017-06-20 13:01:30 +02:00
parent 7c3f26a9f8
commit 9a60e5ee8d
4 changed files with 247 additions and 215 deletions

View File

@ -10,9 +10,11 @@ db.defaults({}).write();
import * as httpp from "http";
var http = httpp.createServer();
import io = require("socket.io");
var ioClient = require("socket.io-client")("192.168.1.22:5000");
var ioClient = require("socket.io-client")("http://192.168.1.22:5000", {reconect:true});
ioClient.on("connect", ()=>{
console.log("connected");
})
var ios = io(http);
const artnetp = require("artnet");
const universe = 21;
var artnet = artnetp({host:"192.168.1.255"});
@ -107,8 +109,13 @@ class Timecode {
toTrigger:Array<TrackEvent>;
vlcUpdate(vlc:VlcUpdate) {
this.startTime = new Date().getTime() - vlc.time;
this.filePlaying = vlc.file;
if(!vlc.is_playing){
this.stop();
} else {
this.startTime = new Date().getTime() - vlc.time;
this.filePlaying = vlc.file;
console.log("vlc_update", vlc);
}
}
update(time:FrameTime) {
@ -125,6 +132,7 @@ class Timecode {
var data:any = {};
data.time = new FrameTime(d);
data.track = this.activeTrack.id;
data.filePlaying = this.filePlaying;
ios.emit("update", data);
}
@ -146,6 +154,7 @@ class Timecode {
}
play() {
if(!this.activeTrack)return;
if(this.filePlaying){
ioClient.emit("play", {file:this.filePlaying});
ioClient.on("playing", ()=>{
@ -197,6 +206,7 @@ interface VlcUpdate {
var timecode = new Timecode();
ios.on("connection", socket=>{
senddata();
function senddata(){
ios.emit("get_data", {
tracks: db.getState(),