Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 20:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove check that recording has started playing

Browse source
This commit is contained in:
David Rowe 2017-05-12 14:14:24 +12:00
parent 26672b475f
commit 42aacb07ff
1 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scripts/system/record.js
View file

@ -277,7 +277,6 @@
playerIsPlayings = [], // True if AC player script is playing a recording. playerIsPlayings = [], // True if AC player script is playing a recording.
playerRecordings = [], // Assignment client mappings of recordings being played. playerRecordings = [], // Assignment client mappings of recordings being played.
playerTimestamps = [], // Timestamps of last heartbeat update from player script. playerTimestamps = [], // Timestamps of last heartbeat update from player script.
playerStartupTimeouts = [], // Timers that check that recording has started playing.
updateTimer, updateTimer,
UPDATE_INTERVAL = 5000; // Must be > player's HEARTBEAT_INTERVAL. UPDATE_INTERVAL = 5000; // Must be > player's HEARTBEAT_INTERVAL.
@ -298,7 +297,6 @@
playerIsPlayings.splice(i, 1); playerIsPlayings.splice(i, 1);
playerRecordings.splice(i, 1); playerRecordings.splice(i, 1);
playerTimestamps.splice(i, 1); playerTimestamps.splice(i, 1);
playerStartupTimeouts.splice(i, 1);
} }
} }
@ -309,8 +307,7 @@
} }
function playRecording(recording, position, orientation) { function playRecording(recording, position, orientation) {
var index, var index;
CHECK_PLAYING_TIMEOUT = 10000;
// Optional function parameters. // Optional function parameters.
if (position === undefined) { if (position === undefined) {
@ -334,26 +331,9 @@
position: position, position: position,
orientation: orientation orientation: orientation
})); }));
playerStartupTimeouts[index] = Script.setTimeout(function () {
if ((!playerIsPlayings[index] || playerRecordings[index] !== recording) && playerStartupTimeouts[index]) {
error("Didn't start playing recording "
+ recording.slice(4) + "!"); // Remove leading "atp:" from recording.
}
playerStartupTimeouts[index] = null;
}, CHECK_PLAYING_TIMEOUT);
} }
function stopPlayingRecording(playerID) { function stopPlayingRecording(playerID) {
var index;
// Cancel check that recording started playing.
index = playerIDs.indexOf(playerID);
if (index !== -1 && playerStartupTimeouts[index] !== null) {
Script.clearTimeout(playerStartupTimeouts[index]);
playerStartupTimeouts[index] = null;
}
Messages.sendMessage(HIFI_PLAYER_CHANNEL, JSON.stringify({ Messages.sendMessage(HIFI_PLAYER_CHANNEL, JSON.stringify({
player: playerID, player: playerID,
command: PLAYER_COMMAND_STOP command: PLAYER_COMMAND_STOP
@ -374,7 +354,6 @@
if (index === -1) { if (index === -1) {
index = playerIDs.length; index = playerIDs.length;
playerIDs[index] = sender; playerIDs[index] = sender;
playerStartupTimeouts[index] = null;
} }
playerIsPlayings[index] = message.playing; playerIsPlayings[index] = message.playing;
playerRecordings[index] = message.recording; playerRecordings[index] = message.recording;
@ -387,7 +366,6 @@
playerIsPlayings = []; playerIsPlayings = [];
playerRecordings = []; playerRecordings = [];
playerTimestamps = []; playerTimestamps = [];
playerStartupTimeouts = [];
Dialog.updatePlayerDetails(playerIsPlayings, playerRecordings, playerIDs); Dialog.updatePlayerDetails(playerIsPlayings, playerRecordings, playerIDs);
} }