Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 01:17:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't warn that recording didn't start playing if you stop it

Browse source
This commit is contained in:
David Rowe 2017-05-02 12:01:55 +12:00
parent 67daa4b0a9
commit dd739d73a0
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
scripts/system/record.js
View file

@ -273,10 +273,11 @@
PLAYER_COMMAND_PLAY = "play", PLAYER_COMMAND_PLAY = "play",
PLAYER_COMMAND_STOP = "stop", PLAYER_COMMAND_STOP = "stop",
playerIDs = [], // UUIDs of AC player scripts. playerIDs = [], // UUIDs of AC player scripts.
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.
@ -297,6 +298,7 @@
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);
} }
} }
@ -333,16 +335,25 @@
orientation: orientation orientation: orientation
})); }));
Script.setTimeout(function () { playerStartupTimeouts[index] = Script.setTimeout(function () {
if (!playerIsPlayings[index] || playerRecordings[index] !== recording) { if ((!playerIsPlayings[index] || playerRecordings[index] !== recording) && playerStartupTimeouts[index]) {
error("Didn't start playing recording " error("Didn't start playing recording "
+ recording.slice(4) + "!"); // Remove leading "atp:" from recording. + recording.slice(4) + "!"); // Remove leading "atp:" from recording.
} }
playerStartupTimeouts[index] = null;
}, CHECK_PLAYING_TIMEOUT); }, 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) {
// Cannot clearTimeout() without program log error, so just set null.
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
@ -375,6 +386,7 @@
playerIsPlayings = []; playerIsPlayings = [];
playerRecordings = []; playerRecordings = [];
playerTimestamps = []; playerTimestamps = [];
playerStartupTimeouts = [];
Dialog.updatePlayerDetails(playerIsPlayings, playerRecordings, playerIDs); Dialog.updatePlayerDetails(playerIsPlayings, playerRecordings, playerIDs);
} }