Skip to content

Fix delay command #1227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
n1LS wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix delay command #1227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3ff5cf
re-enables PC messages on change, when the player is running
n1LS Jan 29, 2026
06715ff
Merge branch 'master' of https://github.com/n1LS/picoTracker
n1LS Jan 29, 2026
eb7c2e2
Merge branch 'master' of https://github.com/n1LS/picoTracker
n1LS Jan 30, 2026
22515e6
fixes delay command handling
n1LS Jan 30, 2026
25cad4b
removing superflouos ProcessCommands call
n1LS Feb 5, 2026
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
19 changes: 15 additions & 4 deletions sources/Application/Player/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ void Player::Start(PlayMode mode, bool forceSongMode, MixerServiceMode msmMode,
break;
}

ProcessCommands();
Trace::Error("USELESS?");

startTime_ = mixer_.GetAudioOut()->GetStreamTime();

Expand Down Expand Up @@ -538,17 +538,21 @@ void Player::Update(Observable &o, I_ObservableData *d) {
};
}

// Track which channels just had their delay expire
bool delayExpired[SONG_CHANNEL_COUNT];
for (int i = 0; i < SONG_CHANNEL_COUNT; i++) {
delayExpired[i] = false;
if (timeToStart_[i] > 0) {
if (--timeToStart_[i] == 0) {
playCursorPosition(i);
delayExpired[i] = true;
}
}
}

// Process commands in current phrase
if (viewData_->playMode_ != PM_AUDITION)
ProcessCommands();
ProcessCommands(delayExpired);

// Initialise retrigger table
int instrRetrigger[SONG_CHANNEL_COUNT];
Expand Down Expand Up @@ -613,7 +617,7 @@ void Player::Update(Observable &o, I_ObservableData *d) {
position for all channels
************************************************************/

void Player::ProcessCommands() {
void Player::ProcessCommands(bool delayExpired[SONG_CHANNEL_COUNT]) {

// loop on all channels

Expand All @@ -627,7 +631,14 @@ void Player::ProcessCommands() {

uchar phrase = viewData_->currentPlayPhrase_[i];
if (phrase != 0xFF) {
if (gs->TriggerChannel(i)) { // If groove says it is time to play

// Skip if waiting for delayed trigger
if (timeToStart_[i]) {
Comment thread
n1LS marked this conversation as resolved.
continue;
}

// If groove says it is time to play OR or the delay just expired
if (gs->TriggerChannel(i) || (delayExpired && delayExpired[i])) {
int pos = viewData_->phrasePlayPos_[i];
FourCC cc = viewData_->song_->phrase_.cmd1_[phrase * 16 + pos];
ushort param = viewData_->song_->phrase_.param1_[phrase * 16 + pos];
Expand Down
2 changes: 1 addition & 1 deletion sources/Application/Player/Player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class Player : public I_Observer,
bool IsRunning();
bool GetStopAtEnd() { return stopAtEnd_; }

void ProcessCommands();
void ProcessCommands(bool delayExpired[SONG_CHANNEL_COUNT] = nullptr);
bool ProcessChannelCommand(int channel, FourCC cmd, ushort param);

void StartStreaming(const char *name, int startSample = 0);
Expand Down