Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/notation/internal/notationplayback.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,16 @@ RetVal<muse::midi::tick_t> NotationPlayback::playPositionTickByElement(const Eng

void NotationPlayback::addLoopBoundary(LoopBoundaryType boundaryType, tick_t tick)
{
const Measure* first = score()->firstMeasure();
const Measure* last = score()->lastMeasure();
IF_ASSERT_FAILED(first && last) {
return;
}

if (tick == BoundaryTick::FirstScoreTick) {
tick = score()->firstMeasure()->tick().ticks();
tick = first->tick().ticks();
} else if (tick == BoundaryTick::LastScoreTick) {
tick = score()->lastMeasure()->endTick().ticks();
tick = last->endTick().ticks();
}

switch (boundaryType) {
Expand Down
24 changes: 22 additions & 2 deletions src/playback/internal/playbackcontroller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#include "playbacktypes.h"

#include "engraving/dom/masterscore.h"
#include "engraving/dom/stafftext.h"
#include "engraving/dom/utils.h"
#include "engraving/dom/factory.h"
Expand Down Expand Up @@ -1790,9 +1791,28 @@ void PlaybackController::setIsExportingAudio(bool exporting)
}
}

bool PlaybackController::canReceiveAction(const ActionCode&) const
bool PlaybackController::canReceiveAction(const ActionCode& code) const
{
return m_masterNotation != nullptr && m_masterNotation->hasParts();
if (!m_masterNotation || !m_masterNotation->hasParts()) {
return false;
}

static const std::unordered_set<ActionCode> REQUIRES_MEASURES {
PLAY_CODE,
STOP_CODE,
PAUSE_AND_SELECT_CODE,
REWIND_CODE,
LOOP_CODE,
LOOP_IN_CODE,
LOOP_OUT_CODE,
};

if (muse::contains(REQUIRES_MEASURES, code)) {
const MasterScore* score = m_masterNotation->masterScore();
return score && score->firstMeasure();
}

return true;
}

const std::map<TrackId, AudioResourceMeta>& PlaybackController::onlineSounds() const
Expand Down
Loading