projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030105-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.c
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index f10dfd6dc2322f3b72ae2701b54d1439279f0121..212ce1b86c59493753cf8262050c547b9e3b1ae1 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-1,7
+1,7
@@
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-200
1
Artsoft Entertainment *
+* (c) 1994-200
2
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-872,8
+872,8
@@
inline void SDLOpenAudio(void)
return;
}
return;
}
- if (Mix_OpenAudio(DEFAULT_AUDIO_SAMPLE_RATE,
AUDIO_S16
,
- AUDIO_
STEREO_CHANNELS
,
+ if (Mix_OpenAudio(DEFAULT_AUDIO_SAMPLE_RATE,
MIX_DEFAULT_FORMAT
,
+ AUDIO_
NUM_CHANNELS_STEREO
,
DEFAULT_AUDIO_FRAGMENT_SIZE) < 0)
{
Error(ERR_WARN, "Mix_OpenAudio() failed: %s", SDL_GetError());
DEFAULT_AUDIO_FRAGMENT_SIZE) < 0)
{
Error(ERR_WARN, "Mix_OpenAudio() failed: %s", SDL_GetError());
@@
-885,17
+885,12
@@
inline void SDLOpenAudio(void)
audio.loops_available = TRUE;
audio.sound_enabled = TRUE;
audio.loops_available = TRUE;
audio.sound_enabled = TRUE;
- /* determine number of available channels */
- audio.channels = Mix_AllocateChannels(MIX_CHANNELS);
+ /* set number of available mixer channels */
+ audio.num_channels = Mix_AllocateChannels(NUM_MIXER_CHANNELS);
+ audio.music_channel = MUSIC_CHANNEL;
+ audio.first_sound_channel = FIRST_SOUND_CHANNEL;
- /* reserve first channel for music loops */
- if (Mix_ReserveChannels(1) == 1)
- audio.music_channel = 0;
- else
- audio.music_available = FALSE;
-
- Mix_Volume(-1, SOUND_MAX_VOLUME);
- Mix_VolumeMusic(SOUND_MAX_VOLUME);
+ Mixer_InitChannels();
}
inline void SDLCloseAudio(void)
}
inline void SDLCloseAudio(void)