thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

patch 587769 by Fridvin Logi (supposedly helps with Nexus in The Dig)

Browse source 
svn-id: r4678
This commit is contained in:
Max Horn 2002-07-29 16:18:32 +00:00
parent a99fe80d4b
commit c56c8ea5e6
2 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

42
sound/mixer.cpp
View file

@ -68,25 +68,17 @@ int SoundMixer::insert_at(PlayingSoundHandle *handle, int index, Channel * chan)
return index; return index;
} }
int SoundMixer::insert(PlayingSoundHandle *handle, Channel * chan)
{
for (int i = 0; i != NUM_CHANNELS; i++) {
if (_channels[i] == NULL) {
return insert_at(handle, i, chan);
}
}
warning("SoundMixer::insert out of mixer slots");
chan->real_destroy();
return -1;
}
int SoundMixer::play_raw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, int SoundMixer::play_raw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate,
byte flags) byte flags)
{ {
return insert(handle, new Channel_RAW(this, sound, size, rate, flags)); for (int i = 0; i != NUM_CHANNELS; i++) {
if (_channels[i] == NULL) {
return insert_at(handle, i, new Channel_RAW(this, sound, size, rate, flags));
}
}
warning("SoundMixer::out of mixer slots");
return -1;
} }
int SoundMixer::play_stream(PlayingSoundHandle *handle, int idx, void *sound, uint32 size, int SoundMixer::play_stream(PlayingSoundHandle *handle, int idx, void *sound, uint32 size,
@ -98,12 +90,26 @@ int SoundMixer::play_stream(PlayingSoundHandle *handle, int idx, void *sound, ui
#ifdef COMPRESSED_SOUND_FILE #ifdef COMPRESSED_SOUND_FILE
int SoundMixer::play_mp3(PlayingSoundHandle *handle, void *sound, uint32 size, byte flags) int SoundMixer::play_mp3(PlayingSoundHandle *handle, void *sound, uint32 size, byte flags)
{ {
return insert(handle, new Channel_MP3(this, sound, size, flags)); for (int i = 0; i != NUM_CHANNELS; i++) {
if (_channels[i] == NULL) {
return insert_at(handle, i, new Channel_MP3(this, sound, size, flags));
}
}
warning("SoundMixer::out of mixer slots");
return -1;
} }
int SoundMixer::play_mp3_cdtrack(PlayingSoundHandle *handle, FILE * file, mad_timer_t duration) int SoundMixer::play_mp3_cdtrack(PlayingSoundHandle *handle, FILE * file, mad_timer_t duration)
{ {
/* Stop the previously playing CD track (if any) */ /* Stop the previously playing CD track (if any) */
return insert(handle, new Channel_MP3_CDMUSIC(this, file, duration)); for (int i = 0; i != NUM_CHANNELS; i++) {
if (_channels[i] == NULL) {
return insert_at(handle, i, new Channel_MP3_CDMUSIC(this, file, duration));
}
}
warning("SoundMixer::out of mixer slots");
return -1;
} }
#endif #endif

1
sound/mixer.h
View file

@ -145,7 +145,6 @@ public:
Channel *_channels[NUM_CHANNELS]; Channel *_channels[NUM_CHANNELS];
PlayingSoundHandle *_handles[NUM_CHANNELS]; PlayingSoundHandle *_handles[NUM_CHANNELS];
int insert(PlayingSoundHandle *handle, Channel * chan);
int insert_at(PlayingSoundHandle *handle, int index, Channel * chan); int insert_at(PlayingSoundHandle *handle, int index, Channel * chan);
void append(void *data, uint32 len); void append(void *data, uint32 len);
void uninsert(Channel * chan); void uninsert(Channel * chan);