Eliminate loop mode from Application

[libs/core.git] / source / core / application.h

diff --git a/source/core/application.h b/source/core/application.h
index 81569ad45a965ad85c165a7eb5914f360be3f9a7..38df732f1a5779782566d249b701a19ca99011a2 100644 (file)
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -1,14 +1,13 @@
 /* $Id$
 
 This file is part of libmspcore
-Copyright © 2006 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2008, 2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #ifndef MSP_CORE_APPLICATION_H_
 #define MSP_CORE_APPLICATION_H_
 
-#include "semaphore.h"
-
 namespace Msp {
 
 /**
@@ -17,20 +16,7 @@ member of type RegApp<MainClass>.
 */
 class Application
 {
-public:
-       virtual ~Application() { }
-
-       static int run(int, char **);
-       static void usage(const char *, const char *, bool);
 protected:
-       enum LoopMode
-       {
-               NONE,       /// No main loop - main() will just return
-               SLEEP,      /// Only sleep in the main loop - useful for servers
-               TICK_SLEEP, /// Call tick every iteration, with a short sleep in between
-               TICK_YIELD  /// Call tick every iteration, with sched_yield in between
-       };
-
        class RegBase
        {
        public:
@@ -50,28 +36,33 @@ protected:
        };
 
        bool done;
-       int  exit_code;
+       int exit_code;
+
+private:
+       static RegBase *reg_app_;
+       static Application *app_;
+       static void *data_;
 
+protected:
        Application();
+public:
+       virtual ~Application() { }
+
+       static int run(int, char **, void * =0);
+       static void usage(const char *, const char *, bool);
+       static void *get_data() { return data_; }
+
+protected:
        virtual int main();
        void catch_signal(int);
-       void set_loop_mode(LoopMode);
-       void induce_tick();
        void exit(int);
        virtual void tick() { }
        virtual void sighandler(int) { }
 private:
-       LoopMode     loop_mode_;
-       Semaphore    sleep_sem_;
+       static void sighandler_(int);
 
        Application(const Application &);
        Application &operator=(const Application &);
-
-       static RegBase     *reg_app_;
-       static Application *app_;
-
-       static void sighandler_(int);
-       static void sigalrm_(int) { }
 };
 
 } // namespace Msp