diff options
Diffstat (limited to 'engines/sci/sfx')
| -rw-r--r-- | engines/sci/sfx/songlib.cpp | 20 | ||||
| -rw-r--r-- | engines/sci/sfx/songlib.h | 18 |
2 files changed, 19 insertions, 19 deletions
diff --git a/engines/sci/sfx/songlib.cpp b/engines/sci/sfx/songlib.cpp index 2161bee779..5831457acb 100644 --- a/engines/sci/sfx/songlib.cpp +++ b/engines/sci/sfx/songlib.cpp @@ -55,7 +55,7 @@ song_t *song_new(song_handle_t handle, SongIterator *it, int priority) { return retval; } -void song_lib_add(songlib_t songlib, song_t *song) { +void song_lib_add(const songlib_t &songlib, song_t *song) { song_t **seeker = NULL; int pri = song->priority; @@ -94,13 +94,13 @@ void song_lib_init(songlib_t *songlib) { songlib->_s = NULL; } -void song_lib_free(songlib_t songlib) { +void song_lib_free(const songlib_t &songlib) { _songfree_chain(*(songlib.lib)); *(songlib.lib) = NULL; } -song_t *song_lib_find(songlib_t songlib, song_handle_t handle) { +song_t *song_lib_find(const songlib_t &songlib, song_handle_t handle) { song_t *seeker = *(songlib.lib); while (seeker) { @@ -112,7 +112,7 @@ song_t *song_lib_find(songlib_t songlib, song_handle_t handle) { return seeker; } -song_t *song_lib_find_next_active(songlib_t songlib, song_t *other) { +song_t *song_lib_find_next_active(const songlib_t &songlib, song_t *other) { song_t *seeker = other ? other->next : *(songlib.lib); while (seeker) { @@ -129,11 +129,11 @@ song_t *song_lib_find_next_active(songlib_t songlib, song_t *other) { return seeker; } -song_t *song_lib_find_active(songlib_t songlib) { +song_t *song_lib_find_active(const songlib_t &songlib) { return song_lib_find_next_active(songlib, NULL); } -int song_lib_remove(songlib_t songlib, song_handle_t handle) { +int song_lib_remove(const songlib_t &songlib, song_handle_t handle) { int retval; song_t *goner = *(songlib.lib); @@ -163,7 +163,7 @@ int song_lib_remove(songlib_t songlib, song_handle_t handle) { return retval; } -void song_lib_resort(songlib_t songlib, song_t *song) { +void song_lib_resort(const songlib_t &songlib, song_t *song) { if (*(songlib.lib) == song) *(songlib.lib) = song->next; else { @@ -179,7 +179,7 @@ void song_lib_resort(songlib_t songlib, song_t *song) { song_lib_add(songlib, song); } -int song_lib_count(songlib_t songlib) { +int song_lib_count(const songlib_t &songlib) { song_t *seeker = *(songlib.lib); int retval = 0; @@ -191,13 +191,13 @@ int song_lib_count(songlib_t songlib) { return retval; } -void song_lib_set_restore_behavior(songlib_t songlib, song_handle_t handle, RESTORE_BEHAVIOR action) { +void song_lib_set_restore_behavior(const songlib_t &songlib, song_handle_t handle, RESTORE_BEHAVIOR action) { song_t *seeker = song_lib_find(songlib, handle); seeker->restore_behavior = action; } -void song_lib_dump(songlib_t songlib, int line) { +void song_lib_dump(const songlib_t &songlib, int line) { song_t *seeker = *(songlib.lib); fprintf(debug_stream, "L%d:", line); diff --git a/engines/sci/sfx/songlib.h b/engines/sci/sfx/songlib.h index efce1e17b0..b9849fbfe3 100644 --- a/engines/sci/sfx/songlib.h +++ b/engines/sci/sfx/songlib.h @@ -102,33 +102,33 @@ void song_lib_init(songlib_t *songlib); ** Returns : (void) */ -void song_lib_free(songlib_t songlib); +void song_lib_free(const songlib_t &songlib); /* Frees a song library ** Parameters: (songlib_t) songlib: The library to free ** Returns : (void) */ -void song_lib_add(songlib_t songlib, song_t *song); +void song_lib_add(const songlib_t &songlib, song_t *song); /* Adds a song to a song library. ** Parameters: (songlib_t) songlib: An existing sound library, or NULL ** (song_t *) song: The song to add ** Returns : (void) */ -song_t *song_lib_find(songlib_t songlib, song_handle_t handle); +song_t *song_lib_find(const songlib_t &songlib, song_handle_t handle); /* Looks up the song with the specified handle ** Parameters: (songlib_t) songlib: An existing sound library, may point to NULL ** (song_handle_t) handle: The sound handle to look for ** Returns : (song_t *) The song or NULL if it wasn't found */ -song_t *song_lib_find_active(songlib_t songlib); +song_t *song_lib_find_active(const songlib_t &songlib); /* Finds the first song playing with the highest priority ** Parameters: (songlib_t) songlib: An existing sound library ** Returns : (song_t *) The song that should be played next, or NULL if there is none */ -song_t *song_lib_find_next_active(songlib_t songlib, song_t *song); +song_t *song_lib_find_next_active(const songlib_t &songlib, song_t *song); /* Finds the next song playing with the highest priority ** Parameters: (songlib_t) songlib: The song library to operate on ** (song_t *) song: A song previously returned from the song library @@ -139,27 +139,27 @@ song_t *song_lib_find_next_active(songlib_t songlib, song_t *song); ** being 'playable'. */ -int song_lib_remove(songlib_t songlib, song_handle_t handle); +int song_lib_remove(const songlib_t &songlib, song_handle_t handle); /* Removes a song from the library ** Parameters: (songlib_t) songlib: An existing sound library ** (song_handle_t) handle: Handle of the song to remove ** Returns : (int) The status of the song that was removed */ -void song_lib_resort(songlib_t songlib, song_t *song); +void song_lib_resort(const songlib_t &songlib, song_t *song); /* Removes a song from the library and sorts it in again; for use after renicing ** Parameters: (songlib_t) songlib: An existing sound library ** (song_t *) song: The song to work on ** Returns : (void) */ -int song_lib_count(songlib_t songlib); +int song_lib_count(const songlib_t &songlib); /* Counts the number of songs in a song library ** Parameters: (songlib_t) songlib: The library to count ** Returns : (int) The number of songs */ -void song_lib_set_restore_behavior(songlib_t songlib, song_handle_t handle, +void song_lib_set_restore_behavior(const songlib_t &songlib, song_handle_t handle, RESTORE_BEHAVIOR action); /* Determines what should be done with the song "handle" when ** restoring it from a saved game. |