projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed code to compile with current gcc and 64-bit systems
[rocksndiamonds.git]
/
src
/
sound.c
diff --git
a/src/sound.c
b/src/sound.c
index b234a89069f001bf31ea19869248d10b88ffc386..2c4c5e778b494cad4b319e151470c15595945da1 100644
(file)
--- a/
src/sound.c
+++ b/
src/sound.c
@@
-108,9
+108,10
@@
void SoundServer()
{
struct timeval delay = { 0, 0 };
char *sample_ptr;
{
struct timeval delay = { 0, 0 };
char *sample_ptr;
-
long
sample_size, max_sample_size;
-
long
fragment_size;
+
int
sample_size, max_sample_size;
+
int
fragment_size;
BOOL stereo;
BOOL stereo;
+ ssize_t ignored;
if (playing_sounds || (sound_device=open(sound_device_name,O_WRONLY))>=0)
{
if (playing_sounds || (sound_device=open(sound_device_name,O_WRONLY))>=0)
{
@@
-231,7
+232,7
@@
void SoundServer()
}
/* finally play the sound fragment */
}
/* finally play the sound fragment */
- write(sound_device,playing_buffer,fragment_size);
+
ignored =
write(sound_device,playing_buffer,fragment_size);
}
/* if no sounds playing, free device for other sound programs */
}
/* if no sounds playing, free device for other sound programs */
@@
-246,8
+247,8
@@
void SoundServer()
{
struct timeval delay = { 0, 0 };
char *sample_ptr;
{
struct timeval delay = { 0, 0 };
char *sample_ptr;
-
long
sample_size, max_sample_size = SND_BLOCKSIZE;
-
long sample_rate = 8000;
/* standard "/dev/audio" sampling rate */
+
int
sample_size, max_sample_size = SND_BLOCKSIZE;
+
int sample_rate = 8000;
/* standard "/dev/audio" sampling rate */
int wait_percent = 90; /* wait 90% of the real playing time */
int i;
int wait_percent = 90; /* wait 90% of the real playing time */
int i;
@@
-614,7
+615,7
@@
BOOL LoadSound(struct SoundInfo *snd_info)
snd_hdr = (struct SoundHeader_8SVX *)snd_info->file_ptr;
if (strncmp(snd_hdr->magic_FORM,"FORM",4) ||
snd_hdr = (struct SoundHeader_8SVX *)snd_info->file_ptr;
if (strncmp(snd_hdr->magic_FORM,"FORM",4) ||
- snd_info->file_len!=be2
long
(&snd_hdr->chunk_size)+8 ||
+ snd_info->file_len!=be2
int
(&snd_hdr->chunk_size)+8 ||
strncmp(snd_hdr->magic_8SVX,"8SVX",4))
{
fprintf(stderr,"%s: '%s' is not an IFF/8SVX file or broken- no sounds\n",
strncmp(snd_hdr->magic_8SVX,"8SVX",4))
{
fprintf(stderr,"%s: '%s' is not an IFF/8SVX file or broken- no sounds\n",
@@
-628,20
+629,20
@@
BOOL LoadSound(struct SoundInfo *snd_info)
{
if (!strncmp(ptr,"VHDR",4))
{
{
if (!strncmp(ptr,"VHDR",4))
{
- ptr+=be2
long((unsigned long
*)(ptr+4));
+ ptr+=be2
int((unsigned int
*)(ptr+4));
}
if (!strncmp(ptr,"ANNO",4))
{
}
if (!strncmp(ptr,"ANNO",4))
{
- ptr+=be2
long((unsigned long
*)(ptr+4));
+ ptr+=be2
int((unsigned int
*)(ptr+4));
}
if (!strncmp(ptr,"CHAN",4))
{
}
if (!strncmp(ptr,"CHAN",4))
{
- ptr+=be2
long((unsigned long
*)(ptr+4));
+ ptr+=be2
int((unsigned int
*)(ptr+4));
}
if (!strncmp(ptr,"BODY",4))
{
snd_info->data_ptr = ptr+8;
}
if (!strncmp(ptr,"BODY",4))
{
snd_info->data_ptr = ptr+8;
- snd_info->data_len = be2
long((unsigned long
*)(ptr+4));
+ snd_info->data_len = be2
int((unsigned int
*)(ptr+4));
return(TRUE);
}
ptr++;
return(TRUE);
}
ptr++;