aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/include/sfx_songlib.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sci/include/sfx_songlib.h')
-rw-r--r--engines/sci/include/sfx_songlib.h39
1 files changed, 13 insertions, 26 deletions
diff --git a/engines/sci/include/sfx_songlib.h b/engines/sci/include/sfx_songlib.h
index 09dbc631e3..99448f7aa4 100644
--- a/engines/sci/include/sfx_songlib.h
+++ b/engines/sci/include/sfx_songlib.h
@@ -88,8 +88,7 @@ typedef struct {
/* Song library commands: */
/**************************/
-song_t *
-song_new(song_handle_t handle, song_iterator_t *it, int priority);
+song_t *song_new(song_handle_t handle, song_iterator_t *it, int priority);
/* Initializes a new song
** Parameters: (song_handle_t) handle: The sound handle
** (song_iterator_t *) it: The song
@@ -99,46 +98,40 @@ song_new(song_handle_t handle, song_iterator_t *it, int priority);
*/
-void
-song_lib_init(songlib_t *songlib);
+void song_lib_init(songlib_t *songlib);
/* Initializes a static song library
** Parameters: (songlib_t *) songlib: Pointer to the library
** to initialize
** Returns : (void)
*/
-void
-song_lib_free(songlib_t songlib);
+void song_lib_free(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(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(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(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(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
@@ -149,39 +142,34 @@ 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(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(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(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
*/
-GTimeVal
-song_sleep_time(GTimeVal *lastslept, long ticks);
+GTimeVal song_sleep_time(GTimeVal *lastslept, long ticks);
/* Caluculates the amount of seconds and microseconds to sleep.
** Parameters: (GTimeVal *) lastslept: The time to start counting on
** (long) ticks: Number of ticks to sleep
** Returns : (GTimeVal) The amount of time to sleep
*/
-GTimeVal
-song_next_wakeup_time(GTimeVal *lastslept, long ticks);
+GTimeVal song_next_wakeup_time(GTimeVal *lastslept, long ticks);
/* Calculates the time at which "ticks" have passed, counting from "lastslept".
** Parameters: (GTimeVal *) lastslept: The base to start counting on
** (long) ticks: Number of ticks to count
@@ -189,8 +177,7 @@ song_next_wakeup_time(GTimeVal *lastslept, long ticks);
** specified number of ticks has passed
*/
-void
-song_lib_set_restore_behavior(songlib_t songlib, song_handle_t handle,
+void song_lib_set_restore_behavior(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.