Reset: work with threaded OSG modes

[flightgear.git] / src / Aircraft / flightrecorder.hxx

diff --git a/src/Aircraft/flightrecorder.hxx b/src/Aircraft/flightrecorder.hxx
index 2bf23908826a05ea319066c82242542c0902e0b6..f3759df64acc026be5a89012fb27dd83a1de971b 100644 (file)
--- a/src/Aircraft/flightrecorder.hxx
+++ b/src/Aircraft/flightrecorder.hxx
@@ -54,6 +54,7 @@ public:
     virtual ~FGFlightRecorder();
 
     void            reinit              (void);
+    void            reinit              (SGPropertyNode_ptr ConfigNode);
     FGReplayData*   createEmptyRecord   (void);
     FGReplayData*   capture             (double SimTime, FGReplayData* pRecycledBuffer);
     void            replay              (double SimTime, const FGReplayData* pNextBuffer,
@@ -61,17 +62,20 @@ public:
     void            deleteRecord        (FGReplayData* pRecord);
 
     int             getRecordSize       (void) { return m_TotalRecordSize;}
+    void            getConfig           (SGPropertyNode* root);
 
 private:
-    void initDefault(void);
+    SGPropertyNode_ptr getDefault(void);
     void initSignalList(const char* pSignalType, FlightRecorder::TSignalList& SignalList,
                         SGPropertyNode_ptr BaseNode);
     void processSignalList(const char* pSignalType, FlightRecorder::TSignalList& SignalList,
                            SGPropertyNode_ptr SignalListNode,
-                           string PropPrefix="", int Count = 1);
+                           std::string PropPrefix="", int Count = 1);
     bool haveProperty(FlightRecorder::TSignalList& Capture,SGPropertyNode* pProperty);
     bool haveProperty(SGPropertyNode* pProperty);
 
+    int  getConfig(SGPropertyNode* root, const char* typeStr, const FlightRecorder::TSignalList& SignalList);
+
     SGPropertyNode_ptr m_RecorderNode;
     SGPropertyNode_ptr m_ConfigNode;
 
@@ -83,7 +87,8 @@ private:
     FlightRecorder::TSignalList m_CaptureBool;
 
     int m_TotalRecordSize;
-    string m_ConfigName;
+    std::string m_ConfigName;
+    bool m_usingDefaultConfig;
 };
 
 #endif /* FLIGHTRECORDER_HXX_ */