Changeset 7847 in orxonox.OLD

Timestamp:

May 25, 2006, 1:12:30 AM (18 years ago)

Author:

bensch

Message:

trunk: some minor fixes

Location:

trunk/src/lib

Files:

• sound/sound_engine.h (modified) (1 diff)
• util/threading.cc (modified) (2 diffs)
• util/threading.h (modified) (1 diff)

trunk/src/lib/sound/sound_engine.h

@@ -37 +37 @@
 
     /** @param listener the listener in the scene */
-  void setListener(const PNode* listener) { this->listener = listener; };
+    void setListener(const PNode* listener) { this->listener = listener; };
     void setDopplerValues(ALfloat dopplerFactor, ALfloat dopplerVelocity);
 

trunk/src/lib/util/threading.cc

@@ -27 +27 @@
  * @todo this constructor is not jet implemented - do it
 */
-Thread::Thread()
-{
-}
+// Thread::Thread()
+// {
+// }
 
 
@@ -35 +35 @@
  * standard deconstructor
 */
-Thread::~Thread()
-{
-  // delete what has to be deleted here
-}
+// Thread::~Thread()
+// {
+//   // delete what has to be deleted here
+// }
 
 }

trunk/src/lib/util/threading.h

@@ -22 +22 @@
 
   public:
-    Thread();
-    virtual ~Thread();
+    Thread(int (*fn)(void *), void *data) { this->thread = SDL_CreateThread(fn, data); };
+    virtual ~Thread() { SDL_KillThread(this->thread); }
+    void exit ( int returnCode = 0 );
+    bool isFinished () const;
+    bool isRunning () const;
+    void wait() { SDL_WaitThread(this->thread, NULL); };
+
+    void start();
+    void terminate();
 
 
   private:
+    SDL_Thread* thread;
 
   };