X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fsound%2Fsoundmgr_openal.hxx;h=749d84272bffd28f78e313f96d9819a058c375e7;hb=d75ce1e12ee4fba106bc6595a2fb1b3b50ccbbc1;hp=c24afc57def722634f70787539f444579b6ca0a3;hpb=b1571e4437696063f9bdc6d2786f2cf626ddd7a1;p=simgear.git diff --git a/simgear/sound/soundmgr_openal.hxx b/simgear/sound/soundmgr_openal.hxx index c24afc57..749d8427 100644 --- a/simgear/sound/soundmgr_openal.hxx +++ b/simgear/sound/soundmgr_openal.hxx @@ -35,28 +35,19 @@ #ifndef _SG_SOUNDMGR_OPENAL_HXX #define _SG_SOUNDMGR_OPENAL_HXX 1 -#ifndef __cplusplus -# error This library requires C++ -#endif - #include #include #include #if defined(__APPLE__) -# define AL_ILLEGAL_ENUM AL_INVALID_ENUM -# define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION # include # include -# include #elif defined(OPENALSDK) # include # include -# include #else # include # include -# include #endif #include @@ -64,9 +55,6 @@ #include #include "sample_group.hxx" -#include "sample_openal.hxx" - -using std::string; struct refUint { unsigned int refctr; @@ -77,11 +65,11 @@ struct refUint { ~refUint() {}; }; -typedef std::map < string, refUint > buffer_map; +typedef std::map < std::string, refUint > buffer_map; typedef buffer_map::iterator buffer_map_iterator; typedef buffer_map::const_iterator const_buffer_map_iterator; -typedef std::map < string, SGSharedPtr > sample_group_map; +typedef std::map < std::string, SGSharedPtr > sample_group_map; typedef sample_group_map::iterator sample_group_map_iterator; typedef sample_group_map::const_iterator const_sample_group_map_iterator; @@ -95,7 +83,7 @@ public: SGSoundMgr(); ~SGSoundMgr(); - void init(); + void init(const char *devname = NULL); void bind(); void unbind(); void update(double dt); @@ -129,21 +117,21 @@ public: * @param refname Reference name of the sample group * @return true if successful, false otherwise */ - bool add( SGSampleGroup *sgrp, const string& refname ); + bool add( SGSampleGroup *sgrp, const std::string& refname ); /** * Remove a sample group from the sound manager. * @param refname Reference name of the sample group to remove * @return true if successful, false otherwise */ - bool remove( const string& refname ); + bool remove( const std::string& refname ); /** * Test if a specified sample group is registered at the sound manager * @param refname Reference name of the sample group test for * @return true if the specified sample group exists */ - bool exists( const string& refname ); + bool exists( const std::string& refname ); /** * Find a specified sample group in the sound manager @@ -153,11 +141,15 @@ public: SGSampleGroup *find( const string& refname, bool create = false ); /** - * Set the Geodetic position of the sound manager. + * Set the Cartesian position of the sound manager. * @param pos OpenAL listener position */ - void set_position( const SGVec3d& pos ) { - _absolute_pos = pos; _changed = true; + void set_position( const SGVec3d& pos, const SGGeod& pos_geod ) { + _base_pos = pos; _geod_pos = pos_geod; _changed = true; + } + + void set_position_offset( const SGVec3d& pos ) { + _offset_pos = pos; _changed = true; } /** @@ -172,7 +164,7 @@ public: * This is the horizontal local frame; x=north, y=east, z=down * @param Velocity vector */ - void set_velocity( const SGVec3f& vel ) { + void set_velocity( const SGVec3d& vel ) { _velocity = vel; _changed = true; } @@ -181,7 +173,7 @@ public: * This is in the same coordinate system as OpenGL; y=up, z=back, x=right. * @return Velocity vector of the OpenAL listener */ - inline SGVec3f& get_velocity() { return _velocity; } + inline SGVec3f get_velocity() { return toVec3f(_velocity); } /** * Set the orientation of the sound manager @@ -256,6 +248,14 @@ public: */ inline bool has_changed() { return _changed; } + /** + * Some implementations seem to need the velocity miltyplied by a + * factor of 100 to make them distinct. I've not found if this is + * a problem in the implementation or in out code. Until then + * this function is used to detect the problematic implementations. + */ + inline bool bad_doppler_effect() { return _bad_doppler; } + /** * Load a sample file and return it's configuration and data. * @param samplepath Path to the file to load @@ -268,6 +268,17 @@ public: bool load(string &samplepath, void **data, int *format, size_t *size, int *freq ); + /** + * Get a list of available playback devices. + */ + std::vector get_available_devices(); + + /** + * Get the current OpenAL vendor or rendering backend. + */ + const std::string& get_vendor() { return _vendor; } + const std::string& get_renderer() { return _renderer; } + private: static int _alut_init; @@ -281,9 +292,12 @@ private: // Position of the listener. SGVec3d _absolute_pos; + SGVec3d _offset_pos; + SGVec3d _base_pos; + SGGeod _geod_pos; // Velocity of the listener. - SGVec3f _velocity; + SGVec3d _velocity; // Orientation of the listener. // first 3 elements are "at" vector, second 3 are "up" vector @@ -293,15 +307,17 @@ private: sample_group_map _sample_groups; buffer_map _buffers; - vector _free_sources; - vector _sources_in_use; + std::vector _free_sources; + std::vector _sources_in_use; - char *_devname; + bool _bad_doppler; + std::string _renderer; + std::string _vendor; - bool testForALError(string s); - bool testForALCError(string s); - bool testForALUTError(string s); - bool testForError(void *p, string s); + bool testForALError(std::string s); + bool testForALCError(std::string s); + bool testForALUTError(std::string s); + bool testForError(void *p, std::string s); void update_pos_and_orientation(); void update_sample_config( SGSampleGroup *sound );