mirror of
https://github.com/wiiu-env/homebrew_launcher.git
synced 2024-06-15 21:58:45 +02:00
Changes to be compatible to the latest libgui version
This commit is contained in:
parent
cc2fd2e414
commit
b081028575
2
Makefile
2
Makefile
|
@ -51,7 +51,7 @@ LIBS := -lgui -lfreetype -lgd -lpng -ljpeg -lz -lmad -lvorbisidec -logg -lbz2 -
|
||||||
# list of directories containing libraries, this must be the top level
|
# list of directories containing libraries, this must be the top level
|
||||||
# containing include and lib
|
# containing include and lib
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
LIBDIRS := $(PORTLIBS) $(WUT_ROOT)
|
LIBDIRS := $(PORTLIBS) $(WUT_ROOT) $(WUT_ROOT)/usr
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#include "resources/Resources.h"
|
#include "resources/Resources.h"
|
||||||
#include <gui/sounds/SoundHandler.hpp>
|
#include <gui/sounds/SoundHandler.hpp>
|
||||||
#include "system/memory.h"
|
#include "system/memory.h"
|
||||||
|
#include "system/AsyncDeleter.h"
|
||||||
#include "utils/logger.h"
|
#include "utils/logger.h"
|
||||||
|
|
||||||
Application *Application::applicationInstance = NULL;
|
Application *Application::applicationInstance = NULL;
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include "resources/Resources.h"
|
#include "resources/Resources.h"
|
||||||
#include "utils/utils.h"
|
#include "utils/utils.h"
|
||||||
#include "Application.h"
|
#include "Application.h"
|
||||||
|
#include "system/AsyncDeleter.h"
|
||||||
|
|
||||||
#include <sysapp/launch.h>
|
#include <sysapp/launch.h>
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#define _PROGRESS_WINDOW_H_
|
#define _PROGRESS_WINDOW_H_
|
||||||
|
|
||||||
#include "gui/Gui.h"
|
#include "gui/Gui.h"
|
||||||
|
#include "system/CMutex.h"
|
||||||
|
|
||||||
class ProgressWindow : public GuiFrame, public sigslot::has_slots<> {
|
class ProgressWindow : public GuiFrame, public sigslot::has_slots<> {
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -52,7 +52,7 @@ void AsyncDeleter::executeThread(void) {
|
||||||
//! because otherwise they would block or do invalid access on GUI thread
|
//! because otherwise they would block or do invalid access on GUI thread
|
||||||
while(!realDeleteElements.empty()) {
|
while(!realDeleteElements.empty()) {
|
||||||
deleteMutex.lock();
|
deleteMutex.lock();
|
||||||
AsyncDeleter::Element *element = realDeleteElements.front();
|
GuiElement *element = realDeleteElements.front();
|
||||||
realDeleteElements.pop();
|
realDeleteElements.pop();
|
||||||
deleteMutex.unlock();
|
deleteMutex.unlock();
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#define _ASYNC_DELETER_H
|
#define _ASYNC_DELETER_H
|
||||||
|
|
||||||
#include <queue>
|
#include <queue>
|
||||||
|
#include <gui/gui.h>
|
||||||
#include "CThread.h"
|
#include "CThread.h"
|
||||||
#include "CMutex.h"
|
#include "CMutex.h"
|
||||||
|
|
||||||
|
@ -34,7 +35,7 @@ public:
|
||||||
virtual ~Element() {}
|
virtual ~Element() {}
|
||||||
};
|
};
|
||||||
|
|
||||||
static void pushForDelete(AsyncDeleter::Element *e) {
|
static void pushForDelete(GuiElement *e) {
|
||||||
if(!deleterInstance)
|
if(!deleterInstance)
|
||||||
deleterInstance = new AsyncDeleter;
|
deleterInstance = new AsyncDeleter;
|
||||||
|
|
||||||
|
@ -52,8 +53,8 @@ private:
|
||||||
void executeThread(void);
|
void executeThread(void);
|
||||||
|
|
||||||
bool exitApplication;
|
bool exitApplication;
|
||||||
std::queue<AsyncDeleter::Element *> deleteElements;
|
std::queue<GuiElement *> deleteElements;
|
||||||
std::queue<AsyncDeleter::Element *> realDeleteElements;
|
std::queue<GuiElement *> realDeleteElements;
|
||||||
CMutex deleteMutex;
|
CMutex deleteMutex;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user