commradio: improvements for atis speech

[flightgear.git] / src / Viewer / viewmgr.hxx

diff --git a/src/Viewer/viewmgr.hxx b/src/Viewer/viewmgr.hxx
index a53b880e516252b83853c25b0437a2d799f0325e..b8711be8c73046aa5edf5ca4519e03865a37b257 100644 (file)
--- a/src/Viewer/viewmgr.hxx
+++ b/src/Viewer/viewmgr.hxx
@@ -34,7 +34,6 @@
 
 // forward decls
 class FGViewer;
-class SGSoundMgr;
 typedef SGSharedPtr<FGViewer> FGViewerPtr;
 
 // Define a structure containing view information
@@ -54,7 +53,8 @@ public:
     virtual void unbind ();
     virtual void update (double dt);
     virtual void reinit ();
-
+    virtual void shutdown();
+    
     // getters
     inline int size() const { return views.size(); }
     inline int get_current() const { return current; }
@@ -119,6 +119,10 @@ private:
     int getView () const;
     void setView (int newview);
 
+    double getViewLon_deg() const;
+    double getViewLat_deg() const;
+    double getViewElev_ft() const;
+  
 // quaternion accessors, for debugging:
     double getCurrentViewOrientation_w() const;
     double getCurrentViewOrientation_x() const;
@@ -133,8 +137,6 @@ private:
     double getCurrentViewFrame_y() const;
     double getCurrentViewFrame_z() const;
 
-    bool stationary () const;
-
     // copies current offset settings to current-view path...
     void copyToCurrent ();
     
@@ -148,9 +150,8 @@ private:
     int current;
     SGQuatd current_view_orientation, current_view_or_offset;
 
-    SGSoundMgr *smgr;
-  
-    SGPropertyNode_ptr velocityNorthFPS, velocityEastFPS, velocityDownFPS;
+    SGPropertyNode_ptr current_x_offs, current_y_offs, current_z_offs;
+    SGPropertyNode_ptr target_x_offs, target_y_offs, target_z_offs;
 };
 
 // This takes the conventional aviation XYZ body system