eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-12 02:40:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Session load recursion, allow higher level of imbrication

Browse Source 
Recursive load of SessionFile in a Session is now detected by filename and prevented. Deeper level of integration of sessionfile inside session is thus possible (set to 3). Sessions now have an id, allowing to reference them by id in the logs. Terminology is clarified between level and recursion.
This commit is contained in:
Bruno Herbelin
2022-04-08 17:44:39 +02:00
parent ef65dd8cc6
commit 33756c775c
7 changed files with 84 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Session.cpp
View File

@@ -42,9 +42,13 @@ SessionNote::SessionNote(const std::string &t, bool l, int s): label(std::to_str
{
}
Session::Session() : active_(true), activation_threshold_(MIXING_MIN_THRESHOLD),
Session::Session(uint64_t id) : id_(id), active_(true), activation_threshold_(MIXING_MIN_THRESHOLD),
filename_(""), failedSource_(nullptr), thumbnail_(nullptr)
{
// create unique id
if (id_ == 0)
id_ = BaseToolkit::uniqueId();
config_[View::RENDERING] = new Group;
config_[View::RENDERING]->scale_ = glm::vec3(0.f);
@@ -669,10 +673,10 @@ void Session::validate (SourceList &sources)
}
}
Session *Session::load(const std::string& filename, uint recursion)
Session *Session::load(const std::string& filename, uint level)
{
// create session
SessionCreator creator(recursion);
SessionCreator creator(level);
creator.load(filename);
// return created session