diff options
| author | DaveTBlake <oak99sky@yahoo.co.uk> | 2015-11-12 12:38:20 +0000 |
|---|---|---|
| committer | DaveTBlake <oak99sky@yahoo.co.uk> | 2015-11-12 12:38:20 +0000 |
| commit | aa75d6ba494f7f5b82b71f214d4682a8bdddce78 (patch) | |
| tree | 124f6e3b461053ca8c29376327c1149189e6f72c | |
| parent | a11c9e463293daee0f68bfbf311cff898d1626f5 (diff) | |
Restore content to "files" when in music file view, but still have "media info" view type available so that music file tag data can be displayed.
The original file view functionality was broken when deprecating the use of CGUIViewStateWindowMusicSong to make music more like video. But previous attempts to restore sorting and view types by setting content to "songs" were too course and caused other issues.
| -rw-r--r-- | addons/skin.confluence/720p/ViewsMusicLibrary.xml | 2 | ||||
| -rw-r--r-- | xbmc/music/windows/GUIWindowMusicNav.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/skin.confluence/720p/ViewsMusicLibrary.xml b/addons/skin.confluence/720p/ViewsMusicLibrary.xml index bdf81a4289..58a5886fea 100644 --- a/addons/skin.confluence/720p/ViewsMusicLibrary.xml +++ b/addons/skin.confluence/720p/ViewsMusicLibrary.xml @@ -16,7 +16,7 @@ <viewtype label="$LOCALIZE[544]">list</viewtype> <pagecontrol>60</pagecontrol> <scrolltime>200</scrolltime> - <visible>Window.IsVisible(MusicPlaylist) | Container.Content(Songs) | Container.Content(Albums)</visible> + <visible>Container.Content(Files) | Window.IsVisible(MusicPlaylist) | Container.Content(Songs) | Container.Content(Albums)</visible> <itemlayout height="40" width="780"> <control type="image"> <left>0</left> diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp index a0d6ef167c..97ec01b5ad 100644 --- a/xbmc/music/windows/GUIWindowMusicNav.cpp +++ b/xbmc/music/windows/GUIWindowMusicNav.cpp @@ -347,8 +347,7 @@ bool CGUIWindowMusicNav::GetDirectory(const std::string &strDirectory, CFileItem items.SetContent("playlists"); else if (URIUtils::PathEquals(strDirectory, "plugin://music/")) items.SetContent("plugins"); - else if (items.IsPlayList() || - (!items.IsSourcesPath() && !items.IsVirtualDirectoryRoot() && !items.IsLibraryFolder())) + else if (items.IsPlayList()) items.SetContent("songs"); return bResult; |