[Gcblue-commits] gcb_wx/include/common simmath.h,1.16,1.17 tcOggStreamer.h,1.4,1.5 tcSound.h,1.12,1.
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2004-08-05 02:22:43
|
Update of /cvsroot/gcblue/gcb_wx/include/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29972/include/common Modified Files: simmath.h tcOggStreamer.h tcSound.h Log Message: Index: tcOggStreamer.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcOggStreamer.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcOggStreamer.h 22 Dec 2003 02:32:37 -0000 1.4 --- tcOggStreamer.h 5 Aug 2004 02:22:34 -0000 1.5 *************** *** 77,81 **** private: - FILE* oggFile; OggVorbis_File oggStream; --- 77,80 ---- *************** *** 84,91 **** float volume; ///< linear gain for source, 0.5f = -6 dB ! int bufferIndex; ///< index for buffers played by OpenAL ALuint buffers[NUM_BUFFERS]; ALuint source; ALenum format; std::string queuedSong; ///< complete file path of song to queue bool paused; --- 83,95 ---- float volume; ///< linear gain for source, 0.5f = -6 dB ! // when bufferFreeIndex == bufferBusyIndex, no buffers are available ! int bufferIndex; ///< index of next buffer to use (when free) ! int nFreeBuffers; ///< number of free buffers ! ALuint buffers[NUM_BUFFERS]; ALuint source; ALenum format; + char streamBuffer[BUFFER_SIZE]; + std::string queuedSong; ///< complete file path of song to queue bool paused; Index: simmath.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/simmath.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** simmath.h 27 Jul 2004 00:16:22 -0000 1.16 --- simmath.h 5 Aug 2004 02:22:34 -0000 1.17 *************** *** 181,184 **** --- 181,185 ---- float RangeToKm(tcKinematics& k); float RangeToKm(const tcTrack& track); + float RangeToKm(float lon_rad, float lat_rad); float RangeToKmAlt(tcKinematics& k); //float InterceptHeadingToTrack(tcTrack& track, float& afTimeToIntercept); Index: tcSound.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcSound.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tcSound.h 28 Mar 2004 11:30:14 -0000 1.12 --- tcSound.h 5 Aug 2004 02:22:34 -0000 1.13 *************** *** 61,65 **** #define SEFFECT_INTERCOM 20 #define SEFFECT_FSLIDE 21 ! #define N_SEFFECT 22 #define N_EFFECT_BUFFERS 16 --- 61,66 ---- #define SEFFECT_INTERCOM 20 #define SEFFECT_FSLIDE 21 ! #define SEFFECT_NAVALGUN 22 ! #define N_SEFFECT 23 #define N_EFFECT_BUFFERS 16 |