some improvements

This commit is contained in:
Fabian Stamm
2017-06-20 11:15:17 +02:00
parent 9f529422a3
commit 56901e4f33
7 changed files with 286 additions and 231 deletions

View File

@ -115,6 +115,7 @@ class Timecode {
var d = new Date().getTime() - this.startTime;
this.toTrigger.forEach(e=>{
if(e.time.milliseconds <= d) {
console.log(e);
ios.emit("artnet", e.art);
artnet.set(universe, e.art.subnet)
var i = this.toTrigger.indexOf(e);
@ -130,11 +131,16 @@ class Timecode {
loadTrack(trackid:string) {
this.playing = false;
var track =<Track>db.get(trackid).value();
var tr = [];
track.triggers.forEach(t=>{
t.time = new FrameTime(t.time);
var te = new TrackEvent();
te.art = t.art;
te.id = t.id;
te.time = new FrameTime(t.time);
tr.push(te);
});
this.activeTrack = track;
this.toTrigger = track.triggers;
this.toTrigger = tr;
this.filePlaying = track.file;
this.startTime = 0;
}
@ -192,7 +198,10 @@ interface VlcUpdate {
var timecode = new Timecode();
ios.on("connection", socket=>{
function senddata(){
ios.emit("get_data", db.getState());
ios.emit("get_data", {
tracks: db.getState(),
loaded: timecode.activeTrack
});
}
console.log("Client", socket.id, "connected");
@ -202,6 +211,7 @@ ios.on("connection", socket=>{
return socket.emit("play_error", "Track doesn't exist");
}
timecode.loadTrack(id);
senddata();
});
socket.on("play", ()=>{
if(timecode.playing){
@ -236,7 +246,7 @@ ios.on("connection", socket=>{
});
socket.on("get", ()=>{
socket.emit("get_data", db.getState());
senddata();
});
socket.on("delete", (data)=>{