adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoiding PlaySpeech/StopSpeech namespace collision on OSX

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2756 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2007-05-15 04:57:13 +00:00
parent b5bbb7deab
commit 5d24e61860
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.7: Changes towards version 0.7:
- Renamed PlaySpeeh/StopSpeech to work around name collisions
on OSX - Alex
- Ending the battle with a simultaneous death no longer triggers an - Ending the battle with a simultaneous death no longer triggers an
assertion - SvdB assertion - SvdB
- Concurrent supermelee ship selection - SvdB - Concurrent supermelee ship selection - SvdB
sc2/src/sc2code/libs/sndlib.h
+2 -2
View File
@@ -72,8 +72,8 @@ extern void PLRStop (MUSIC_REF MusicRef);
extern BOOLEAN PLRPlaying (MUSIC_REF MusicRef); extern BOOLEAN PLRPlaying (MUSIC_REF MusicRef);
extern void PLRPause (MUSIC_REF MusicRef); extern void PLRPause (MUSIC_REF MusicRef);
extern void PLRResume (MUSIC_REF MusicRef); extern void PLRResume (MUSIC_REF MusicRef);
extern void PlaySpeech (MUSIC_REF SpeechRef); extern void snd_PlaySpeech (MUSIC_REF SpeechRef);
extern void StopSpeech (void); extern void snd_StopSpeech (void);
extern void PlayChannel (COUNT channel, void *sample, SoundPosition pos, extern void PlayChannel (COUNT channel, void *sample, SoundPosition pos,
void *positional_object, unsigned char priority); void *positional_object, unsigned char priority);
extern BOOLEAN ChannelPlaying (COUNT Channel); extern BOOLEAN ChannelPlaying (COUNT Channel);
sc2/src/sc2code/libs/sound/music.c
+2 -2
View File
@@ -97,7 +97,7 @@ PLRResume (MUSIC_REF MusicRef)
} }
void void
PlaySpeech (MUSIC_REF SpeechRef) snd_PlaySpeech (MUSIC_REF SpeechRef)
{ {
TFB_SoundSample **pmus; TFB_SoundSample **pmus;
@@ -113,7 +113,7 @@ PlaySpeech (MUSIC_REF SpeechRef)
} }
void void
StopSpeech (void) snd_StopSpeech (void)
{ {
if (!curSpeechRef) if (!curSpeechRef)
return; return;
sc2/src/sc2code/libs/video/video.c
+3 -3
View File
@@ -52,7 +52,7 @@ void
VidStop () VidStop ()
{ {
if (_cur_speech) if (_cur_speech)
StopSpeech (); snd_StopSpeech ();
if (_cur_video) if (_cur_video)
{ {
TFB_StopVideo (_cur_video); TFB_StopVideo (_cur_video);
@@ -97,7 +97,7 @@ VidPlayEx (VIDEO_REF VidRef, MUSIC_REF AudRef, MUSIC_REF SpeechRef,
vid->loop_to = 0; vid->loop_to = 0;
if (_cur_speech) if (_cur_speech)
StopSpeech (); snd_StopSpeech ();
if (_cur_video) if (_cur_video)
TFB_StopVideo (_cur_video); TFB_StopVideo (_cur_video);
_cur_speech = 0; _cur_speech = 0;
@@ -115,7 +115,7 @@ VidPlayEx (VIDEO_REF VidRef, MUSIC_REF AudRef, MUSIC_REF SpeechRef,
ret = SOFTWARE_FMV; ret = SOFTWARE_FMV;
if (SpeechRef) if (SpeechRef)
{ {
PlaySpeech (SpeechRef); snd_PlaySpeech (SpeechRef);
_cur_speech = SpeechRef; _cur_speech = SpeechRef;
} }
} }