Skip to content

Commit

Permalink
Merge pull request #25187 from notspiff/playlist_id_enum_class
Browse files Browse the repository at this point in the history 
PLAYLIST::Id: convert to enum class
  • Loading branch information
@notspiff
notspiff committed May 11, 2024
2 parents 64e0ecf + f5a84bc commit 436befa
Show file tree
Hide file tree
Showing 51 changed files with 449 additions and 397 deletions.
42 changes: 21 additions & 21 deletions xbmc/Autorun.cpp
View file
Expand Up @@ -102,7 +102,7 @@ bool CAutorun::PlayDisc(const std::string& path, bool bypassSettings, bool start
if ( !bypassSettings && CServiceBroker::GetSettingsComponent()->GetSettings()->GetInt(CSettings::SETTING_AUDIOCDS_AUTOACTION) != AUTOCD_PLAY && !CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(CSettings::SETTING_DVDS_AUTORUN))
return false;

int nSize = CServiceBroker::GetPlaylistPlayer().GetPlaylist(PLAYLIST::TYPE_MUSIC).size();
int nSize = CServiceBroker::GetPlaylistPlayer().GetPlaylist(PLAYLIST::Id::TYPE_MUSIC).size();
int nAddedToPlaylist = 0;

std::string mediaPath;
Expand Down Expand Up @@ -131,7 +131,7 @@ bool CAutorun::PlayDisc(const std::string& path, bool bypassSettings, bool start
{
CGUIMessage msg( GUI_MSG_PLAYLIST_CHANGED, 0, 0 );
CServiceBroker::GetGUI()->GetWindowManager().SendMessage( msg );
CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::TYPE_MUSIC);
CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::Id::TYPE_MUSIC);
// Start playing the items we inserted
return CServiceBroker::GetPlaylistPlayer().Play(nSize, "");
}
Expand Down Expand Up @@ -215,10 +215,10 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde
if (!startFromBeginning && !item->GetVideoInfoTag()->m_strFileNameAndPath.empty())
item->SetStartOffset(STARTOFFSET_RESUME);

