Update videoSync.js
This commit is contained in:
parent
c43834df7d
commit
b29d8acdba
31
videoSync.js
31
videoSync.js
@ -26,6 +26,11 @@
|
|||||||
var interfaceButtonActive = false;
|
var interfaceButtonActive = false;
|
||||||
var videoPlayerChannel;
|
var videoPlayerChannel;
|
||||||
var tabletOpen = false;
|
var tabletOpen = false;
|
||||||
|
var gatewayUserData = {
|
||||||
|
"useGatewayServer": false,
|
||||||
|
"wsUrl": "",
|
||||||
|
"serverConnected": false
|
||||||
|
};
|
||||||
|
|
||||||
function openVideoInter() {
|
function openVideoInter() {
|
||||||
if (buttonsAreActive || interfaceButtonActive) {
|
if (buttonsAreActive || interfaceButtonActive) {
|
||||||
@ -49,21 +54,37 @@
|
|||||||
tabletOpen = false;
|
tabletOpen = false;
|
||||||
sendMessage(event);
|
sendMessage(event);
|
||||||
}
|
}
|
||||||
|
} else if (webEventData.action == "videoSyncGateway") {
|
||||||
|
if (webEventData.useGatewayServer) {
|
||||||
|
gatewayUserData.wsUrl = "ws://" + webEventData.gatewayIp + ":7080";
|
||||||
|
gatewayUserData.useGatewayServer = true;
|
||||||
|
Entities.editEntity(_entityID, {
|
||||||
|
userData: JSON.stringify(gatewayUserData)
|
||||||
|
});
|
||||||
|
Messages.sendMessage(videoPlayerChannel, event);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
script.preload = function (entityID) {
|
script.preload = function (entityID) {
|
||||||
videoPlayerChannel = entityID;
|
videoPlayerChannel = entityID;
|
||||||
Messages.subscribe(videoPlayerChannel);
|
Messages.subscribe(videoPlayerChannel);
|
||||||
entity = Entities.getEntityProperties(entityID, ["position", "dimensions", "rotation", "serverScripts"]);
|
entity = Entities.getEntityProperties(entityID, ["position", "dimensions", "rotation", "serverScripts", "userData"]);
|
||||||
Entities.editEntity(entityID, {
|
Entities.editEntity(entityID, {
|
||||||
sourceUrl: sourceUrl,
|
sourceUrl: sourceUrl,
|
||||||
dpi: 8,
|
dpi: 8,
|
||||||
maxFPS: 60,
|
maxFPS: 60,
|
||||||
grab: {
|
grab: {
|
||||||
"grabbable": false,
|
"grabbable": false,
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
try {
|
||||||
|
entityUserData = Object(JSON.parse(entity.userData));
|
||||||
|
} catch (e) {
|
||||||
|
Entities.editEntity(entityID, {
|
||||||
|
userData: JSON.stringify(gatewayUserData)
|
||||||
|
});
|
||||||
|
}
|
||||||
if (entity.serverScripts == "") {
|
if (entity.serverScripts == "") {
|
||||||
Entities.editEntity(entityID, {
|
Entities.editEntity(entityID, {
|
||||||
serverScripts: videoSyncServerScriptUrl
|
serverScripts: videoSyncServerScriptUrl
|
||||||
@ -81,7 +102,13 @@
|
|||||||
if (messageData.action == "requestSync") {
|
if (messageData.action == "requestSync") {
|
||||||
webPanelTimeStamp = messageData.myTimeStamp;
|
webPanelTimeStamp = messageData.myTimeStamp;
|
||||||
} else if (messageData.action == "RequestVideoLengthAndTimeStampResponse") {
|
} else if (messageData.action == "RequestVideoLengthAndTimeStampResponse") {
|
||||||
|
var entityUserData = Entities.getEntityProperties(videoPlayerChannel, ["userData"]);
|
||||||
|
var UserData = JSON.parse(entityUserData.userData);
|
||||||
messageData.tabletId = videoPlayerChannel;
|
messageData.tabletId = videoPlayerChannel;
|
||||||
|
messageData.useGatewayServer = UserData.useGatewayServer;
|
||||||
|
messageData.serverConnected = UserData.serverConnected;
|
||||||
|
messageData.wsUrl = UserData.wsUrl;
|
||||||
|
console.log(JSON.stringify(messageData));
|
||||||
tablet.emitScriptEvent(JSON.stringify(messageData));
|
tablet.emitScriptEvent(JSON.stringify(messageData));
|
||||||
return;
|
return;
|
||||||
} else if (messageData.action == "volumeSlider") {
|
} else if (messageData.action == "volumeSlider") {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user