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

svn-id: r39148

4 files changed, 13 insertions, 13 deletions

diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index 5a1b07ed07..fbedf79504 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -109,7 +109,7 @@ static void script_set_priority(EngineState *s, reg_t obj, int priority) {
 	PUT_SEL32V(obj, flags, flags);
 }
 
-song_iterator_t *build_iterator(EngineState *s, int song_nr, int type, songit_id_t id) {
+SongIterator *build_iterator(EngineState *s, int song_nr, int type, songit_id_t id) {
 	Resource *song = s->resmgr->findResource(kResourceTypeSound, song_nr, 0);
 
 	if (!song)
diff --git a/engines/sci/engine/savegame.cfsml b/engines/sci/engine/savegame.cfsml
index 8e29a4b98f..bd62cd9924 100644
--- a/engines/sci/engine/savegame.cfsml
+++ b/engines/sci/engine/savegame.cfsml
@@ -241,7 +241,7 @@ TYPE IntMapperPtr "IntMapper *" USING write_IntMapperPtr read_IntMapperPtr;
 TYPE IntMapperNodePtr "IntMapper::Node *" USING write_IntMapperNodePtr read_IntMapperNodePtr;
 TYPE songlib_t "songlib_t" USING write_songlib_t read_songlib_t;
 TYPE song_tp "song_t *" USING write_song_tp read_song_tp;
-TYPE song_iterator_t "song_iterator_t" USING write_song_iterator_t read_song_iterator_t;
+TYPE SongIterator "SongIterator" USING write_song_iterator_t read_song_iterator_t;
 TYPE song_handle_t "song_handle_t" LIKE int;
 TYPE SegManagerPtr "SegManager *" USING write_SegManagerPtr read_SegManagerPtr;
 
@@ -495,7 +495,7 @@ void write_song_tp(Common::WriteStream *fh, const song_t * const *foo) {
 	%CFSMLWRITE song_t *foo INTO fh;
 }
 
-song_iterator_t *build_iterator(EngineState *s, int song_nr, int type, songit_id_t id);
+SongIterator *build_iterator(EngineState *s, int song_nr, int type, songit_id_t id);
 
 int read_song_tp(Common::SeekableReadStream *fh, song_t **foo, const char *lastval, int *line, int *hiteof) {
 	char *token;
@@ -1003,7 +1003,7 @@ void reconstruct_clones(EngineState *s, SegManager *self) {
 
 int _reset_graphics_input(EngineState *s);
 
-song_iterator_t *new_fast_forward_iterator(song_iterator_t *it, int delta);
+SongIterator *new_fast_forward_iterator(SongIterator *it, int delta);
 
 static void reconstruct_sounds(EngineState *s) {
 	song_t *seeker;
@@ -1017,13 +1017,13 @@ static void reconstruct_sounds(EngineState *s) {
 	}
 
 	while (seeker) {
-		song_iterator_t *base, *ff;
+		SongIterator *base, *ff;
 		int oldstatus;
-		song_iterator_message_t msg;
+		SongIteratorMessage msg;
 
 		base = ff = build_iterator(s, seeker->resource_num, it_type, seeker->handle);
 		if (seeker->restore_behavior == RESTORE_BEHAVIOR_CONTINUE)
-			ff = (song_iterator_t *)new_fast_forward_iterator(base, seeker->restore_time);
+			ff = (SongIterator *)new_fast_forward_iterator(base, seeker->restore_time);
 		ff->init(ff);
 
 		msg = songit_make_message(seeker->handle, SIMSG_SET_LOOPS(seeker->loops));
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 8444dc25f0..085655b57f 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -4095,7 +4095,7 @@ void write_song_tp(Common::WriteStream *fh, const song_t * const *foo) {
 #line 496 "engines/sci/engine/savegame.cfsml"
 }
 
-song_iterator_t *build_iterator(EngineState *s, int song_nr, int type, songit_id_t id);
+SongIterator *build_iterator(EngineState *s, int song_nr, int type, songit_id_t id);
 
 int read_song_tp(Common::SeekableReadStream *fh, song_t **foo, const char *lastval, int *line, int *hiteof) {
 	char *token;
@@ -5099,7 +5099,7 @@ void reconstruct_clones(EngineState *s, SegManager *self) {
 
 int _reset_graphics_input(EngineState *s);
 
-song_iterator_t *new_fast_forward_iterator(song_iterator_t *it, int delta);
+SongIterator *new_fast_forward_iterator(SongIterator *it, int delta);
 
 static void reconstruct_sounds(EngineState *s) {
 	song_t *seeker;
@@ -5113,13 +5113,13 @@ static void reconstruct_sounds(EngineState *s) {
 	}
 
 	while (seeker) {
-		song_iterator_t *base, *ff;
+		SongIterator *base, *ff;
 		int oldstatus;
-		song_iterator_message_t msg;
+		SongIteratorMessage msg;
 
 		base = ff = build_iterator(s, seeker->resource_num, it_type, seeker->handle);
 		if (seeker->restore_behavior == RESTORE_BEHAVIOR_CONTINUE)
-			ff = (song_iterator_t *)new_fast_forward_iterator(base, seeker->restore_time);
+			ff = (SongIterator *)new_fast_forward_iterator(base, seeker->restore_time);
 		ff->init(ff);
 
 		msg = songit_make_message(seeker->handle, SIMSG_SET_LOOPS(seeker->loops));
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 965712ab68..e50573fa72 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -2412,7 +2412,7 @@ int c_simkey(EngineState *s) {
 
 static int c_is_sample(EngineState *s) {
 	Resource *song = s->resmgr->findResource(kResourceTypeSound, cmd_params[0].val, 0);
-	song_iterator_t *songit;
+	SongIterator *songit;
 	Audio::AudioStream *data;
 
 	if (!song) {