projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981029-1
[rocksndiamonds.git]
/
src
/
sound.c
diff --git
a/src/sound.c
b/src/sound.c
index 1858a8f331356abf3a6d0cd6ac92ba809398a216..8938750c5b6d490b009fa0765d03c7624f0899da 100644
(file)
--- a/
src/sound.c
+++ b/
src/sound.c
@@
-119,7
+119,7
@@
void SoundServer()
char *sample_ptr;
long sample_size, max_sample_size;
long fragment_size;
char *sample_ptr;
long sample_size, max_sample_size;
long fragment_size;
-
BOOL
stereo;
+
boolean
stereo;
if (playing_sounds || (sound_device=open(sound_device_name,O_WRONLY))>=0)
{
if (playing_sounds || (sound_device=open(sound_device_name,O_WRONLY))>=0)
{
@@
-615,7
+615,7
@@
static unsigned long be2long(unsigned long *be) /* big-endian -> longword */
return(ptr[0]<<24 | ptr[1]<<16 | ptr[2]<<8 | ptr[3]);
}
return(ptr[0]<<24 | ptr[1]<<16 | ptr[2]<<8 | ptr[3]);
}
-
BOOL
LoadSound(struct SoundInfo *snd_info)
+
boolean
LoadSound(struct SoundInfo *snd_info)
{
FILE *file;
char filename[256];
{
FILE *file;
char filename[256];
@@
-632,13
+632,13
@@
BOOL LoadSound(struct SoundInfo *snd_info)
#ifndef MSDOS
if (!(file=fopen(filename,"r")))
{
#ifndef MSDOS
if (!(file=fopen(filename,"r")))
{
- Error(ERR_
RETU
RN, "cannot open sound file '%s' - no sounds", filename);
+ Error(ERR_
WA
RN, "cannot open sound file '%s' - no sounds", filename);
return(FALSE);
}
if (fseek(file,0,SEEK_END)<0)
{
return(FALSE);
}
if (fseek(file,0,SEEK_END)<0)
{
- Error(ERR_
RETU
RN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_
WA
RN, "cannot read sound file '%s' - no sounds", filename);
fclose(file);
return(FALSE);
}
fclose(file);
return(FALSE);
}
@@
-648,14
+648,14
@@
BOOL LoadSound(struct SoundInfo *snd_info)
if (!(snd_info->file_ptr=malloc(snd_info->file_len)))
{
if (!(snd_info->file_ptr=malloc(snd_info->file_len)))
{
- Error(ERR_
RETU
RN, "out of memory (this shouldn't happen :) - no sounds");
+ Error(ERR_
WA
RN, "out of memory (this shouldn't happen :) - no sounds");
fclose(file);
return(FALSE);
}
if (fread(snd_info->file_ptr,1,snd_info->file_len,file)!=snd_info->file_len)
{
fclose(file);
return(FALSE);
}
if (fread(snd_info->file_ptr,1,snd_info->file_len,file)!=snd_info->file_len)
{
- Error(ERR_
RETU
RN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_
WA
RN, "cannot read sound file '%s' - no sounds", filename);
fclose(file);
return(FALSE);
}
fclose(file);
return(FALSE);
}
@@
-668,7
+668,7
@@
BOOL LoadSound(struct SoundInfo *snd_info)
snd_info->file_len != be2long(&sound_header->chunk_size)+8 ||
strncmp(sound_header->magic_8SVX,"8SVX",4))
{
snd_info->file_len != be2long(&sound_header->chunk_size)+8 ||
strncmp(sound_header->magic_8SVX,"8SVX",4))
{
- Error(ERR_
RETU
RN, "'%s' is not an IFF/8SVX file or broken - no sounds",
+ Error(ERR_
WA
RN, "'%s' is not an IFF/8SVX file or broken - no sounds",
filename);
return(FALSE);
}
filename);
return(FALSE);
}
@@
-711,7
+711,7
@@
BOOL LoadSound(struct SoundInfo *snd_info)
snd_info->sample_ptr = load_sample(filename);
if(!snd_info->sample_ptr)
{
snd_info->sample_ptr = load_sample(filename);
if(!snd_info->sample_ptr)
{
- Error(ERR_
RETU
RN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_
WA
RN, "cannot read sound file '%s' - no sounds", filename);
fclose(file);
return(FALSE);
}
fclose(file);
return(FALSE);
}
@@
-734,11
+734,11
@@
void PlaySoundLoop(int nr)
PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_LOOP);
}
PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_LOOP);
}
-void PlaySoundExt(int nr, int volume, int stereo,
BOOL
loop)
+void PlaySoundExt(int nr, int volume, int stereo,
boolean
loop)
{
struct SoundControl snd_ctrl = emptySoundControl;
{
struct SoundControl snd_ctrl = emptySoundControl;
- if (sound_status==SOUND_OFF || !s
ound_on
)
+ if (sound_status==SOUND_OFF || !s
etup.sound
)
return;
if (volume<PSND_MIN_VOLUME)
return;
if (volume<PSND_MIN_VOLUME)
@@
-762,7
+762,7
@@
void PlaySoundExt(int nr, int volume, int stereo, BOOL loop)
#ifndef MSDOS
if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
{
#ifndef MSDOS
if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
{
- Error(ERR_
RETU
RN, "cannot pipe to child process - no sounds");
+ Error(ERR_
WA
RN, "cannot pipe to child process - no sounds");
sound_status = SOUND_OFF;
return;
}
sound_status = SOUND_OFF;
return;
}
@@
-812,7
+812,7
@@
void StopSoundExt(int nr, int method)
#ifndef MSDOS
if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
{
#ifndef MSDOS
if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
{
- Error(ERR_
RETU
RN, "cannot pipe to child process - no sounds");
+ Error(ERR_
WA
RN, "cannot pipe to child process - no sounds");
sound_status = SOUND_OFF;
return;
}
sound_status = SOUND_OFF;
return;
}