Browse files

cleanup: remove old advanced settings for recently added nodes - no l…

…onger needed now that it's customisable
  • Loading branch information...
1 parent f9cc740 commit 3fc04bc4a273b9acf05fa8e6f6e4fc001fd1f8c8 Jonathan Marshall committed Sep 7, 2012
View
2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
@@ -21,7 +21,6 @@
#include "video/VideoDatabase.h"
#include "DirectoryNodeOverview.h"
-#include "settings/AdvancedSettings.h"
#include "settings/Settings.h"
#include "FileItem.h"
#include "guilib/LocalizeStrings.h"
@@ -92,7 +91,6 @@ bool CDirectoryNodeOverview::GetContent(CFileItemList& items) const
else
vec.push_back(make_pair("3", 20389)); // Music Videos
}
- if (!g_advancedSettings.m_bVideoLibraryHideRecentlyAddedItems)
{
if (hasMovies)
vec.push_back(make_pair("4", 20386)); // Recently Added Movies
View
4 xbmc/settings/AdvancedSettings.cpp
@@ -211,8 +211,6 @@ void CAdvancedSettings::Initialize()
m_bVideoLibraryHideAllItems = false;
m_bVideoLibraryAllItemsOnBottom = false;
- m_iVideoLibraryRecentlyAddedItems = 25;
- m_bVideoLibraryHideRecentlyAddedItems = false;
m_bVideoLibraryHideEmptySeries = false;
m_bVideoLibraryCleanOnUpdate = false;
m_bVideoLibraryExportAutoThumbs = false;
@@ -642,8 +640,6 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
{
XMLUtils::GetBoolean(pElement, "hideallitems", m_bVideoLibraryHideAllItems);
XMLUtils::GetBoolean(pElement, "allitemsonbottom", m_bVideoLibraryAllItemsOnBottom);
- XMLUtils::GetInt(pElement, "recentlyaddeditems", m_iVideoLibraryRecentlyAddedItems, 1, INT_MAX);
- XMLUtils::GetBoolean(pElement, "hiderecentlyaddeditems", m_bVideoLibraryHideRecentlyAddedItems);
XMLUtils::GetBoolean(pElement, "hideemptyseries", m_bVideoLibraryHideEmptySeries);
XMLUtils::GetBoolean(pElement, "cleanonupdate", m_bVideoLibraryCleanOnUpdate);
XMLUtils::GetString(pElement, "itemseparator", m_videoItemSeparator);
View
2 xbmc/settings/AdvancedSettings.h
@@ -247,8 +247,6 @@ class CAdvancedSettings
bool m_bVideoLibraryHideAllItems;
bool m_bVideoLibraryAllItemsOnBottom;
- int m_iVideoLibraryRecentlyAddedItems;
- bool m_bVideoLibraryHideRecentlyAddedItems;
bool m_bVideoLibraryHideEmptySeries;
bool m_bVideoLibraryCleanOnUpdate;
bool m_bVideoLibraryExportAutoThumbs;
View
6 xbmc/video/VideoDatabase.cpp
@@ -6106,23 +6106,23 @@ bool CVideoDatabase::GetRecentlyAddedMoviesNav(const CStdString& strBaseDir, CFi
{
Filter filter;
filter.order = "dateAdded desc, idMovie desc";
- filter.limit = PrepareSQL("%u", limit ? limit : g_advancedSettings.m_iVideoLibraryRecentlyAddedItems);
+ filter.limit = PrepareSQL("%u", limit ? limit : 25);
return GetMoviesByWhere(strBaseDir, filter, items);
}
bool CVideoDatabase::GetRecentlyAddedEpisodesNav(const CStdString& strBaseDir, CFileItemList& items, unsigned int limit)
{
Filter filter;
filter.order = "dateAdded desc, idEpisode desc";
- filter.limit = PrepareSQL("%u", limit ? limit : g_advancedSettings.m_iVideoLibraryRecentlyAddedItems);
+ filter.limit = PrepareSQL("%u", limit ? limit : 25);
return GetEpisodesByWhere(strBaseDir, filter, items, false);
}
bool CVideoDatabase::GetRecentlyAddedMusicVideosNav(const CStdString& strBaseDir, CFileItemList& items, unsigned int limit)
{
Filter filter;
filter.order = "dateAdded desc, idMVideo desc";
- filter.limit = PrepareSQL("%u", limit ? limit : g_advancedSettings.m_iVideoLibraryRecentlyAddedItems);
+ filter.limit = PrepareSQL("%u", limit ? limit : 25);
return GetMusicVideosByWhere(strBaseDir, filter, items);
}

0 comments on commit 3fc04bc

Please sign in to comment.