@@ -87,14 +87,9 @@ class title_assets {
|
||||
public:
|
||||
title_assets(std::filesystem::path root, vamp_zero::catalog const &catalog)
|
||||
: root_{std::move(root)} {
|
||||
for (auto const &part : catalog.performance.parts) {
|
||||
for (auto const &part : catalog.parts) {
|
||||
identifiers_.insert(part.title_image);
|
||||
}
|
||||
for (auto const &exercise : catalog.practice.exercises) {
|
||||
for (auto const &part : exercise.parts) {
|
||||
identifiers_.insert(part.title_image);
|
||||
}
|
||||
}
|
||||
}
|
||||
auto image(std::string const &identifier) const -> std::optional<title_file> {
|
||||
return identifiers_.contains(identifier) ? read_title(root_, identifier) : std::nullopt;
|
||||
@@ -224,7 +219,7 @@ auto vamp_zero::control_state::finish_playback(std::uint64_t session, std::strin
|
||||
auto updated = vamp_zero::app_state{};
|
||||
{
|
||||
auto lock = std::scoped_lock{mutex_};
|
||||
if (!state_.audio.playback_enabled || state_.score_session != session || (catalog && catalog != state_.catalog) || (state_.mode != vamp_zero::app_mode::PERFORMANCE_SCORE && state_.mode != vamp_zero::app_mode::PRACTICE_SCORE)) {
|
||||
if (!state_.audio.playback_enabled || state_.score_session != session || (catalog && catalog != state_.catalog) || state_.mode != vamp_zero::app_mode::PERFORMANCE_SCORE) {
|
||||
return;
|
||||
}
|
||||
if (error.empty()) {
|
||||
|
||||
Reference in New Issue
Block a user