mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-19 20:32:15 +02:00
UI: Translate to current OS for all colection imports
Importers are written to convert third-party collection formats to a Windows OBS scene collection. The Studio importer is capable of translating scene collections to the correct types for the current operating system. This change makes it so all imports will be ran through the Studio translation, not just Studio and SL collections.
This commit is contained in:
parent
8a132ad69f
commit
19ced32c58
@ -530,6 +530,11 @@ int ClassicImporter::ImportScenes(const string &path, string &name, Json &res)
|
||||
Json sc = data;
|
||||
translate_sc(sc, res);
|
||||
|
||||
QDir dir(path.c_str());
|
||||
|
||||
TranslateOSStudio(res);
|
||||
TranslatePaths(res, QDir::cleanPath(dir.filePath("..")).toStdString());
|
||||
|
||||
return IMPORTER_SUCCESS;
|
||||
}
|
||||
|
||||
|
@ -439,7 +439,10 @@ int SLImporter::ImportScenes(const string &path, string &name, Json &res)
|
||||
}
|
||||
}
|
||||
|
||||
QDir dir(path.c_str());
|
||||
|
||||
TranslateOSStudio(res);
|
||||
TranslatePaths(res, QDir::cleanPath(dir.filePath("..")).toStdString());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
@ -477,6 +477,11 @@ int XSplitImporter::ImportScenes(const string &path, string &name,
|
||||
|
||||
res = r;
|
||||
|
||||
QDir dir(path.c_str());
|
||||
|
||||
TranslateOSStudio(res);
|
||||
TranslatePaths(res, QDir::cleanPath(dir.filePath("..")).toStdString());
|
||||
|
||||
return IMPORTER_SUCCESS;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user