funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-12 09:48:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed sorting for playlists other than favorites.

Browse Source
This commit is contained in:
Pieter Hulshoff 2018-05-22 22:08:42 +02:00 committed by Vincent-FK
parent 04cae80445
commit 1680c8467d
5 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
RetroFE/Source/Collection/CollectionInfo.cpp
View File

@ -181,25 +181,31 @@ void CollectionInfo::sortItems()
} }
void CollectionInfo::sortFavoriteItems() void CollectionInfo::sortPlaylists()
{ {
std::vector<Item *> *allItems = playlists["all"]; std::vector<Item *> *allItems = playlists["all"];
std::vector<Item *> favItems; std::vector<Item *> toSortItems;
for(std::vector <Item *>::iterator itFav = playlists["favorites"]->begin(); itFav != playlists["favorites"]->end(); itFav++)
{
favItems.push_back((*itFav));
}
playlists["favorites"]->clear();
for(std::vector <Item *>::iterator itAll = allItems->begin(); itAll != allItems->end(); itAll++) for ( Playlists_T::iterator itP = playlists.begin( ); itP != playlists.end( ); itP++ )
{ {
for(std::vector <Item *>::iterator itFav = favItems.begin(); itFav != favItems.end(); itFav++) if ( itP->second != allItems )
{ {
if ((*itAll) == (*itFav)) toSortItems.clear();
for(std::vector <Item *>::iterator itSort = itP->second->begin(); itSort != itP->second->end(); itSort++)
{ {
playlists["favorites"]->push_back((*itAll)); toSortItems.push_back((*itSort));
}
itP->second->clear();
for(std::vector <Item *>::iterator itAll = allItems->begin(); itAll != allItems->end(); itAll++)
{
for(std::vector <Item *>::iterator itSort = toSortItems.begin(); itSort != toSortItems.end(); itSort++)
{
if ((*itAll) == (*itSort))
{
itP->second->push_back((*itAll));
}
}
} }
} }
} }

2
RetroFE/Source/Collection/CollectionInfo.h
View File

@ -29,7 +29,7 @@ public:
std::string settingsPath() const; std::string settingsPath() const;
bool Save(); bool Save();
void sortItems(); void sortItems();
void sortFavoriteItems(); void sortPlaylists();
void addSubcollection(CollectionInfo *info); void addSubcollection(CollectionInfo *info);
void extensionList(std::vector<std::string> &extensions); void extensionList(std::vector<std::string> &extensions);
std::string name; std::string name;

4
RetroFE/Source/Graphics/Page.cpp
View File

@ -996,7 +996,7 @@ void Page::removePlaylist()
if(it != items->end()) if(it != items->end())
{ {
items->erase(it); items->erase(it);
collection->sortFavoriteItems(); collection->sortPlaylists();
collection->saveRequest = true; collection->saveRequest = true;
} }
collection->Save(); collection->Save();
@ -1014,7 +1014,7 @@ void Page::addPlaylist()
if(playlist_->first != "favorites" && std::find(items->begin(), items->end(), selectedItem_) == items->end()) if(playlist_->first != "favorites" && std::find(items->begin(), items->end(), selectedItem_) == items->end())
{ {
items->push_back(selectedItem_); items->push_back(selectedItem_);
collection->sortFavoriteItems(); collection->sortPlaylists();
collection->saveRequest = true; collection->saveRequest = true;
} }
collection->Save(); collection->Save();

2
RetroFE/Source/RetroFE.cpp
View File

@ -1210,7 +1210,7 @@ CollectionInfo *RetroFE::getCollection(std::string collectionName)
mp.buildMenuItems( collection, menuSort ); mp.buildMenuItems( collection, menuSort );
cib.addPlaylists( collection ); cib.addPlaylists( collection );
collection->sortFavoriteItems( ); collection->sortPlaylists( );
// Add extra info, if available // Add extra info, if available
for ( std::vector<Item *>::iterator it = collection->items.begin( ); it != collection->items.end( ); it++ ) for ( std::vector<Item *>::iterator it = collection->items.begin( ); it != collection->items.end( ); it++ )

2
RetroFE/Source/Version.cpp
View File

@ -21,7 +21,7 @@
std::string retrofe_version_major = "0"; std::string retrofe_version_major = "0";
std::string retrofe_version_minor = "8"; std::string retrofe_version_minor = "8";
std::string retrofe_version_build = "15b5"; std::string retrofe_version_build = "15b6";
std::string Version::getString( ) std::string Version::getString( )