merge with/from trunk at r35190
[blender.git] / intern / ghost / intern / GHOST_System.cpp
index dc7d1ddfb91b54dc89509b656e2d5e38dee4637a..a23188e52af49e0615f61768086fdd7f03ef23f6 100644 (file)
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file ghost/intern/GHOST_System.cpp
+ *  \ingroup GHOST
+ */
+
+
 /**
 
  * $Id$
  * @date       May 7, 2001
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "GHOST_System.h"
 
 #include <time.h>
@@ -226,10 +227,37 @@ GHOST_TSuccess GHOST_System::addEventConsumer(GHOST_IEventConsumer* consumer)
 }
 
 
+ GHOST_TSuccess GHOST_System::beginRecord(FILE *file)
+ {
+       return this->m_eventManager->beginRecord(file);
+ }
+
+ GHOST_TSuccess GHOST_System::endRecord()
+ {
+       return this->m_eventManager->endRecord();
+ }
+
+ GHOST_TSuccess GHOST_System::playbackEvents(FILE *file)
+ {
+       return this->m_eventManager->playbackEvents(file);
+ }
+
+
+ bool GHOST_System::playingEvents(bool *hasevent) const
+ {
+       return this->m_eventManager->playingEvents(hasevent);
+ }
+
+ bool GHOST_System::recordingEvents()
+ {
+       return this->m_eventManager->recordingEvents();
+ }
+
+
 GHOST_TSuccess GHOST_System::pushEvent(GHOST_IEvent* event)
 {
        GHOST_TSuccess success;
-       if (m_eventManager) {
+       if (m_eventManager && !m_eventManager->playingEvents(NULL)) {
                success = m_eventManager->pushEvent(event);
        }
        else {