don't show random/roulette in non-preferred sorts

stepmania/Themes/default/metrics.ini

@@ -505,7 +505,7 @@ NonPresenceP2X=SCREEN_CENTER_X+448
 NonPresenceP2Y=SCREEN_CENTER_Y+0
 NonPresenceP2OnCommand=x,768;sleep,0.5;linear,1.0;x,607
 NonPresenceP2OffCommand=
-DefaultSort=Group
+DefaultSort=Preferred
 FOV=0
 FOVCenterX=SCREEN_CENTER_X+0
 FOVCenterY=SCREEN_CENTER_Y+0
@@ -2421,8 +2421,9 @@ Use3D=0
 Wheel3DRadius=200 # Possibly safe defaults?
 CirclePercent=0.5
 MostPlayedSongsToShow=30
-SortMenuChoiceNames=Group,Title,Bpm,Popularity,TopGrade,Artist,EasyMeter,MediumMeter,HardMeter
-ModeMenuChoiceNames=Group
+SortMenuChoiceNames=Preferred,Group,Title,Bpm,Popularity,TopGrade,Artist,EasyMeter,MediumMeter,HardMeter
+ModeMenuChoiceNames=Preferred
+ChoicePreferred=name,PREFERRED;sort,Preferred
 ChoiceGroup=name,GROUP;sort,Group
 ChoiceTitle=name,TITLE;sort,Title
 ChoiceBpm=name,BPM;sort,BPM

stepmania/src/MusicWheel.cpp

@@ -463,10 +463,13 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 		switch( so )
 		{
 		case SORT_PREFERRED:
-		case SORT_ROULETTE:
 			SongUtil::SortSongPointerArrayByGroupAndDifficulty( arraySongs );
 			bUseSections = false;
 			break;
+		case SORT_ROULETTE:
+			// don't sort.  We shuffle once this is chosen.
+			bUseSections = false;
+			break;
 		case SORT_GROUP:
 			SongUtil::SortSongPointerArrayByGroupAndTitle( arraySongs );
 			bUseSections = GAMESTATE->m_sPreferredSongGroup == GROUP_ALL_MUSIC;
@@ -555,7 +558,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
 			}
 		}
 
-		if( so != SORT_ROULETTE )
+		if( so == SORT_PREFERRED )
 		{
 			if( SHOW_ROULETTE )
 				arrayWheelItemDatas.push_back( WheelItemData(TYPE_ROULETTE, NULL, "", NULL, RageColor(1,0,0,1)) );