diff options
author | Max Horn | 2009-06-07 17:07:25 +0000 |
---|---|---|
committer | Max Horn | 2009-06-07 17:07:25 +0000 |
commit | 21d948ec05e5bc09106edcf259bf839e3e8be964 (patch) | |
tree | c28a9ed03afe4fe0050e3cc77b0c306d4d24c575 /engines/sci/sfx | |
parent | 62f596821e7c1e8c696cb3e4190822b33aa1a98c (diff) | |
download | scummvm-rg350-21d948ec05e5bc09106edcf259bf839e3e8be964.tar.gz scummvm-rg350-21d948ec05e5bc09106edcf259bf839e3e8be964.tar.bz2 scummvm-rg350-21d948ec05e5bc09106edcf259bf839e3e8be964.zip |
SCI: Simplified SongLibrary code a bit
svn-id: r41345
Diffstat (limited to 'engines/sci/sfx')
-rw-r--r-- | engines/sci/sfx/core.cpp | 2 | ||||
-rw-r--r-- | engines/sci/sfx/songlib.cpp | 34 | ||||
-rw-r--r-- | engines/sci/sfx/songlib.h | 9 |
3 files changed, 14 insertions, 31 deletions
diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp index 572da29c0d..e37007bf8e 100644 --- a/engines/sci/sfx/core.cpp +++ b/engines/sci/sfx/core.cpp @@ -638,7 +638,7 @@ static int sfx_play_iterator_pcm(SongIterator *it, SongHandle handle) { #define DELAY (1000000 / SFX_TICKS_PER_SEC) void SfxState::sfx_init(ResourceManager *resmgr, int flags) { - _songlib.initSounds(); + _songlib._lib = 0; _song = NULL; _flags = flags; _soundSync = NULL; diff --git a/engines/sci/sfx/songlib.cpp b/engines/sci/sfx/songlib.cpp index 2572dc01f5..3a6549a0d4 100644 --- a/engines/sci/sfx/songlib.cpp +++ b/engines/sci/sfx/songlib.cpp @@ -78,14 +78,7 @@ void SongLibrary::addSong(Song *song) { return; } - if (*_lib == NULL) { - *_lib = song; - song->_next = NULL; - - return; - } - - seeker = _lib; + seeker = &_lib; while (*seeker && ((*seeker)->_priority > pri)) seeker = &((*seeker)->_next); @@ -93,13 +86,8 @@ void SongLibrary::addSong(Song *song) { *seeker = song; } -void SongLibrary::initSounds() { - _lib = &_s; - _s = NULL; -} - void SongLibrary::freeSounds() { - Song *next = *_lib; + Song *next = _lib; while (next) { Song *song = next; delete song->_it; @@ -107,12 +95,12 @@ void SongLibrary::freeSounds() { next = song->_next; delete song; } - *_lib = NULL; + _lib = NULL; } Song *SongLibrary::findSong(SongHandle handle) { - Song *seeker = *_lib; + Song *seeker = _lib; while (seeker) { if (seeker->_handle == handle) @@ -124,7 +112,7 @@ Song *SongLibrary::findSong(SongHandle handle) { } Song *SongLibrary::findNextActive(Song *other) { - Song *seeker = other ? other->_next : *_lib; + Song *seeker = other ? other->_next : _lib; while (seeker) { if ((seeker->_status == SOUND_STATUS_WAITING) || @@ -146,13 +134,13 @@ Song *SongLibrary::findFirstActive() { int SongLibrary::removeSong(SongHandle handle) { int retval; - Song *goner = *_lib; + Song *goner = _lib; if (!goner) return -1; if (goner->_handle == handle) - *_lib = goner->_next; + _lib = goner->_next; else { while ((goner->_next) && (goner->_next->_handle != handle)) @@ -175,10 +163,10 @@ int SongLibrary::removeSong(SongHandle handle) { } void SongLibrary::resortSong(Song *song) { - if (*_lib == song) - *_lib = song->_next; + if (_lib == song) + _lib = song->_next; else { - Song *seeker = *_lib; + Song *seeker = _lib; while (seeker->_next && (seeker->_next != song)) seeker = seeker->_next; @@ -191,7 +179,7 @@ void SongLibrary::resortSong(Song *song) { } int SongLibrary::countSongs() { - Song *seeker = *_lib; + Song *seeker = _lib; int retval = 0; while (seeker) { diff --git a/engines/sci/sfx/songlib.h b/engines/sci/sfx/songlib.h index 55c3ddf4fd..53b32e6747 100644 --- a/engines/sci/sfx/songlib.h +++ b/engines/sci/sfx/songlib.h @@ -99,15 +99,10 @@ public: class SongLibrary { public: - Song **_lib; -protected: - Song *_s; + Song *_lib; public: - SongLibrary() {} - - /** Initializes a static song library */ - void initSounds(); + SongLibrary() : _lib(0) {} /** Frees a song library. */ void freeSounds(); |