add MostPlayedSongsToShow
This commit is contained in:
@@ -2738,6 +2738,7 @@ ShowRandom=1
|
|||||||
Use3D=0
|
Use3D=0
|
||||||
Wheel3DRadius=200 # Possibly safe defaults?
|
Wheel3DRadius=200 # Possibly safe defaults?
|
||||||
CirclePercent=0.5
|
CirclePercent=0.5
|
||||||
|
MostPlayedSongsToShow=30
|
||||||
SortMenuNames=GROUP:TITLE:BPM:PLAYERS' BEST:TOP GRADE:ARTIST:EASY METER:MEDIUM METER:HARD METER
|
SortMenuNames=GROUP:TITLE:BPM:PLAYERS' BEST:TOP GRADE:ARTIST:EASY METER:MEDIUM METER:HARD METER
|
||||||
SortMenuActions=sort,GROUP:sort,TITLE:sort,BPM:sort,PLAYERS BEST:sort,TOP GRADE:sort,ARTIST:sort,EASY METER:sort,MEDIUM METER:sort,HARD METER
|
SortMenuActions=sort,GROUP:sort,TITLE:sort,BPM:sort,PLAYERS BEST:sort,TOP GRADE:sort,ARTIST:sort,EASY METER:sort,MEDIUM METER:sort,HARD METER
|
||||||
ModeMenuNames=GROUP
|
ModeMenuNames=GROUP
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ CachedThemeMetricF CIRCLE_PERCENT ("MusicWheel","CirclePercent");
|
|||||||
CachedThemeMetricB USE_3D ("MusicWheel","Use3D");
|
CachedThemeMetricB USE_3D ("MusicWheel","Use3D");
|
||||||
CachedThemeMetricI NUM_WHEEL_ITEMS_METRIC ("MusicWheel","NumWheelItems");
|
CachedThemeMetricI NUM_WHEEL_ITEMS_METRIC ("MusicWheel","NumWheelItems");
|
||||||
#define NUM_WHEEL_ITEMS min( MAX_WHEEL_ITEMS, (int) NUM_WHEEL_ITEMS_METRIC )
|
#define NUM_WHEEL_ITEMS min( MAX_WHEEL_ITEMS, (int) NUM_WHEEL_ITEMS_METRIC )
|
||||||
|
#define MOST_PLAYED_SONGS_TO_SHOW THEME->GetMetricI("MusicWheel","MostPlayedSongsToShow")
|
||||||
#define SORT_MENU_NAMES THEME->GetMetric ("MusicWheel","SortMenuNames")
|
#define SORT_MENU_NAMES THEME->GetMetric ("MusicWheel","SortMenuNames")
|
||||||
#define SORT_MENU_ACTIONS THEME->GetMetric ("MusicWheel","SortMenuActions")
|
#define SORT_MENU_ACTIONS THEME->GetMetric ("MusicWheel","SortMenuActions")
|
||||||
#define MODE_MENU_NAMES THEME->GetMetric ("MusicWheel","ModeMenuNames")
|
#define MODE_MENU_NAMES THEME->GetMetric ("MusicWheel","ModeMenuNames")
|
||||||
@@ -474,7 +475,8 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
|
|||||||
|
|
||||||
const vector<Song*> arrayAllSongs = SONGMAN->GetBestSongs();
|
const vector<Song*> arrayAllSongs = SONGMAN->GetBestSongs();
|
||||||
|
|
||||||
for ( i=0; arraySongs.size() < 30 && i < arrayAllSongs.size(); i++ )
|
const unsigned SongsToShow = MOST_PLAYED_SONGS_TO_SHOW;
|
||||||
|
for ( i=0; arraySongs.size() < SongsToShow && i < arrayAllSongs.size(); i++ )
|
||||||
{
|
{
|
||||||
// weed out songs that require more songs than are available
|
// weed out songs that require more songs than are available
|
||||||
Song *pSong = arrayAllSongs[i];
|
Song *pSong = arrayAllSongs[i];
|
||||||
|
|||||||
Reference in New Issue
Block a user