CServiceBroker::GetPlaylistPlayer().ClearPlaylist(PLAYLIST::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().SetShuffle(PLAYLIST::TYPE_VIDEO, false);
CServiceBroker::GetPlaylistPlayer().Add(PLAYLIST::TYPE_VIDEO, item);
CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().ClearPlaylist(PLAYLIST::Id::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().SetShuffle(PLAYLIST::Id::TYPE_VIDEO, false);
CServiceBroker::GetPlaylistPlayer().Add(PLAYLIST::Id::TYPE_VIDEO, item);
CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::Id::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().Play(0, "");
return true;
}
Expand All @@ -237,10 +237,10 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde
if (!startFromBeginning && !item->GetVideoInfoTag()->m_strFileNameAndPath.empty())
item->SetStartOffset(STARTOFFSET_RESUME);

CServiceBroker::GetPlaylistPlayer().ClearPlaylist(PLAYLIST::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().SetShuffle(PLAYLIST::TYPE_VIDEO, false);
CServiceBroker::GetPlaylistPlayer().Add(PLAYLIST::TYPE_VIDEO, item);
CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().ClearPlaylist(PLAYLIST::Id::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().SetShuffle(PLAYLIST::Id::TYPE_VIDEO, false);
CServiceBroker::GetPlaylistPlayer().Add(PLAYLIST::Id::TYPE_VIDEO, item);
CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::Id::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().Play(0, "");
return true;
}
Expand Down Expand Up @@ -346,10 +346,10 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde

// internal *.evo playback.
CLog::Log(LOGINFO,"HD DVD: Internal multifile playback initiated.");
CServiceBroker::GetPlaylistPlayer().ClearPlaylist(PLAYLIST::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().SetShuffle(PLAYLIST::TYPE_VIDEO, false);
CServiceBroker::GetPlaylistPlayer().Add(PLAYLIST::TYPE_VIDEO, items);
CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().ClearPlaylist(PLAYLIST::Id::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().SetShuffle(PLAYLIST::Id::TYPE_VIDEO, false);
CServiceBroker::GetPlaylistPlayer().Add(PLAYLIST::Id::TYPE_VIDEO, items);
CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::Id::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().Play(0, "");
return true;
}
Expand All @@ -370,9 +370,9 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde
if (items.Size())
{
items.Sort(SortByLabel, SortOrderAscending);
CServiceBroker::GetPlaylistPlayer().ClearPlaylist(PLAYLIST::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().Add(PLAYLIST::TYPE_VIDEO, items);
CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().ClearPlaylist(PLAYLIST::Id::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().Add(PLAYLIST::Id::TYPE_VIDEO, items);
CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::Id::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().Play(0, "");
return true;
}
Expand Down Expand Up @@ -429,9 +429,9 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde
if (!g_passwordManager.IsMasterLockUnlocked(true))
return false;
}
CServiceBroker::GetPlaylistPlayer().ClearPlaylist(PLAYLIST::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().Add(PLAYLIST::TYPE_VIDEO, itemlist);
CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().ClearPlaylist(PLAYLIST::Id::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().Add(PLAYLIST::Id::TYPE_VIDEO, itemlist);
CServiceBroker::GetPlaylistPlayer().SetCurrentPlaylist(PLAYLIST::Id::TYPE_VIDEO);
CServiceBroker::GetPlaylistPlayer().Play(0, "");
}
}
Expand All @@ -444,7 +444,7 @@ bool CAutorun::RunDisc(IDirectory* pDir, const std::string& strDrive, int& nAdde
if (!pItem->m_bIsFolder && MUSIC::IsAudio(*pItem))
{
nAddedToPlaylist++;
CServiceBroker::GetPlaylistPlayer().Add(PLAYLIST::TYPE_MUSIC, pItem);
CServiceBroker::GetPlaylistPlayer().Add(PLAYLIST::Id::TYPE_MUSIC, pItem);
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions xbmc/GUIInfoManager.cpp
View file
Expand Up @@ -10545,14 +10545,14 @@ int CGUIInfoManager::TranslateSingleString(const std::string &strCondition, bool
return ret;
else
{
PLAYLIST::Id playlistid = PLAYLIST::TYPE_NONE;
PLAYLIST::Id playlistid = PLAYLIST::Id::TYPE_NONE;
if (StringUtils::EqualsNoCase(prop.param(), "video"))
playlistid = PLAYLIST::TYPE_VIDEO;
playlistid = PLAYLIST::Id::TYPE_VIDEO;
else if (StringUtils::EqualsNoCase(prop.param(), "music"))
playlistid = PLAYLIST::TYPE_MUSIC;
playlistid = PLAYLIST::Id::TYPE_MUSIC;

if (playlistid != PLAYLIST::TYPE_NONE)
return AddMultiInfo(CGUIInfo(ret, playlistid, 1));
if (playlistid != PLAYLIST::Id::TYPE_NONE)
return AddMultiInfo(CGUIInfo(ret, static_cast<int>(playlistid), 1));
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions xbmc/PartyModeManager.cpp
View file
Expand Up @@ -563,7 +563,8 @@ void CPartyModeManager::Announce()
{
CVariant data;

data["player"]["playerid"] = CServiceBroker::GetPlaylistPlayer().GetCurrentPlaylist();
data["player"]["playerid"] =
static_cast<int>(CServiceBroker::GetPlaylistPlayer().GetCurrentPlaylist());
data["property"]["partymode"] = m_bEnabled;
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::Player, "OnPropertyChanged",
data);
Expand All @@ -572,5 +573,5 @@ void CPartyModeManager::Announce()

PLAYLIST::Id CPartyModeManager::GetPlaylistId() const
{
return m_bIsVideo ? PLAYLIST::TYPE_VIDEO : PLAYLIST::TYPE_MUSIC;
return m_bIsVideo ? PLAYLIST::Id::TYPE_VIDEO : PLAYLIST::Id::TYPE_MUSIC;
}
2 changes: 1 addition & 1 deletion xbmc/PartyModeManager.h
View file
Expand Up @@ -17,7 +17,7 @@ class CFileItem; typedef std::shared_ptr<CFileItem> CFileItemPtr;
class CFileItemList;
namespace PLAYLIST
{
using Id = int;
enum class Id;
class CPlayList;
}

Expand Down

0 comments on commit 436befa

Please sign in to comment.