SCI: Renamed lots of classes related to song iterators; allocate song iterators via new/delete instead of malloc/free

svn-id: r39148

2 files changed, 10 insertions, 10 deletions

diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp
index 4d01e3fcfb..f11315bfe8 100644
--- a/engines/sci/sfx/player/polled.cpp
+++ b/engines/sci/sfx/player/polled.cpp
@@ -35,7 +35,7 @@
 
 namespace Sci {
 
-static song_iterator_t *play_it;
+static SongIterator *play_it;
 static int play_paused = 0;
 static sfx_softseq_t *seq;
 static int volume = 100;
@@ -326,8 +326,8 @@ static int pp_init(ResourceManager *resmgr, int expected_latency) {
 	return SFX_OK;
 }
 
-static int pp_add_iterator(song_iterator_t *it, uint32 start_time) {
-	song_iterator_t *old = play_it;
+static int pp_add_iterator(SongIterator *it, uint32 start_time) {
+	SongIterator *old = play_it;
 
 	SIMSG_SEND(it, SIMSG_SET_PLAYMASK(seq->playmask));
 	SIMSG_SEND(it, SIMSG_SET_RHYTHM(seq->play_rhythm));
@@ -357,7 +357,7 @@ static int pp_fade_out() {
 }
 
 static int pp_stop() {
-	song_iterator_t *it = play_it;
+	SongIterator *it = play_it;
 
 	play_it = NULL;
 	warning("[play] Now stopping it %p", (void *)it);
@@ -369,7 +369,7 @@ static int pp_stop() {
 	return SFX_OK;
 }
 
-static int pp_send_iterator_message(song_iterator_message_t msg) {
+static int pp_send_iterator_message(SongIteratorMessage msg) {
 	if (!play_it)
 		return SFX_ERROR;
 
diff --git a/engines/sci/sfx/player/realtime.cpp b/engines/sci/sfx/player/realtime.cpp
index 69a8759b80..60968c809f 100644
--- a/engines/sci/sfx/player/realtime.cpp
+++ b/engines/sci/sfx/player/realtime.cpp
@@ -45,7 +45,7 @@ static inline int delta_time(const uint32 comp, const uint32 base) {
 	return long(comp) - long(base);
 }
 
-static song_iterator_t *play_it = NULL;
+static SongIterator *play_it = NULL;
 static uint32 play_last_time;
 static uint32 play_pause_started; /* Beginning of the last pause */
 static uint32 play_pause_counter; /* Last point in time to mark a
@@ -55,7 +55,7 @@ static int play_it_done = 0;
 static int play_writeahead = 0;
 static int play_moredelay = 0;
 
-static void play_song(song_iterator_t *it, uint32 *wakeup_time, int writeahead_time) {
+static void play_song(SongIterator *it, uint32 *wakeup_time, int writeahead_time) {
 	unsigned char buf[8];
 	int result;
 
@@ -188,7 +188,7 @@ static int rt_init(ResourceManager *resmgr, int expected_latency) {
 	return SFX_OK;
 }
 
-static int rt_add_iterator(song_iterator_t *it, uint32 start_time) {
+static int rt_add_iterator(SongIterator *it, uint32 start_time) {
 	if (seq->reset_timer) /* Restart timer counting if possible */
 		seq->reset_timer(start_time);
 
@@ -209,7 +209,7 @@ static int rt_fade_out(void) {
 }
 
 static int rt_stop(void) {
-	song_iterator_t *it = play_it;
+	SongIterator *it = play_it;
 
 	play_it = NULL;
 
@@ -221,7 +221,7 @@ static int rt_stop(void) {
 	return SFX_OK;
 }
 
-static int rt_send_iterator_message(song_iterator_message_t msg) {
+static int rt_send_iterator_message(SongIteratorMessage msg) {
 	if (!play_it)
 		return SFX_ERROR;