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

Cleanup Session loading (prepare for session history)

Browse Source
This commit is contained in:
brunoherbelin
2020-10-03 18:45:30 +02:00
parent d563ee14a9
commit 5421b5e926
6 changed files with 81 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Mixer.cpp
View File

@@ -677,10 +677,10 @@ void Mixer::load(const std::string& filename)
if (sessionLoaders_.empty()) {
// Start async thread for loading the session
// Will be obtained in the future in update()
sessionLoaders_.emplace_back( std::async(std::launch::async, loadSession_, filename) );
sessionLoaders_.emplace_back( std::async(std::launch::async, Session::load, filename) );
}
#else
set( loadSession_(filename) );
set( Session::load(filename) );
#endif
}
@@ -715,10 +715,10 @@ void Mixer::import(const std::string& filename)
if (sessionImporters_.empty()) {
// Start async thread for loading the session
// Will be obtained in the future in update()
sessionImporters_.emplace_back( std::async(std::launch::async, loadSession_, filename) );
sessionImporters_.emplace_back( std::async(std::launch::async, Session::load, filename) );
}
#else
merge( loadSession_(filename) );
merge( Session::load(filename) );
#endif
}