mirror of
https://github.com/clangen/musikcube.git
synced 2025-03-14 04:18:36 +00:00
Merge branch 'master' into clangen/upstream-pdcurses
This commit is contained in:
commit
f23de4515a
@ -176,6 +176,9 @@ void CrossfadeTransport::SetPosition(double seconds) {
|
||||
Lock lock(this->stateMutex);
|
||||
|
||||
if (this->active.player) {
|
||||
if (this->state != PlaybackPlaying) {
|
||||
this->SetPlaybackState(PlaybackPlaying);
|
||||
}
|
||||
this->active.player->SetPosition(seconds);
|
||||
}
|
||||
}
|
||||
|
@ -237,6 +237,9 @@ void GaplessTransport::SetPosition(double seconds) {
|
||||
LockT lock(this->stateMutex);
|
||||
|
||||
if (this->activePlayer) {
|
||||
if (this->state != PlaybackPlaying) {
|
||||
this->SetPlaybackState(PlaybackPlaying);
|
||||
}
|
||||
this->activePlayer->SetPosition(seconds);
|
||||
}
|
||||
}
|
||||
|
@ -141,7 +141,6 @@ palette, use ones that most closely match our desired colors */
|
||||
#define COLOR_256_OFFWHITE 251
|
||||
|
||||
#define SCALE(x) ((x * 1000) / 255)
|
||||
|
||||
struct ThemeColor {
|
||||
ThemeColor() {
|
||||
Set(0, 0, 0, 0, -1);
|
||||
|
Loading…
x
Reference in New Issue
Block a user