defer MusicList loading
This commit is contained in:
@@ -16,7 +16,10 @@
|
|||||||
MusicList::MusicList()
|
MusicList::MusicList()
|
||||||
{
|
{
|
||||||
CurGroup = 0;
|
CurGroup = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MusicList::Load()
|
||||||
|
{
|
||||||
for( int i=0; i<NUM_COLUMNS; i++ )
|
for( int i=0; i<NUM_COLUMNS; i++ )
|
||||||
{
|
{
|
||||||
m_textTitles[i].LoadFromFont( THEME->GetPathToF("MusicList titles") );
|
m_textTitles[i].LoadFromFont( THEME->GetPathToF("MusicList titles") );
|
||||||
|
|||||||
@@ -7,7 +7,8 @@
|
|||||||
|
|
||||||
const int MAX_MLIST_COLUMNS = 5;
|
const int MAX_MLIST_COLUMNS = 5;
|
||||||
|
|
||||||
class MusicList : public ActorFrame {
|
class MusicList : public ActorFrame
|
||||||
|
{
|
||||||
BitmapText m_textTitles[MAX_MLIST_COLUMNS];
|
BitmapText m_textTitles[MAX_MLIST_COLUMNS];
|
||||||
|
|
||||||
struct group {
|
struct group {
|
||||||
@@ -21,6 +22,7 @@ class MusicList : public ActorFrame {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
MusicList();
|
MusicList();
|
||||||
|
void Load();
|
||||||
|
|
||||||
/* Add a new group. */
|
/* Add a new group. */
|
||||||
void AddGroup();
|
void AddGroup();
|
||||||
|
|||||||
@@ -99,6 +99,7 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : Screen( sClassName
|
|||||||
asGroupNames.push_back( iter->first );
|
asGroupNames.push_back( iter->first );
|
||||||
|
|
||||||
// Add songs to the MusicList.
|
// Add songs to the MusicList.
|
||||||
|
m_MusicList.Load();
|
||||||
for( unsigned g=0; g < asGroupNames.size(); g++ ) /* for each group */
|
for( unsigned g=0; g < asGroupNames.size(); g++ ) /* for each group */
|
||||||
{
|
{
|
||||||
vector<Song*> aSongsInGroup;
|
vector<Song*> aSongsInGroup;
|
||||||
|
|||||||
Reference in New Issue
Block a user