Merge pull request #1754 from OpenSpace/issue/1735

Removed hard-coded path expectations to allow drag & drop playback
This commit is contained in:
Gene Payne
2021-09-24 12:35:20 -06:00
committed by GitHub
2 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -42,5 +42,5 @@ elseif extension == ".asset" then
return [[openspace.printInfo("Adding asset: ']] .. filename .. [[' (drag-and-drop)");
openspace.asset.add("]] .. filename .. [[");]] .. ReloadUIScript
elseif extension == ".osrec" or extension == ".osrectxt" then
return [[openspace.sessionRecording.startPlayback("]] .. basename .. [[")]]
return [[openspace.sessionRecording.startPlayback("]] .. filename .. [[")]]
end
+4 -4
View File
@@ -355,15 +355,15 @@ bool SessionRecording::startPlayback(std::string& filename,
bool loop)
{
std::string absFilename;
// Run through conversion in case file is older. Does nothing if the file format
// is up-to-date
filename = convertFile(filename);
if (std::filesystem::is_regular_file(filename)) {
absFilename = filename;
}
else {
absFilename = absPath("${RECORDINGS}/" + filename).string();
}
// Run through conversion in case file is older. Does nothing if the file format
// is up-to-date
absFilename = convertFile(absFilename);
if (_state == SessionState::Recording) {
LERROR("Unable to start playback while in session recording mode");
@@ -2201,7 +2201,7 @@ void SessionRecording::readFileIntoStringStream(std::string filename,
std::ifstream& inputFstream,
std::stringstream& stream)
{
std::filesystem::path conversionInFilename = absPath("${RECORDINGS}/" + filename);
std::filesystem::path conversionInFilename = absPath(filename);
if (!std::filesystem::is_regular_file(conversionInFilename)) {
throw ConversionError(fmt::format(
"Cannot find the specified playback file {} to convert", conversionInFilename