Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 908 vs 909 for /trunk/Source Code/Core/Headers/Application.h

Diff revisions: vs.
  @@ -34,7 +34,6 @@
34 34
35 35 #include "WindowManager.h"
36 36 #include "ErrorCodes.h"
37 - #include <thread>
38 37
39 38 namespace Divide {
40 39
  @@ -48,13 +47,18 @@
48 47
49 48 /// Lightweight singleton class that manages our application's kernel and window
50 49 /// information
51 - DEFINE_SINGLETON(Application)
50 + class Application {
52 51 friend class Attorney::ApplicationTask;
53 52 public:
53 + Application();
54 + ~Application();
55 +
54 56 /// Startup and shutdown
55 57 ErrorCode start(const stringImpl& entryPoint, I32 argc, char** argv);
56 58 void stop();
57 59
60 + void idle();
61 +
58 62 bool step();
59 63 bool onLoop();
60 64
  @@ -92,9 +96,6 @@
92 96
93 97 private:
94 98
95 - Application();
96 - ~Application();
97 -
98 99 //ToDo: Remove this hack - Ionut
99 100 void warmup();
100 101
  @@ -118,7 +119,7 @@
118 119 /// A list of callbacks to execute on the main thread
119 120 mutable SharedLock _taskLock;
120 121 vectorImpl<DELEGATE_CBK<void> > _mainThreadCallbacks;
121 - END_SINGLETON
122 + };
122 123
123 124 }; // namespace Divide
124 125