Playlist display menu

RetroFE/Source/Collection/CollectionInfo.h

@@ -39,6 +39,7 @@ class CollectionInfo
     std::string metadataType;
     std::string launcher;
     std::vector<Item *> items;
+    std::vector<Item*> playlistItems;
 
     typedef std::map<std::string, std::vector <Item *> *> Playlists_T;
     Playlists_T playlists;

RetroFE/Source/Collection/CollectionInfoBuilder.cpp

@@ -422,6 +422,7 @@ void CollectionInfoBuilder::addPlaylists(CollectionInfo *info)
         info->playlists["favorites"] = new std::vector<Item *>();
         return;
     }
+    std::map<std::string, Item*> playlistItems;
 
     while((dirp = readdir(dp)) != NULL)
     {
@@ -445,6 +446,14 @@ void CollectionInfoBuilder::addPlaylists(CollectionInfo *info)
 
                 info->playlists[basename] = new std::vector<Item *>();
 
+                Item* playlistItem = new Item();
+                playlistItem->name = basename;
+                playlistItem->title = basename;
+                playlistItem->fullTitle = basename;
+                playlistItem->leaf = false;
+                playlistItem->collectionInfo = info;
+                playlistItems[basename] = playlistItem;
+
                 // add the playlist list 
                 for(std::map<std::string, Item *>::iterator it = playlistFilter.begin(); it != playlistFilter.end(); it++)
                 {
@@ -480,6 +489,28 @@ void CollectionInfoBuilder::addPlaylists(CollectionInfo *info)
             }
         }
     }
+    // if cyclePlaylist then order playlist menu items by that
+    std::string cycleString;
+    conf_.getProperty("cyclePlaylist", cycleString);
+    std::vector<std::string> cycleVector;
+    Utils::listToVector(cycleString, cycleVector, ',');
+    if (cycleVector.size())
+    {
+        // add in order according to cycle list
+        for (std::vector<std::string>::iterator itP = cycleVector.begin(); itP != cycleVector.end(); itP++)
+        {
+            if (playlistItems[*itP]) {
+                info->playlistItems.push_back(playlistItems[*itP]);
+            }
+        }
+    }
+    else {
+        // convert lookup playlist map to vector
+        for (std::map<std::string, Item*>::iterator itP = playlistItems.begin(); itP != playlistItems.end(); itP++)
+        {
+            info->playlistItems.push_back(itP->second);
+        }
+    }
 
     if (dp) closedir(dp);
 

RetroFE/Source/Graphics/Component/ScrollingList.cpp

@@ -44,6 +44,7 @@ ScrollingList::ScrollingList( Configuration &c,
                               Page          &p,
                               bool           layoutMode,
                               bool           commonMode,
+                              bool          playlistType,
                               Font          *font,
                               std::string    layoutKey,
                               std::string    imageType,
@@ -52,6 +53,7 @@ ScrollingList::ScrollingList( Configuration &c,
     , horizontalScroll( false )
     , layoutMode_( layoutMode )
     , commonMode_( commonMode )
+    , playlistType_( playlistType )
     , spriteList_( NULL )
     , scrollPoints_( NULL )
     , tweenPoints_( NULL )
@@ -76,6 +78,7 @@ ScrollingList::ScrollingList( const ScrollingList &copy )
     , horizontalScroll( copy.horizontalScroll )
     , layoutMode_( copy.layoutMode_ )
     , commonMode_( copy.commonMode_ )
+    , playlistType_(copy.playlistType_)
     , spriteList_( NULL )
     , itemIndex_( 0 )
     , selectedOffsetIndex_( copy.selectedOffsetIndex_ )
@@ -108,13 +111,17 @@ ScrollingList::~ScrollingList( )
     }
 }
 
+std::vector<Item*> ScrollingList::getItems()
+{
+    return *items_;
+}
 
 void ScrollingList::setItems( std::vector<Item *> *items )
 {
     items_ = items;
-    if ( items_ )
+    if (items_)
     {
-        itemIndex_ = loopDecrement( 0, selectedOffsetIndex_, items_->size( ) );
+        itemIndex_ = loopDecrement(0, selectedOffsetIndex_, items_->size());
     }
 }
 
@@ -764,6 +771,8 @@ bool ScrollingList::allocateTexture( unsigned int index, Item *item )
         names.push_back( item->rating );
     if ( typeLC == "score" )
         names.push_back( item->score );
+    if (typeLC.rfind("playlist", 0) == 0)
+        names.push_back(item->name);
     names.push_back("default");
 
     for ( unsigned int n = 0; n < names.size() && !t; ++n )
@@ -1050,6 +1059,9 @@ void ScrollingList::updateScrollPeriod(  )
 
 void ScrollingList::scroll( bool forward )
 {
+    // playlist menus don't scroll
+    if (playlistType_)
+        return;
 
     if ( !items_ || items_->size(  ) == 0 ) return;
     if ( !scrollPoints_ || scrollPoints_->size(  ) == 0 ) return;

RetroFE/Source/Graphics/Component/ScrollingList.h

@@ -37,13 +37,15 @@ class ScrollingList : public Component
                    Page          &p,
                    bool          layoutMode,
                    bool          commonMode,
+                   bool          playlistType,
                    Font         *font,
                    std::string   layoutKey,
                    std::string   imageType,
                    std::string   videoType );
 
     ScrollingList( const ScrollingList &copy );
     virtual ~ScrollingList( );
+    std::vector<Item*> getItems();
     void triggerEnterEvent( );
     void triggerExitEvent( );
     void triggerMenuEnterEvent( int menuIndex = -1 );
@@ -101,6 +103,7 @@ class ScrollingList : public Component
     void resetScrollPeriod( );
     void updateScrollPeriod( );
     void scroll( bool forward );
+    bool playlistType_;//todo make getter
 
 private: