The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2024-06-03 02:58:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gui refactoring, pass1: Rename Gui::gui->timerController -> controller

Browse Source
This commit is contained in:
simon.kagstrom 2010-08-15 11:59:34 +00:00
parent 78a4a29c83
commit 01e2513f62
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Network.cpp
View File

@ -74,7 +74,7 @@ public:
{ {
this->setState(CONNECT_TO_BROKER); this->setState(CONNECT_TO_BROKER);
Gui::gui->timerController->arm(this, 4000); Gui::gui->controller->arm(this, 4000);
} }
void timeoutCallback() void timeoutCallback()

12
Src/gui/disc_menu.cpp
View File

@ -46,7 +46,7 @@ public:
SaveScreenshot() : TimeoutHandler() SaveScreenshot() : TimeoutHandler()
{ {
/* ~45 seconds from now */ /* ~45 seconds from now */
Gui::gui->timerController->arm(this, 45000); Gui::gui->controller->arm(this, 45000);
} }
virtual void timeoutCallback() virtual void timeoutCallback()
@ -56,7 +56,7 @@ public:
if (Gui::gui->is_active) if (Gui::gui->is_active)
{ {
/* Rearm if we are in the GUI */ /* Rearm if we are in the GUI */
Gui::gui->timerController->arm(this, 10000); Gui::gui->controller->arm(this, 10000);
return; return;
} }
Gui::gui->cur_gameInfo->setScreenshot(TheC64->TheDisplay->SurfaceFromC64Display()); Gui::gui->cur_gameInfo->setScreenshot(TheC64->TheDisplay->SurfaceFromC64Display());
@ -74,7 +74,7 @@ public:
{ {
Gui::gui->status_bar->queueMessage("Resetting the C64"); Gui::gui->status_bar->queueMessage("Resetting the C64");
TheC64->Reset(); TheC64->Reset();
Gui::gui->timerController->arm(this, 4500); Gui::gui->controller->arm(this, 4500);
} }
virtual void timeoutCallback() virtual void timeoutCallback()
@ -149,7 +149,7 @@ public:
free(tmp_filename); free(tmp_filename);
} }
Gui::gui->timerController->disarm(this); Gui::gui->controller->disarm(this);
Gui::gui->dv->loadGameInfo(fileName); Gui::gui->dv->loadGameInfo(fileName);
if (Gui::gui->dv->gameInfo->gi) if (Gui::gui->dv->gameInfo->gi)
@ -172,7 +172,7 @@ public:
virtual void hoverCallback(int which) virtual void hoverCallback(int which)
{ {
Gui::gui->timerController->arm(this, 350); Gui::gui->controller->arm(this, 350);
} }
virtual void timeoutCallback() virtual void timeoutCallback()
@ -182,7 +182,7 @@ public:
virtual void escapeCallback(int which) virtual void escapeCallback(int which)
{ {
Gui::gui->timerController->disarm(this); Gui::gui->controller->disarm(this);
Gui::gui->popView(); Gui::gui->popView();
} }

6
Src/gui/gui.cpp
View File

@ -101,7 +101,7 @@ Gui::Gui()
this->n_views = 0; this->n_views = 0;
this->views = NULL; this->views = NULL;
this->timerController = new TimerController(); this->controller = new TimerController();
VirtualKeyboard::kbd = new VirtualKeyboard(NULL); VirtualKeyboard::kbd = new VirtualKeyboard(NULL);
@ -143,7 +143,7 @@ Gui::~Gui()
delete this->nrv; delete this->nrv;
delete this->cur_gameInfo; delete this->cur_gameInfo;
delete this->timerController; delete this->controller;
if (this->status_bar) if (this->status_bar)
delete this->status_bar; delete this->status_bar;
@ -277,7 +277,7 @@ void Gui::runLogic(void)
GuiView *cur_view = this->peekView(); GuiView *cur_view = this->peekView();
this->status_bar->runLogic(); this->status_bar->runLogic();
this->timerController->tick(); this->controller->tick();
if (this->kbd) if (this->kbd)
this->kbd->runLogic(); this->kbd->runLogic();

2
Src/gui/gui.hh
View File

@ -104,7 +104,7 @@ public:
Font *default_font; Font *default_font;
Font *small_font; Font *small_font;
TimerController *timerController; TimerController *controller;
/* Handled specially */ /* Handled specially */
VirtualKeyboard *kbd; VirtualKeyboard *kbd;

2
Src/gui/main_menu.cpp
View File

@ -19,7 +19,7 @@ public:
TheC64->pushKeyCode(this->kc, false); TheC64->pushKeyCode(this->kc, false);
/* Release it soon */ /* Release it soon */
Gui::gui->timerController->arm(this, 1); Gui::gui->controller->arm(this, 1);
} }
virtual void timeoutCallback() virtual void timeoutCallback()

2
Src/gui/network_server_messages.cpp
View File

@ -72,7 +72,7 @@ void NetworkServerMessages::timeoutCallback()
if (this->messages[this->tail]) if (this->messages[this->tail])
break; break;
} }
Gui::gui->timerController->arm(this, 5000); Gui::gui->controller->arm(this, 5000);
free(cpy); free(cpy);
} }

2
Src/gui/save_game_menu.cpp
View File

@ -95,7 +95,7 @@ public:
virtual void hoverCallback(int which) virtual void hoverCallback(int which)
{ {
Gui::gui->timerController->arm(this, 350); Gui::gui->controller->arm(this, 350);
} }
virtual void escapeCallback(int which) virtual void escapeCallback(int which)

4
Src/gui/status_bar.cpp
View File

@ -29,7 +29,7 @@ void StatusBar::queueMessage(const char *fmt, ...)
/* If this is the first message, display it as soon as possible */ /* If this is the first message, display it as soon as possible */
if (this->head == this->tail) if (this->head == this->tail)
Gui::gui->timerController->arm(this, 1); Gui::gui->controller->arm(this, 1);
this->head = (this->head + 1) % N_STATUS_MESSAGES; this->head = (this->head + 1) % N_STATUS_MESSAGES;
if (this->head == this->tail) if (this->head == this->tail)
@ -60,7 +60,7 @@ void StatusBar::timeoutCallback()
this->setText(text); this->setText(text);
else else
this->setText(NULL); this->setText(NULL);
Gui::gui->timerController->arm(this, 2000); Gui::gui->controller->arm(this, 2000);
free((void *)this->cur_message); free((void *)this->cur_message);
} }

2
Src/timer.cpp
View File

@ -10,7 +10,7 @@
TimeoutHandler::~TimeoutHandler() TimeoutHandler::~TimeoutHandler()
{ {
/* If we haven't timed out yet, disarm us */ /* If we haven't timed out yet, disarm us */
Gui::gui->timerController->disarm(this); Gui::gui->controller->disarm(this);
} }