Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 4, 2005, 11:37:49 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/avi_play: merged the Trunk back into the branche avi_play again

merged with command svn merge ../trunk/ avi_play/ -r5845:HEAD
no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/avi_play/src/lib/sound/sound_engine.h

    r5819 r5924  
    1414
    1515#include <list>
     16#include <stack>
    1617
    1718#define SOUND_DOPPLER_FACTOR       0.001          //!< A factor for the audible doppler effect
     
    2122class PNode;
    2223class IniParser;
     24
    2325
    2426//! A class that handles audio via the openAudioLibrary
     
    5456    void flushAllBuffers();
    5557    void flushAllSources();
     58
     59    bool allocateSources(unsigned int count);
    5660    bool initAudio();
    5761
     
    6670
    6771  private:
    68     static SoundEngine*      singletonRef;             //!< Reference to this class
     72    static SoundEngine*            singletonRef;             //!< Reference to this class
    6973
    70     ALCdevice*               device;                   //!< the used audio-device.
    71     ALCcontext*              context;                  //!< the context, currently in use.
     74    ALCdevice*                     device;                   //!< the used audio-device.
     75    ALCcontext*                    context;                  //!< the context, currently in use.
    7276
    73     float                    musicVolume;              //!< the maximum volume of the music in % (0f,1f]
    74     float                    effectsVolume;            //!< the maximum volume of sound-effects in % (0f,1f]
    75     PNode*                   listener;                 //!< The listener of the Scene
     77    float                          musicVolume;              //!< the maximum volume of the music in % (0f,1f]
     78    float                          effectsVolume;            //!< the maximum volume of sound-effects in % (0f,1f]
     79    PNode*                         listener;                 //!< The listener of the Scene
    7680
    77     std::list<BaseObject*>*  bufferList;               //!< A list of buffers
    78     std::list<BaseObject*>*  sourceList;               //!< A list for all the sources in the scene.
     81    const std::list<BaseObject*>*  bufferList;               //!< A list of buffers
     82    const std::list<BaseObject*>*  sourceList;               //!< A list for all the sources in the scene.
    7983
    80 
     84    unsigned int                   maxSourceCount;           //!< How many Sources is the Maximum
     85    std::stack<ALuint>             ALSources;                //!< A list of real openAL-Sources, the engine allocates, and stores for reuse.
    8186};
    8287
Note: See TracChangeset for help on using the changeset viewer.