From 28a77d8c2f9ef897d0315e8b3d5a2fd977f2bac5 Mon Sep 17 00:00:00 2001 From: Pieter Hulshoff Date: Sat, 17 Aug 2019 20:53:17 +0200 Subject: [PATCH] Any type starting with playlist is now a reserved word, and uses the current playlist name. This will allow multiple playlist graphics to be used, like playlist1, playlist2, etc. --- RetroFE/Source/Graphics/Component/ReloadableMedia.cpp | 2 +- RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp | 2 +- RetroFE/Source/Graphics/Component/ReloadableText.cpp | 2 +- RetroFE/Source/Version.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp b/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp index ee74229..c826004 100644 --- a/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp +++ b/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp @@ -284,7 +284,7 @@ void ReloadableMedia::reloadTexture() basename = selectedItem->score; defined = true; } - else if(typeLC == "playlist") + else if(typeLC.rfind( "playlist", 0 ) == 0) { basename = page.getPlaylistName(); defined = true; diff --git a/RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp b/RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp index cf7ed98..53d61ef 100644 --- a/RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp +++ b/RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp @@ -289,7 +289,7 @@ void ReloadableScrollingText::reloadTexture( ) else // item is a collection (void)config_.getProperty("collections." + selectedItem->name + ".genre", text ); } - else if (type_ == "playlist") + else if (type_.rfind( "playlist", 0 ) == 0) { text = playlistName; } diff --git a/RetroFE/Source/Graphics/Component/ReloadableText.cpp b/RetroFE/Source/Graphics/Component/ReloadableText.cpp index 64bc786..4d80672 100644 --- a/RetroFE/Source/Graphics/Component/ReloadableText.cpp +++ b/RetroFE/Source/Graphics/Component/ReloadableText.cpp @@ -175,7 +175,7 @@ void ReloadableText::ReloadTexture() { text = selectedItem->genre; } - else if (type_ == "playlist") + else if (type_.rfind( "playlist", 0 ) == 0) { text = playlistName; } diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp index cf057da..70e3583 100644 --- a/RetroFE/Source/Version.cpp +++ b/RetroFE/Source/Version.cpp @@ -21,7 +21,7 @@ std::string retrofe_version_major = "0"; std::string retrofe_version_minor = "9"; -std::string retrofe_version_build = "1"; +std::string retrofe_version_build = "2"; std::string Version::getString( )