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

Get rid of some sessionrecording warnings

Browse Source
This commit is contained in:
GPayne
2021-09-22 15:58:59 -06:00
parent 24fafc8718
commit b00b900278
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/interaction/sessionrecording.h
+5 -5
View File
@@ -832,16 +832,16 @@ public:
~SessionRecording_legacy_0085() {}
char FileHeaderVersion[FileHeaderVersionLength+1] = "00.85";
char TargetConvertVersion[FileHeaderVersionLength+1] = "01.00";
std::string fileFormatVersion() {
std::string fileFormatVersion() override {
return std::string(FileHeaderVersion);
}
std::string targetFileFormatVersion() {
std::string targetFileFormatVersion() override {
return std::string(TargetConvertVersion);
}
std::string getLegacyConversionResult(std::string filename, int depth);
std::string getLegacyConversionResult(std::string filename, int depth) override;
struct ScriptMessage_legacy_0085 : public datamessagestructures::ScriptMessage {
void read(std::istream* in) {
void read(std::istream* in) override {
size_t strLen;
//Read string length from file
in->read(reinterpret_cast<char*>(&strLen), sizeof(strLen));
@@ -860,7 +860,7 @@ public:
protected:
bool convertScript(std::stringstream& inStream, DataMode mode, int lineNum,
std::string& inputLine, std::ofstream& outFile, unsigned char* buffer);
std::string& inputLine, std::ofstream& outFile, unsigned char* buffer) override;
};
} // namespace openspace
src/interaction/sessionrecording.cpp
-1
View File
@@ -1777,7 +1777,6 @@ bool SessionRecording::addKeyframe(Timestamps t3stamps,
void SessionRecording::moveAheadInTime() {
using namespace std::chrono;
bool paused = global::timeManager->isPaused();
bool playbackPaused = (_state == SessionState::PlaybackPaused);
if (playbackPaused) {
_playbackPauseOffset