diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2013-09-29 07:00:30 -0700 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2013-09-29 07:00:30 -0700 |
| commit | c828f8810e0d47d71498008ad6ad834d2c893f51 (patch) | |
| tree | 202adc68549d09fa487cf65925ecffda4c3be39b | |
| parent | ae95c238baf85468265de784e3597e745babbb1d (diff) | |
| parent | 9a4535291af842c593c9f48a0dbbc0ebd69b6bca (diff) | |
Merge pull request #3348 from ronie/artists-with-an-s
fix broken artists node in musicvideos
| -rw-r--r-- | xbmc/music/windows/GUIWindowMusicNav.cpp | 4 | ||||
| -rw-r--r-- | xbmc/video/VideoDatabase.cpp | 2 | ||||
| -rw-r--r-- | xbmc/video/windows/GUIWindowVideoNav.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp index 90f83272e0..15c37dc742 100644 --- a/xbmc/music/windows/GUIWindowMusicNav.cpp +++ b/xbmc/music/windows/GUIWindowMusicNav.cpp @@ -447,7 +447,7 @@ void CGUIWindowMusicNav::GetContextButtons(int itemNumber, CContextButtons &butt { if (!item->m_bIsFolder) // music video buttons.Add(CONTEXT_BUTTON_INFO, 20393); - if (StringUtils::StartsWithNoCase(item->GetPath(), "videodb://musicvideos/artist/") && item->m_bIsFolder) + if (StringUtils::StartsWithNoCase(item->GetPath(), "videodb://musicvideos/artists/") && item->m_bIsFolder) { long idArtist = m_musicdatabase.GetArtistByName(m_vecItems->Get(itemNumber)->GetLabel()); if (idArtist > - 1) @@ -630,7 +630,7 @@ bool CGUIWindowMusicNav::OnContextButton(int itemNumber, CONTEXT_BUTTON button) CStdString strPath; CVideoDatabase database; database.Open(); - strPath.Format("videodb://musicvideos/artist/%ld/",database.GetMatchingMusicVideo(StringUtils::Join(item->GetMusicInfoTag()->GetArtist(), g_advancedSettings.m_musicItemSeparator))); + strPath.Format("videodb://musicvideos/artists/%ld/",database.GetMatchingMusicVideo(StringUtils::Join(item->GetMusicInfoTag()->GetArtist(), g_advancedSettings.m_musicItemSeparator))); g_windowManager.ActivateWindow(WINDOW_VIDEO_NAV,strPath); return true; } diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp index 22d408402a..6b9ad8c951 100644 --- a/xbmc/video/VideoDatabase.cpp +++ b/xbmc/video/VideoDatabase.cpp @@ -7171,7 +7171,7 @@ void CVideoDatabase::GetMusicVideoArtistsByName(const CStdString& strSearch, CFi CFileItemPtr pItem(new CFileItem(m_pDS->fv("actors.strActor").get_asString())); CStdString strDir; strDir.Format("%ld/", m_pDS->fv("actors.idActor").get_asInt()); - pItem->SetPath("videodb://musicvideos/artist/"+ strDir); + pItem->SetPath("videodb://musicvideos/artists/"+ strDir); pItem->m_bIsFolder=true; items.Add(pItem); m_pDS->next(); diff --git a/xbmc/video/windows/GUIWindowVideoNav.cpp b/xbmc/video/windows/GUIWindowVideoNav.cpp index 1dfbb52165..9a9e8d1ed4 100644 --- a/xbmc/video/windows/GUIWindowVideoNav.cpp +++ b/xbmc/video/windows/GUIWindowVideoNav.cpp @@ -1533,7 +1533,7 @@ CStdString CGUIWindowVideoNav::GetStartFolder(const CStdString &dir) else if (dir.Equals("MusicVideoYears")) return "videodb://musicvideos/years/"; else if (dir.Equals("MusicVideoArtists")) - return "videodb://musicvideos/artist/"; + return "videodb://musicvideos/artists/"; else if (dir.Equals("MusicVideoAlbums")) return "videodb://musicvideos/albums/"; else if (dir.Equals("MusicVideoDirectors")) |