diff --git a/src/plugins/alsaout/AlsaOut.cpp b/src/plugins/alsaout/AlsaOut.cpp
index 2685affe4..cccd7b447 100755
--- a/src/plugins/alsaout/AlsaOut.cpp
+++ b/src/plugins/alsaout/AlsaOut.cpp
@@ -444,18 +444,18 @@ void AlsaOut::WriteLoop() {
     std::cerr << "AlsaOut: thread finished\n";
 }
 
-int AlsaOut::Play(IBuffer *buffer, IBufferProvider* provider) {
+OutputState AlsaOut::Play(IBuffer *buffer, IBufferProvider* provider) {
     this->SetFormat(buffer);
 
     {
         LOCK("play");
 
         if (this->paused) {
-            return OutputInvalidState;
+            return OutputState::InvalidState;
         }
 
         if (this->CountBuffersWithProvider(provider) >= BUFFER_COUNT) {
-            return OutputBufferFull;
+            return OutputState::BufferFull;
         }
 
         std::shared_ptr<BufferContext> context(new BufferContext());
@@ -472,7 +472,7 @@ int AlsaOut::Play(IBuffer *buffer, IBufferProvider* provider) {
         }
     }
 
-    return OutputBufferWritten;
+    return OutputState::BufferWritten;
 }
 
 void AlsaOut::Drain() {
diff --git a/src/plugins/alsaout/AlsaOut.h b/src/plugins/alsaout/AlsaOut.h
index 5b558705f..d5f747044 100755
--- a/src/plugins/alsaout/AlsaOut.h
+++ b/src/plugins/alsaout/AlsaOut.h
@@ -63,7 +63,7 @@ class AlsaOut : public musik::core::sdk::IOutput {
         virtual double Latency() override;
         virtual void Drain() override;
 
-        virtual int Play(
+        virtual musik::core::sdk::OutputState Play(
             musik::core::sdk::IBuffer *buffer,
             musik::core::sdk::IBufferProvider *provider) override;
 
diff --git a/src/plugins/mpris/mpris.cpp b/src/plugins/mpris/mpris.cpp
index 0179504ad..2ba8dab5f 100644
--- a/src/plugins/mpris/mpris.cpp
+++ b/src/plugins/mpris/mpris.cpp
@@ -49,7 +49,7 @@ static class MPRISPlugin : public IPlugin {
 
 extern "C" void SetEnvironment(IEnvironment* environment) {
     if (environment) {
-        environment->GetPath(PathLibrary, localBuffer, sizeof(localBuffer));
+        environment->GetPath(PathType::Library, localBuffer, sizeof(localBuffer));
         thumbnailPath = std::string(localBuffer) + "/thumbs/";
     }
 }
@@ -233,7 +233,7 @@ void MPRISRemote::MPRISPrev() {
 void MPRISRemote::MPRISPause() {
     if (playback) {
         auto state = playback->GetPlaybackState();
-        if (state == PlaybackState::PlaybackPlaying) {
+        if (state == PlaybackState::Playing) {
             playback->PauseOrResume();
         }
     }
@@ -254,7 +254,7 @@ void MPRISRemote::MPRISStop() {
 void MPRISRemote::MPRISPlay() {
     if (playback) {
         auto state = playback->GetPlaybackState();
-        if (state != PlaybackState::PlaybackPlaying) {
+        if (state != PlaybackState::Playing) {
             playback->PauseOrResume();
         }
     }
@@ -277,12 +277,12 @@ const char* MPRISRemote::MPRISGetPlaybackStatus() {
     if (playback) {
         auto state = playback->GetPlaybackState();
         switch (state) {
-        case PlaybackState::PlaybackPlaying:
+        case PlaybackState::Playing:
             return "Playing";
-        case PlaybackState::PlaybackPaused:
+        case PlaybackState::Paused:
             return "Paused";
-        case PlaybackState::PlaybackPrepared:
-        case PlaybackState::PlaybackStopped:
+        case PlaybackState::Prepared:
+        case PlaybackState::Stopped:
         default:
             break;
         }
@@ -294,11 +294,11 @@ const char* MPRISRemote::MPRISGetLoopStatus() {
     if (playback) {
         auto state = playback->GetRepeatMode();
         switch (state) {
-        case RepeatMode::RepeatTrack:
+        case RepeatMode::Track:
             return "Track";
-        case RepeatMode::RepeatList:
+        case RepeatMode::List:
             return "Playlist";
-        case RepeatMode::RepeatNone:
+        case RepeatMode::None:
         default:
             break;
         }
@@ -309,13 +309,13 @@ const char* MPRISRemote::MPRISGetLoopStatus() {
 void MPRISRemote::MPRISSetLoopStatus(const char* state) {
     if (playback) {
         if (!strcmp(state, "None")) {
-            playback->SetRepeatMode(RepeatMode::RepeatNone);
+            playback->SetRepeatMode(RepeatMode::None);
         }
         else if (!strcmp(state, "Playlist")) {
-            playback->SetRepeatMode(RepeatMode::RepeatList);
+            playback->SetRepeatMode(RepeatMode::List);
         }
         else if (!strcmp(state, "Track")) {
-            playback->SetRepeatMode(RepeatMode::RepeatTrack);
+            playback->SetRepeatMode(RepeatMode::Track);
         }
     }
 }
diff --git a/src/plugins/pulseout/PulseOut.cpp b/src/plugins/pulseout/PulseOut.cpp
index f4e5da1d0..10d21148d 100755
--- a/src/plugins/pulseout/PulseOut.cpp
+++ b/src/plugins/pulseout/PulseOut.cpp
@@ -348,20 +348,20 @@ double PulseOut::GetVolume() {
     return this->volume;
 }
 
-int PulseOut::Play(IBuffer *buffer, IBufferProvider* provider) {
+OutputState PulseOut::Play(IBuffer *buffer, IBufferProvider* provider) {
     int error = 0;
 
     {
         Lock lock(this->stateMutex);
 
         if (this->state == StatePaused) {
-            return OutputInvalidState;
+            return OutputState::InvalidState;
         }
 
         this->OpenDevice(buffer);
 
         if (!this->audioConnection || this->state != StatePlaying) {
-            return OutputInvalidState;
+            return OutputState::InvalidState;
         }
 
         if (!this->volumeUpdated) {
@@ -376,12 +376,12 @@ int PulseOut::Play(IBuffer *buffer, IBufferProvider* provider) {
 
         if (error > 0) {
             this->CloseDevice();
-            return 1000; /* try again in a second */
+            return (OutputState) 1000; /* try again in a second */
         }
     }
 
     provider->OnBufferProcessed(buffer);
-    return OutputBufferWritten;
+    return OutputState::BufferWritten;
 }
 
 double PulseOut::Latency() {
diff --git a/src/plugins/pulseout/PulseOut.h b/src/plugins/pulseout/PulseOut.h
index ef2e4f44d..12302419b 100755
--- a/src/plugins/pulseout/PulseOut.h
+++ b/src/plugins/pulseout/PulseOut.h
@@ -59,7 +59,7 @@ class PulseOut : public musik::core::sdk::IOutput {
         virtual double Latency() override;
         virtual void Drain() override;
 
-        virtual int Play(
+        virtual musik::core::sdk::OutputState Play(
             musik::core::sdk::IBuffer *buffer,
             musik::core::sdk::IBufferProvider *provider) override;