[iortcw] 180/497: All: Fix S_ClearSoundBuffer
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit 0396838973cc277cc7a1b17e36f984742c803d58 Author: m4n4t4...@gmail.com Date: Sun Aug 17 17:23:07 2014 + All: Fix S_ClearSoundBuffer --- MP/code/client/snd_openal.c | 4 SP/code/client/snd_openal.c | 4 SP/code/qcommon/files.c | 10 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/MP/code/client/snd_openal.c b/MP/code/client/snd_openal.c index dafb7be..2422ce8 100644 --- a/MP/code/client/snd_openal.c +++ b/MP/code/client/snd_openal.c @@ -771,6 +771,8 @@ void S_AL_SrcShutdown( void ) for(i = 0; i < srcCount; i++) { curSource = &srcList[i]; + + srcList[i].isLocked = qfalse; if(curSource->isLocked) Com_DPrintf( S_COLOR_YELLOW "WARNING: Source %d is locked\n", i); @@ -2449,6 +2451,8 @@ S_AL_ClearSoundBuffer static void S_AL_ClearSoundBuffer( void ) { + S_AL_SrcShutdown( ); + S_AL_SrcInit( ); } /* diff --git a/SP/code/client/snd_openal.c b/SP/code/client/snd_openal.c index 0d83859..1ac6bdd 100644 --- a/SP/code/client/snd_openal.c +++ b/SP/code/client/snd_openal.c @@ -772,6 +772,8 @@ void S_AL_SrcShutdown( void ) for(i = 0; i < srcCount; i++) { curSource = &srcList[i]; + + srcList[i].isLocked = qfalse; if(curSource->isLocked) Com_DPrintf( S_COLOR_YELLOW "WARNING: Source %d is locked\n", i); @@ -2505,6 +2507,8 @@ S_AL_ClearSoundBuffer static void S_AL_ClearSoundBuffer( void ) { + S_AL_SrcShutdown( ); + S_AL_SrcInit( ); } /* diff --git a/SP/code/qcommon/files.c b/SP/code/qcommon/files.c index 08c75b5..7383ab1 100644 --- a/SP/code/qcommon/files.c +++ b/SP/code/qcommon/files.c @@ -815,7 +815,7 @@ long FS_SV_FOpenFileRead(const char *filename, fileHandle_t *fp) Q_strncpyz( fsh[f].name, filename, sizeof( fsh[f].name ) ); // don't let sound stutter - S_ClearSoundBuffer(); +// S_ClearSoundBuffer(); // search homepath ospath = FS_BuildOSPath( fs_homepath->string, filename, "" ); @@ -874,7 +874,7 @@ void FS_SV_Rename( const char *from, const char *to, qboolean safe ) { } // don't let sound stutter - S_ClearSoundBuffer(); +// S_ClearSoundBuffer(); from_ospath = FS_BuildOSPath( fs_homepath->string, from, "" ); to_ospath = FS_BuildOSPath( fs_homepath->string, to, "" ); @@ -910,7 +910,7 @@ void FS_Rename( const char *from, const char *to ) { } // don't let sound stutter - S_ClearSoundBuffer(); +// S_ClearSoundBuffer(); from_ospath = FS_BuildOSPath( fs_homepath->string, fs_gamedir, from ); to_ospath = FS_BuildOSPath( fs_homepath->string, fs_gamedir, to ); @@ -1026,7 +1026,7 @@ fileHandle_t FS_FOpenFileAppend( const char *filename ) { Q_strncpyz( fsh[f].name, filename, sizeof( fsh[f].name ) ); // don't let sound stutter - S_ClearSoundBuffer(); +// S_ClearSoundBuffer(); ospath = FS_BuildOSPath( fs_homepath->string, fs_gamedir, filename ); @@ -1069,7 +1069,7 @@ fileHandle_t FS_FCreateOpenPipeFile( const char *filename ) { Q_strncpyz( fsh[f].name, filename, sizeof( fsh[f].name ) ); // don't let sound stutter - S_ClearSoundBuffer(); +// S_ClearSoundBuffer(); ospath = FS_BuildOSPath( fs_homepath->string, fs_gamedir, filename ); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 180/497: All: Fix S_ClearSoundBuffer
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit 0396838973cc277cc7a1b17e36f984742c803d58 Author: m4n4t4...@gmail.com Date: Sun Aug 17 17:23:07 2014 + All: Fix S_ClearSoundBuffer --- MP/code/client/snd_openal.c | 4 SP/code/client/snd_openal.c | 4 SP/code/qcommon/files.c | 10 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/MP/code/client/snd_openal.c b/MP/code/client/snd_openal.c index dafb7be..2422ce8 100644 --- a/MP/code/client/snd_openal.c +++ b/MP/code/client/snd_openal.c @@ -771,6 +771,8 @@ void S_AL_SrcShutdown( void ) for(i = 0; i < srcCount; i++) { curSource = &srcList[i]; + + srcList[i].isLocked = qfalse; if(curSource->isLocked) Com_DPrintf( S_COLOR_YELLOW "WARNING: Source %d is locked\n", i); @@ -2449,6 +2451,8 @@ S_AL_ClearSoundBuffer static void S_AL_ClearSoundBuffer( void ) { + S_AL_SrcShutdown( ); + S_AL_SrcInit( ); } /* diff --git a/SP/code/client/snd_openal.c b/SP/code/client/snd_openal.c index 0d83859..1ac6bdd 100644 --- a/SP/code/client/snd_openal.c +++ b/SP/code/client/snd_openal.c @@ -772,6 +772,8 @@ void S_AL_SrcShutdown( void ) for(i = 0; i < srcCount; i++) { curSource = &srcList[i]; + + srcList[i].isLocked = qfalse; if(curSource->isLocked) Com_DPrintf( S_COLOR_YELLOW "WARNING: Source %d is locked\n", i); @@ -2505,6 +2507,8 @@ S_AL_ClearSoundBuffer static void S_AL_ClearSoundBuffer( void ) { + S_AL_SrcShutdown( ); + S_AL_SrcInit( ); } /* diff --git a/SP/code/qcommon/files.c b/SP/code/qcommon/files.c index 08c75b5..7383ab1 100644 --- a/SP/code/qcommon/files.c +++ b/SP/code/qcommon/files.c @@ -815,7 +815,7 @@ long FS_SV_FOpenFileRead(const char *filename, fileHandle_t *fp) Q_strncpyz( fsh[f].name, filename, sizeof( fsh[f].name ) ); // don't let sound stutter - S_ClearSoundBuffer(); +// S_ClearSoundBuffer(); // search homepath ospath = FS_BuildOSPath( fs_homepath->string, filename, "" ); @@ -874,7 +874,7 @@ void FS_SV_Rename( const char *from, const char *to, qboolean safe ) { } // don't let sound stutter - S_ClearSoundBuffer(); +// S_ClearSoundBuffer(); from_ospath = FS_BuildOSPath( fs_homepath->string, from, "" ); to_ospath = FS_BuildOSPath( fs_homepath->string, to, "" ); @@ -910,7 +910,7 @@ void FS_Rename( const char *from, const char *to ) { } // don't let sound stutter - S_ClearSoundBuffer(); +// S_ClearSoundBuffer(); from_ospath = FS_BuildOSPath( fs_homepath->string, fs_gamedir, from ); to_ospath = FS_BuildOSPath( fs_homepath->string, fs_gamedir, to ); @@ -1026,7 +1026,7 @@ fileHandle_t FS_FOpenFileAppend( const char *filename ) { Q_strncpyz( fsh[f].name, filename, sizeof( fsh[f].name ) ); // don't let sound stutter - S_ClearSoundBuffer(); +// S_ClearSoundBuffer(); ospath = FS_BuildOSPath( fs_homepath->string, fs_gamedir, filename ); @@ -1069,7 +1069,7 @@ fileHandle_t FS_FCreateOpenPipeFile( const char *filename ) { Q_strncpyz( fsh[f].name, filename, sizeof( fsh[f].name ) ); // don't let sound stutter - S_ClearSoundBuffer(); +// S_ClearSoundBuffer(); ospath = FS_BuildOSPath( fs_homepath->string, fs_gamedir, filename ); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits