[Scummvm-cvs-logs] SF.net SVN: scummvm:[38712] scummvm/trunk/engines/sci
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Sat Feb 21 18:29:03 CET 2009
Revision: 38712
http://scummvm.svn.sourceforge.net/scummvm/?rev=38712&view=rev
Author: aquadran
Date: 2009-02-21 17:29:03 +0000 (Sat, 21 Feb 2009)
Log Message:
-----------
cleanup
Modified Paths:
--------------
scummvm/trunk/engines/sci/include/sfx_player.h
scummvm/trunk/engines/sci/include/sfx_timer.h
scummvm/trunk/engines/sci/include/vm.h
scummvm/trunk/engines/sci/scicore/tools.cpp
scummvm/trunk/engines/sci/sfx/core.cpp
scummvm/trunk/engines/sci/sfx/player/polled.cpp
scummvm/trunk/engines/sci/sfx/sequencer.h
scummvm/trunk/engines/sci/sfx/softseq/opl2.cpp
Modified: scummvm/trunk/engines/sci/include/sfx_player.h
===================================================================
--- scummvm/trunk/engines/sci/include/sfx_player.h 2009-02-21 17:24:50 UTC (rev 38711)
+++ scummvm/trunk/engines/sci/include/sfx_player.h 2009-02-21 17:29:03 UTC (rev 38712)
@@ -67,12 +67,12 @@
** to add iterators onto their already existing iterators
*/
- int (*fade_out)(void);
+ int (*fade_out)();
/* Fades out the currently playing song (within two seconds
** Returns : (int) SFX_OK on success, SFX_ERROR on failure
*/
- int (*stop)(void);
+ int (*stop)();
/* Stops the currently playing song and deletes the associated iterator
** Returns : (int) SFX_OK on success, SFX_ERROR on failure
*/
@@ -86,22 +86,22 @@
** and re-start playing, so it is preferred that it is present
*/
- int (*pause)(void); /* OPTIONAL -- may be NULL */
+ int (*pause)(); /* OPTIONAL -- may be NULL */
/* Pauses song playing
** Returns : (int) SFX_OK on success, SFX_ERROR on failure
*/
- int (*resume)(void); /* OPTIONAL -- may be NULL */
+ int (*resume)(); /* OPTIONAL -- may be NULL */
/* Resumes song playing after a pause
** Returns : (int) SFX_OK on success, SFX_ERROR on failure
*/
- int (*exit)(void);
+ int (*exit)();
/* Stops the player
** Returns : (int) SFX_OK on success, SFX_ERROR on failure
*/
- void (*maintenance)(void); /* OPTIONAL -- may be NULL */
+ void (*maintenance)(); /* OPTIONAL -- may be NULL */
/* Regularly called maintenance function
** This function is called frequently and regularly (if present), it can be
** used to emit sound.
@@ -123,17 +123,17 @@
** Returns : (sfx_player_t *) The player requested, or NULL if none was found
*/
-tell_synth_func *sfx_get_player_tell_func(void);
+tell_synth_func *sfx_get_player_tell_func();
/* Gets the callback function of the player in use.
** Returns: (tell_synth_func *) The callback function.
*/
-int sfx_get_player_polyphony(void);
+int sfx_get_player_polyphony();
/* Determines the polyphony of the player in use
** Returns : (int) Number of voices the active player can emit
*/
-void sfx_reset_player(void);
+void sfx_reset_player();
/* Tells the player to stop its internal iterator
** Parameters: None.
** Returns: Nothing.
Modified: scummvm/trunk/engines/sci/include/sfx_timer.h
===================================================================
--- scummvm/trunk/engines/sci/include/sfx_timer.h 2009-02-21 17:24:50 UTC (rev 38711)
+++ scummvm/trunk/engines/sci/include/sfx_timer.h 2009-02-21 17:29:03 UTC (rev 38712)
@@ -43,7 +43,7 @@
** This function is called exactly once (provided that the timer is used at all).
*/
- int (*exit)(void);
+ int (*exit)();
/* Stops the timer
** Returns : (int) SFX_OK on success, SFX_ERROR on failure
** All resources allocated with the timer should be freed as an effect
Modified: scummvm/trunk/engines/sci/include/vm.h
===================================================================
--- scummvm/trunk/engines/sci/include/vm.h 2009-02-21 17:24:50 UTC (rev 38711)
+++ scummvm/trunk/engines/sci/include/vm.h 2009-02-21 17:29:03 UTC (rev 38712)
@@ -712,7 +712,7 @@
** This function should be run after each script_run() call.
*/
-void quit_vm(void);
+void quit_vm();
/* Instructs the virtual machine to abort
** Paramteres: (void)
** Returns : (void)
Modified: scummvm/trunk/engines/sci/scicore/tools.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/tools.cpp 2009-02-21 17:24:50 UTC (rev 38711)
+++ scummvm/trunk/engines/sci/scicore/tools.cpp 2009-02-21 17:29:03 UTC (rev 38712)
@@ -380,7 +380,7 @@
#ifdef HAVE_SCHED_YIELD
# include <sched.h>
-void sci_sched_yield(void) {
+void sci_sched_yield() {
sched_yield();
}
Modified: scummvm/trunk/engines/sci/sfx/core.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/core.cpp 2009-02-21 17:24:50 UTC (rev 38711)
+++ scummvm/trunk/engines/sci/sfx/core.cpp 2009-02-21 17:29:03 UTC (rev 38712)
@@ -57,19 +57,19 @@
return (pcm_device != NULL);
}
-void sfx_reset_player(void) {
+void sfx_reset_player() {
if (player)
player->stop();
}
-tell_synth_func *sfx_get_player_tell_func(void) {
+tell_synth_func *sfx_get_player_tell_func() {
if (player)
return player->tell_synth;
else
return NULL;
}
-int sfx_get_player_polyphony(void) {
+int sfx_get_player_polyphony() {
if (player)
return player->polyphony;
else
Modified: scummvm/trunk/engines/sci/sfx/player/polled.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/player/polled.cpp 2009-02-21 17:24:50 UTC (rev 38711)
+++ scummvm/trunk/engines/sci/sfx/player/polled.cpp 2009-02-21 17:29:03 UTC (rev 38712)
@@ -150,7 +150,7 @@
/* API implementation */
/*--------------------*/
-static void pp_timer_callback(void) {
+static void pp_timer_callback() {
/* Hey, we're polled anyway ;-) */
}
@@ -229,12 +229,12 @@
return SFX_OK;
}
-static int pp_fade_out(void) {
+static int pp_fade_out() {
warning(__FILE__": Attempt to fade out- not implemented yet");
return SFX_ERROR;
}
-static int pp_stop(void) {
+static int pp_stop() {
song_iterator_t *it = play_it;
play_it = NULL;
@@ -255,14 +255,14 @@
return SFX_OK;
}
-static int pp_pause(void) {
+static int pp_pause() {
play_paused = 1;
seq->set_volume(seq, 0);
return SFX_OK;
}
-static int pp_resume(void) {
+static int pp_resume() {
if (!play_it) {
play_paused = 0;
return SFX_OK; /* Nothing to resume */
@@ -278,7 +278,7 @@
return SFX_OK;
}
-static int pp_exit(void) {
+static int pp_exit() {
seq->exit(seq);
songit_free(play_it);
play_it = NULL;
Modified: scummvm/trunk/engines/sci/sfx/sequencer.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/sequencer.h 2009-02-21 17:24:50 UTC (rev 38711)
+++ scummvm/trunk/engines/sci/sfx/sequencer.h 2009-02-21 17:29:03 UTC (rev 38712)
@@ -68,7 +68,7 @@
** data.
*/
- int (*close)(void);
+ int (*close)();
/* Closes the sequencer
** Returns : SFX_OK on success, SFX_ERROR otherwise
*/
@@ -97,7 +97,7 @@
** Returns : SFX_OK on success, SFX_ERROR otherwise
*/
- int (*allstop)(void); /* OPTIONAL -- may be NULL */
+ int (*allstop)(); /* OPTIONAL -- may be NULL */
/* Stops playing everything in the sequencer queue
** Returns : SFX_OK on success, SFX_ERROR otherwise
*/
Modified: scummvm/trunk/engines/sci/sfx/softseq/opl2.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/softseq/opl2.cpp 2009-02-21 17:24:50 UTC (rev 38711)
+++ scummvm/trunk/engines/sci/sfx/softseq/opl2.cpp 2009-02-21 17:29:03 UTC (rev 38712)
@@ -124,7 +124,7 @@
/* initialise note/operator lists, etc. */
-void adlibemu_init_lists(void) {
+void adlibemu_init_lists() {
int i;
int j;
@@ -419,7 +419,7 @@
// printf("Matched %d notes on channel %d.\n", matched, chn);
}
-void test_adlib(void) {
+void test_adlib() {
int voice = 0;
#if 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list