cppbind.Ghost: clean up a bit

[simgear.git] / simgear / sound / sample_queue.hxx

diff --git a/simgear/sound/sample_queue.hxx b/simgear/sound/sample_queue.hxx
index b2f961856f945f47d7db2863d14ad7650f2c0c90..2b11393a97f8120d5ada97a047b05f601f2d2fd0 100644 (file)
--- a/simgear/sound/sample_queue.hxx
+++ b/simgear/sound/sample_queue.hxx
@@ -36,7 +36,6 @@
 #include <vector>
 
 #include <simgear/compiler.h>
-#include <simgear/debug/logstream.hxx>
 #include <simgear/structure/SGReferenced.hxx>
 #include <simgear/structure/SGSharedPtr.hxx>
 
@@ -81,23 +80,6 @@ public:
      */
     virtual void set_source(unsigned int sid);
 
-    /**
-     * Get the OpenAL source id of this source
-     * @return OpenAL source-id
-     */
-    virtual inline unsigned int get_source() { return _source; }
-
-    /**
-     * Test if the source-id of this audio sample may be passed to OpenAL.
-     * @return true if the source-id is valid
-     */
-    virtual inline bool is_valid_source() const { return _valid_source; }
-
-    /**
-     * Set the source-id of this audio sample to invalid.
-     */
-    virtual inline void no_valid_source() { _valid_source = false; }
-
     /**
      * Test if the buffer-id of this audio sample may be passed to OpenAL.
      * @return false for sample queue
@@ -107,48 +89,12 @@ public:
     inline virtual bool is_queue() const { return true; }
 
 private:
-
-    // Position of the source sound.
-    SGVec3d _absolute_pos;      // absolute position
-    SGVec3d _relative_pos;      // position relative to the base position
-    SGVec3d _direction;         // orientation offset
-    SGVec3f _velocity;          // Velocity of the source sound.
-
-    // The position and orientation of this sound
-    SGQuatd _orientation;       // base orientation
-    SGVec3f _orivec;           // orientation vector for OpenAL
-    SGVec3d _base_pos;         // base position
-
-    SGQuatd _rotation;
-
     std::string _refname;      // sample name
     std::vector<unsigned int> _buffers;
-    unsigned int _buffer;
-
-    // configuration values
-    int _format;
-    int _freq;
-
-    // Sources are points emitting sound.
-    bool _valid_source;
-    unsigned int _source;
-
-    // The orientation of this sound (direction and cut-off angles)
-    float _inner_angle;
-    float _outer_angle;
-    float _outer_gain;
-
-    float _pitch;
-    float _volume;
-    float _master_volume;
-    float _reference_dist;
-    float _max_dist;
-    bool _loop;
 
     bool _playing;
-    bool _changed;
 
-    string random_string();
+    std::string random_string();
 };