some improvements
This commit is contained in:
@ -11,6 +11,13 @@
|
||||
<body>
|
||||
<center><h1>Timecode Abiball2017</h1></center>
|
||||
<hr>
|
||||
<div>
|
||||
<button onclick="stopSequence()">Stop</button>
|
||||
<button onclick="startSequence()">Play</button>
|
||||
<label >Loaded: </label>
|
||||
<label id="loaded"></label>
|
||||
</div>
|
||||
<hr>
|
||||
<div id="track_select_div">
|
||||
<label for="track_select">Select Preset: </label>
|
||||
<select id="track_select"></select>
|
||||
@ -25,9 +32,11 @@
|
||||
<div id="trdv" style="display:none;">
|
||||
<center><h2 id="trackname"></h1></center>
|
||||
<center><h2 id="trackfile"></h2></center>
|
||||
<button onclick="loadSequence()">Load</button>
|
||||
<div>
|
||||
<canvas id="canvas" height="50">
|
||||
</canvas>
|
||||
<label id="actualtime"></label>
|
||||
</div>
|
||||
<div>
|
||||
<form onsubmit="f()">
|
||||
@ -54,19 +63,21 @@
|
||||
socket.emit("get");
|
||||
var tracks = {};
|
||||
var selected = undefined;
|
||||
var timenow =undefined;
|
||||
var timenow = undefined;
|
||||
socket.on("get_data", (data)=>{
|
||||
console.log("got data", data);
|
||||
var opt = "<option value=''></option>";
|
||||
for(var prop in data){
|
||||
var e = data[prop];
|
||||
for(var prop in data.tracks){
|
||||
var e = data.tracks[prop];
|
||||
opt += '<option value="' + e.id + '">' + e.displayName + '</option>';
|
||||
}
|
||||
tracks = data;
|
||||
tracks = data.tracks;
|
||||
if(selected){
|
||||
selected = data[selected.id];
|
||||
selected = data.tracks[selected.id];
|
||||
}
|
||||
$("#track_select").html(opt);
|
||||
if(data.loaded)
|
||||
$("#loaded").html(data.loaded.displayName);
|
||||
drawSelected();
|
||||
});
|
||||
|
||||
@ -82,7 +93,10 @@
|
||||
});
|
||||
|
||||
socket.on("update", (data)=>{
|
||||
|
||||
if(!selected) return;
|
||||
if(selected.id !== data.track) return; //Nur wenn abgespielter track ausgewählt
|
||||
timenow = data.time.lmilliseconds;
|
||||
$("#actualtime").html(data.time.lhours + ":" + data.time.lminutes + ":" + data.time.lseconds + ":" + data.time.lframe);
|
||||
});
|
||||
|
||||
$("#track_select").on("change", function () {
|
||||
@ -132,7 +146,6 @@
|
||||
return 0;
|
||||
});
|
||||
sorted.forEach(e=>{
|
||||
console.log(e);
|
||||
t += "<tr>";
|
||||
t += "<td>" + e.id + "</td>"
|
||||
t += "<td>" + e.time.lhours + "</td>"
|
||||
@ -194,9 +207,17 @@
|
||||
$("#eval").val("");
|
||||
}
|
||||
|
||||
socket.on("set_finished", (e)=>{
|
||||
socket.emit("get");
|
||||
});
|
||||
function loadSequence(){
|
||||
socket.emit("load", selected.id);
|
||||
}
|
||||
|
||||
function startSequence(){
|
||||
socket.emit("play");
|
||||
}
|
||||
|
||||
function stopSequence(){
|
||||
socket.emit("stop");
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
Reference in New Issue
Block a user