Merge branch 'master' into clangen/upstream-pdcurses

src/core/audio/CrossfadeTransport.cpp

@@ -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);
         }
     }

src/core/audio/GaplessTransport.cpp

@@ -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);
         }
     }

src/musikcube/cursespp/Colors.cpp

@@ -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);