do not initialize screens lazily as it doesn't make much sense

This commit is contained in:
Andrzej Rybczak
2012-09-14 00:54:48 +02:00
parent 7c3f93e211
commit 1891c1c050
41 changed files with 153 additions and 205 deletions

View File

@@ -37,9 +37,9 @@ using Global::MainStartY;
using Global::myScreen;
using Global::myOldScreen;
SelectedItemsAdder *mySelectedItemsAdder = new SelectedItemsAdder;
SelectedItemsAdder *mySelectedItemsAdder;
void SelectedItemsAdder::init()
SelectedItemsAdder::SelectedItemsAdder() : itsPSWidth(35), itsPSHeight(11)
{
SetDimensions();
itsPlaylistSelector = new NC::Menu<std::string>((COLS-itsWidth)/2, (MainHeight-itsHeight)/2+MainStartY, itsWidth, itsHeight, "Add selected item(s) to...", Config.main_color, Config.window_border);
@@ -62,7 +62,6 @@ void SelectedItemsAdder::init()
itsPositionSelector->addItem("Cancel");
w = itsPlaylistSelector;
isInitialized = 1;
}
void SelectedItemsAdder::switchTo()
@@ -76,9 +75,6 @@ void SelectedItemsAdder::switchTo()
if (!hs || !hs->allowsSelection())
return;
if (!isInitialized)
init();
// default to main window
w = itsPlaylistSelector;
@@ -189,14 +185,6 @@ void SelectedItemsAdder::enterPressed()
if (Mpd.CommitCommandsList())
Statusbar::msg("Selected item(s) added to playlist \"%s\"", w->current().value().c_str());
}
if (pos != w->size()-1)
{
// refresh playlist's lists
if (myBrowser->main() && !myBrowser->isLocal() && myBrowser->CurrentDir() == "/")
myBrowser->GetDirectory("/");
if (myPlaylistEditor->main())
myPlaylistEditor->Playlists->clear(); // make playlist editor update itself
}
}
else
{