1 files changed, 17 insertions, 15 deletions

diff --git a/xbmc/interfaces/legacy/Player.cpp b/xbmc/interfaces/legacy/Player.cpp
index b3aff2dfd5..b6af4959ed 100644
--- a/xbmc/interfaces/legacy/Player.cpp
+++ b/xbmc/interfaces/legacy/Player.cpp
@@ -25,6 +25,8 @@
 #include "messaging/ApplicationMessenger.h"
 #include "settings/MediaSettings.h"
 
+using namespace KODI;
+
 namespace
 {
 
@@ -48,19 +50,19 @@ namespace XBMCAddon
 {
   namespace xbmc
   {
-	PlayParameter Player::defaultPlayParameter;
+  PlayParameter Player::defaultPlayParameter;
 
-    Player::Player()
-    {
-      iPlayList = PLAYLIST::TYPE_MUSIC;
+  Player::Player()
+  {
+    iPlayList = static_cast<int>(PLAYLIST::Id::TYPE_MUSIC);
 
-      // now that we're done, register hook me into the system
-      if (languageHook)
-      {
-        DelayedCallGuard dc(languageHook);
-        languageHook->RegisterPlayerCallback(this);
-      }
+    // now that we're done, register hook me into the system
+    if (languageHook)
+    {
+      DelayedCallGuard dc(languageHook);
+      languageHook->RegisterPlayerCallback(this);
     }
+  }
 
     Player::~Player()
     {
@@ -125,8 +127,8 @@ namespace XBMCAddon
       CMediaSettings::GetInstance().SetMediaStartWindowed(windowed);
 
       // play current file in playlist
-      if (CServiceBroker::GetPlaylistPlayer().GetCurrentPlaylist() != iPlayList)
-        CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(iPlayList);
+      if (CServiceBroker::GetPlaylistPlayer().GetCurrentPlaylist() != PLAYLIST::Id{iPlayList})
+        CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::Id{iPlayList});
       CServiceBroker::GetAppMessenger()->SendMsg(
           TMSG_PLAYLISTPLAYER_PLAY, CServiceBroker::GetPlaylistPlayer().GetCurrentItemIdx());
     }
@@ -142,7 +144,7 @@ namespace XBMCAddon
 
         // play a python playlist (a playlist from playlistplayer.cpp)
         iPlayList = playlist->getPlayListId();
-        CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(iPlayList);
+        CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::Id{iPlayList});
         if (startpos > -1)
           CServiceBroker::GetPlaylistPlayer().SetCurrentItemIdx(startpos);
         CServiceBroker::GetAppMessenger()->SendMsg(TMSG_PLAYLISTPLAYER_PLAY, startpos);
@@ -184,9 +186,9 @@ namespace XBMCAddon
       XBMC_TRACE;
       DelayedCallGuard dc(languageHook);
 
-      if (CServiceBroker::GetPlaylistPlayer().GetCurrentPlaylist() != iPlayList)
+      if (CServiceBroker::GetPlaylistPlayer().GetCurrentPlaylist() != PLAYLIST::Id{iPlayList})
       {
-        CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(iPlayList);
+        CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::Id{iPlayList});
       }
       CServiceBroker::GetPlaylistPlayer().SetCurrentItemIdx(selected);