Make the view-manager and sound-manager independent.

[flightgear.git] / src / Sound / soundmanager.hxx

diff --git a/src/Sound/soundmanager.hxx b/src/Sound/soundmanager.hxx
index 244b7b162726a456361be0675f3d901ab43e011d..e9edbd7d3d4410c579bb4021dcf89ea43ae34921 100644 (file)
--- a/src/Sound/soundmanager.hxx
+++ b/src/Sound/soundmanager.hxx
@@ -39,26 +39,30 @@ public:
     ~FGSoundManager();
 
     void init(void);
-    void bind(void);
     void update(double dt);
+    void reinit(void);
 
-    void runtime_init(void);
     void activate(bool State);
-
-    static void setNewSoundDevice(const char *device);
+    void update_device_list();
 
 private:
+    bool stationary() const;
+  
     bool _is_initialized;
-    SGPropertyNode_ptr _sound_working, _sound_enabled, _volume;
+    SGPropertyNode_ptr _sound_working, _sound_enabled, _volume, _device_name;
+    SGPropertyNode_ptr _currentView;
+    SGPropertyNode_ptr _viewPosLon, _viewPosLat, _viewPosElev;
+    SGPropertyNode_ptr _velocityNorthFPS, _velocityEastFPS, _velocityDownFPS;
     Listener* _listener;
 };
 #else
+#include "Main/fg_props.hxx"
 
 // provide a dummy sound class
 class FGSoundManager : public SGSubsystem
 {
 public:
-    FGSoundManager() {}
+    FGSoundManager() { fgSetBool("/sim/sound/working", false);}
     ~FGSoundManager() {}
 
     void update(double dt) {}