mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-04 18:11:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Misc cleanup in session recording

Browse Source
This commit is contained in:
Alexander Bock
2019-05-23 03:03:04 -06:00
parent dfc9ab17f0
commit 9f6733ed72
5 changed files with 278 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/server/include/topics/sessionrecordingtopic.h
+4 -2
View File
@@ -26,6 +26,7 @@
#define __OPENSPACE_MODULE_SERVER___SESSION_RECORDING_TOPIC___H__
#include <modules/server/include/topics/topic.h>
#include <openspace/interaction/sessionrecording.h>
namespace openspace {
@@ -39,7 +40,7 @@ public:
bool isDone() const override;
private:
const int UnsetOnChangeHandle = -1;
static const int UnsetOnChangeHandle = -1;
bool _sendState;
bool _sendFiles;
@@ -47,7 +48,8 @@ private:
// Provides the idle/recording/playback state int value in json message
void sendJsonData();
interaction::SessionRecording::SessionState _lastState;
interaction::SessionRecording::SessionState _lastState =
interaction::SessionRecording::SessionState::Idle;
int _stateCallbackHandle = UnsetOnChangeHandle;
bool _isDone = false;
};
modules/server/src/topics/sessionrecordingtopic.cpp
+22 -30
View File
@@ -27,7 +27,6 @@
#include <modules/server/include/connection.h>
#include <openspace/engine/globals.h>
#include <openspace/query/query.h>
#include <openspace/interaction/sessionrecording.h>
#include <ghoul/logging/logmanager.h>
namespace {
@@ -46,9 +45,7 @@ using nlohmann::json;
namespace openspace {
SessionRecordingTopic::SessionRecordingTopic()
: _lastState(interaction::SessionRecording::SessionState::Idle)
{
SessionRecordingTopic::SessionRecordingTopic() {
LDEBUG("Starting new SessionRecording state subscription");
}
@@ -63,14 +60,11 @@ bool SessionRecordingTopic::isDone() const {
}
void SessionRecordingTopic::handleJson(const nlohmann::json& json) {
using SessionRecording = openspace::interaction::SessionRecording;
const std::string event = json.at(EventKey).get<std::string>();
if (event != SubscribeEvent &&
event != UnsubscribeEvent &&
if (event != SubscribeEvent && event != UnsubscribeEvent &&
event != RefreshEvent)
{
LERROR("Unsupported event.");
LERROR("Unsupported event");
_isDone = true;
return;
}
@@ -103,19 +97,17 @@ void SessionRecordingTopic::handleJson(const nlohmann::json& json) {
sendJsonData();
if (event == SubscribeEvent) {
if (_sendState) {
_stateCallbackHandle = global::sessionRecording.addStateChangeCallback(
[this]() {
SessionRecording::SessionState currentState =
if (event == SubscribeEvent && _sendState) {
_stateCallbackHandle = global::sessionRecording.addStateChangeCallback(
[this]() {
interaction::SessionRecording::SessionState currentState =
global::sessionRecording.state();
if (currentState != _lastState) {
sendJsonData();
_lastState = currentState;
}
if (currentState != _lastState) {
sendJsonData();
_lastState = currentState;
}
);
}
}
);
}
}
@@ -126,22 +118,22 @@ void SessionRecordingTopic::sendJsonData() {
SessionRecording::SessionState state = global::sessionRecording.state();
std::string stateString;
switch (state) {
case SessionRecording::SessionState::Recording:
stateString = "recording";
break;
case SessionRecording::SessionState::Playback:
stateString = "playing";
break;
default:
stateString = "idle";
break;
case SessionRecording::SessionState::Recording:
stateString = "recording";
break;
case SessionRecording::SessionState::Playback:
stateString = "playing";
break;
default:
stateString = "idle";
break;
}
stateJson[StateKey] = stateString;
};
if (_sendFiles) {
stateJson[FilesKey] = global::sessionRecording.playbackList();
}
if (stateJson.size() > 0) {
if (!stateJson.empty()) {
_connection->sendJson(wrappedPayload(stateJson));
}
}