aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xbmc/interfaces/legacy/InfoTagMusic.cpp4
-rw-r--r--xbmc/music/MusicDatabase.cpp4
-rw-r--r--xbmc/music/windows/GUIWindowMusicNav.cpp8
-rw-r--r--xbmc/windows/GUIWindowLoginScreen.cpp52
-rw-r--r--xbmc/windows/GUIWindowLoginScreen.h2
5 files changed, 36 insertions, 34 deletions
diff --git a/xbmc/interfaces/legacy/InfoTagMusic.cpp b/xbmc/interfaces/legacy/InfoTagMusic.cpp
index fe01cba12b..6b6e416948 100644
--- a/xbmc/interfaces/legacy/InfoTagMusic.cpp
+++ b/xbmc/interfaces/legacy/InfoTagMusic.cpp
@@ -54,12 +54,12 @@ namespace XBMCAddon
String InfoTagMusic::getArtist()
{
- return StringUtils::Join(infoTag->GetArtist(), g_advancedSettings.m_musicItemSeparator);
+ return infoTag->GetArtistString();
}
String InfoTagMusic::getAlbumArtist()
{
- return StringUtils::Join(infoTag->GetAlbumArtist(), g_advancedSettings.m_musicItemSeparator);
+ return infoTag->GetAlbumArtistString();
}
String InfoTagMusic::getAlbum()
diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp
index 7502f31875..1e29e06789 100644
--- a/xbmc/music/MusicDatabase.cpp
+++ b/xbmc/music/MusicDatabase.cpp
@@ -5307,7 +5307,7 @@ void CMusicDatabase::ImportFromXML(const std::string &xmlFile)
CAlbum importedAlbum;
importedAlbum.Load(entry);
strTitle = importedAlbum.strAlbum;
- int idAlbum = GetAlbumByName(importedAlbum.strAlbum, importedAlbum.GetAlbumArtist());
+ int idAlbum = GetAlbumByName(importedAlbum.strAlbum, importedAlbum.GetAlbumArtistString());
if (idAlbum > -1)
{
CAlbum album;
@@ -5399,7 +5399,7 @@ void CMusicDatabase::SetPropertiesForFileItem(CFileItem& item)
int idAlbum = item.GetMusicInfoTag()->GetAlbumId();
if (idAlbum <= 0)
idAlbum = GetAlbumByName(item.GetMusicInfoTag()->GetAlbum(),
- item.GetMusicInfoTag()->GetArtist());
+ item.GetMusicInfoTag()->GetArtistString());
if (idAlbum > -1)
{
CAlbum album;
diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp
index 10a11e63de..a0d6ef167c 100644
--- a/xbmc/music/windows/GUIWindowMusicNav.cpp
+++ b/xbmc/music/windows/GUIWindowMusicNav.cpp
@@ -549,16 +549,16 @@ void CGUIWindowMusicNav::GetContextButtons(int itemNumber, CContextButtons &butt
// 4. specific per album
buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20195);
}
- if (item->HasMusicInfoTag() && item->GetMusicInfoTag()->GetArtist().size() > 0)
+ if (item->HasMusicInfoTag() && !item->GetMusicInfoTag()->GetArtistString().empty())
{
CVideoDatabase database;
database.Open();
if (database.GetMatchingMusicVideo(item->GetMusicInfoTag()->GetArtistString()) > -1)
buttons.Add(CONTEXT_BUTTON_GO_TO_ARTIST, 20400);
}
- if (item->HasMusicInfoTag() && item->GetMusicInfoTag()->GetArtist().size() > 0 &&
- item->GetMusicInfoTag()->GetAlbum().size() > 0 &&
- item->GetMusicInfoTag()->GetTitle().size() > 0)
+ if (item->HasMusicInfoTag() && !item->GetMusicInfoTag()->GetArtistString().empty() &&
+ !item->GetMusicInfoTag()->GetAlbum().empty() &&
+ !item->GetMusicInfoTag()->GetTitle().empty())
{
CVideoDatabase database;
database.Open();
diff --git a/xbmc/windows/GUIWindowLoginScreen.cpp b/xbmc/windows/GUIWindowLoginScreen.cpp
index 4e93e455e5..3cbca001d2 100644
--- a/xbmc/windows/GUIWindowLoginScreen.cpp
+++ b/xbmc/windows/GUIWindowLoginScreen.cpp
@@ -18,38 +18,40 @@
*
*/
+#include "GUIWindowLoginScreen.h"
+
#include "system.h"
+
#include "Application.h"
-#include "messaging/ApplicationMessenger.h"
-#include "GUIWindowLoginScreen.h"
-#include "profiles/Profile.h"
-#include "profiles/ProfilesManager.h"
-#include "profiles/dialogs/GUIDialogProfileSettings.h"
-#include "dialogs/GUIDialogContextMenu.h"
+#include "ContextMenuManager.h"
+#include "FileItem.h"
#include "GUIPassword.h"
+#include "addons/AddonManager.h"
+#include "addons/Skin.h"
+#include "cores/AudioEngine/DSPAddons/ActiveAEDSP.h"
+#include "dialogs/GUIDialogContextMenu.h"
+#include "dialogs/GUIDialogOK.h"
+#include "guilib/GUIMessage.h"
+#include "guilib/GUIWindowManager.h"
+#include "guilib/LocalizeStrings.h"
+#include "guilib/StereoscopicsManager.h"
+#include "input/Key.h"
+#include "interfaces/builtins/Builtins.h"
#ifdef HAS_JSONRPC
#include "interfaces/json-rpc/JSONRPC.h"
#endif
-#include "interfaces/builtins/Builtins.h"
+#include "messaging/ApplicationMessenger.h"
+#include "network/Network.h"
+#include "profiles/Profile.h"
+#include "profiles/ProfilesManager.h"
+#include "profiles/dialogs/GUIDialogProfileSettings.h"
+#include "pvr/PVRManager.h"
+#include "settings/Settings.h"
#include "utils/log.h"
-#include "utils/Weather.h"
#include "utils/StringUtils.h"
+#include "utils/Weather.h"
#include "utils/Variant.h"
-#include "network/Network.h"
-#include "addons/Skin.h"
-#include "guilib/GUIMessage.h"
-#include "guilib/GUIWindowManager.h"
-#include "guilib/StereoscopicsManager.h"
-#include "dialogs/GUIDialogOK.h"
-#include "settings/Settings.h"
-#include "FileItem.h"
-#include "input/Key.h"
-#include "guilib/LocalizeStrings.h"
-#include "addons/AddonManager.h"
#include "view/ViewState.h"
-#include "pvr/PVRManager.h"
-#include "ContextMenuManager.h"
-#include "cores/AudioEngine/DSPAddons/ActiveAEDSP.h"
using namespace KODI::MESSAGING;
@@ -58,7 +60,7 @@ using namespace KODI::MESSAGING;
#define CONTROL_LABEL_SELECTED_PROFILE 3
CGUIWindowLoginScreen::CGUIWindowLoginScreen(void)
-: CGUIWindow(WINDOW_LOGIN_SCREEN, "LoginScreen.xml")
+ : CGUIWindow(WINDOW_LOGIN_SCREEN, "LoginScreen.xml")
{
watch.StartZero();
m_vecItems = new CFileItemList;
@@ -251,7 +253,7 @@ bool CGUIWindowLoginScreen::OnPopupMenu(int iItem)
// Edit the profile after checking if the correct master lock password was given.
if (choice == 1 && g_passwordManager.IsMasterLockUnlocked(true))
CGUIDialogProfileSettings::ShowForProfile(m_viewControl.GetSelectedItem());
-
+
//NOTE: this can potentially (de)select the wrong item if the filelisting has changed because of an action above.
if (iItem < (int)CProfilesManager::GetInstance().GetNumberOfProfiles())
m_vecItems->Get(iItem)->Select(bSelect);
@@ -321,7 +323,7 @@ void CGUIWindowLoginScreen::LoadProfile(unsigned int profile)
JSONRPC::CJSONRPC::Initialize();
#endif
- // start services which should run on login
+ // start services which should run on login
ADDON::CAddonMgr::GetInstance().StartServices(false);
// start PVR related services
diff --git a/xbmc/windows/GUIWindowLoginScreen.h b/xbmc/windows/GUIWindowLoginScreen.h
index e94ec183ab..fba195bc00 100644
--- a/xbmc/windows/GUIWindowLoginScreen.h
+++ b/xbmc/windows/GUIWindowLoginScreen.h
@@ -21,8 +21,8 @@
*/
#include "guilib/GUIDialog.h"
-#include "view/GUIViewControl.h"
#include "utils/Stopwatch.h"
+#include "view/GUIViewControl.h"
class CFileItemList;
generated by cgit v1.2.3 (git 2.26.2) at 2025-02-17 02:54:58 +0000