SCI: Renamed various song/songlib related structs and members

svn-id: r41342

2 files changed, 39 insertions, 39 deletions

diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index 970be1b683..6852d99648 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -151,7 +151,7 @@ SongIterator *build_iterator(EngineState *s, int song_nr, SongIteratorType type,
 
 void process_sound_events(EngineState *s) { /* Get all sound events, apply their changes to the heap */
 	int result;
-	song_handle_t handle;
+	SongHandle handle;
 	int cue;
 
 	if (s->_version >= SCI_VERSION_01)
@@ -204,7 +204,7 @@ void process_sound_events(EngineState *s) { /* Get all sound events, apply their
 reg_t kDoSound_SCI0(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	reg_t obj = (argc > 1) ? argv[1] : NULL_REG;
 	uint16 command = argv[0].toUint16();
-	song_handle_t handle = FROBNICATE_HANDLE(obj);
+	SongHandle handle = FROBNICATE_HANDLE(obj);
 	int number = obj.segment ?
 	             GET_SEL32V(obj, number) :
 	             -1; /* We were not going to use it anyway */
@@ -383,7 +383,7 @@ reg_t kDoSound_SCI0(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 reg_t kDoSound_SCI01(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	uint16 command = argv[0].toUint16();
 	reg_t obj = (argc > 1) ? argv[1] : NULL_REG;
-	song_handle_t handle = FROBNICATE_HANDLE(obj);
+	SongHandle handle = FROBNICATE_HANDLE(obj);
 	int number = obj.segment ?
 	             GET_SEL32V(obj, number) :
 	             -1; /* We were not going to use it anyway */
@@ -673,7 +673,7 @@ reg_t kDoSound_SCI01(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 reg_t kDoSound_SCI1(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	uint16 command = argv[0].toUint16();
 	reg_t obj = (argc > 1) ? argv[1] : NULL_REG;
-	song_handle_t handle = FROBNICATE_HANDLE(obj);
+	SongHandle handle = FROBNICATE_HANDLE(obj);
 	int number = obj.segment ?
 	             GET_SEL32V(obj, number) :
 	             -1; /* We were not going to use it anyway */
@@ -798,9 +798,9 @@ reg_t kDoSound_SCI1(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 		int looping = GET_SEL32V(obj, loop);
 		//int vol = GET_SEL32V(obj, vol);
 		int pri = GET_SEL32V(obj, pri);
-		song_t *song = song_lib_find(s->_sound._songlib, handle);
+		Song *song = song_lib_find(s->_sound._songlib, handle);
 
-		if (GET_SEL32V(obj, nodePtr) && (song && number != song->resource_num)) {
+		if (GET_SEL32V(obj, nodePtr) && (song && number != song->_resourceNum)) {
 			s->_sound.sfx_song_set_status(handle, SOUND_STATUS_STOPPED);
 			s->_sound.sfx_remove_song(handle);
 			PUT_SEL32(obj, nodePtr, NULL_REG);
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index a69e96eb3d..b276a02cff 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -52,7 +52,7 @@ SongIterator *build_iterator(EngineState *s, int song_nr, SongIteratorType type,
 // of the classes they are syncing.
 
 static void sync_MemObjPtr(Common::Serializer &s, MemObject *&obj);
-static void sync_songlib_t(Common::Serializer &s, songlib_t &obj);
+static void sync_songlib_t(Common::Serializer &s, SongLibrary &obj);
 
 static void sync_reg_t(Common::Serializer &s, reg_t &obj) {
 	s.syncAsUint16LE(obj.segment);
@@ -73,22 +73,22 @@ static void syncCStr(Common::Serializer &s, char **str) {
 }
 
 
-static void sync_song_t(Common::Serializer &s, song_t &obj) {
-	s.syncAsSint32LE(obj.handle);
-	s.syncAsSint32LE(obj.resource_num);
-	s.syncAsSint32LE(obj.priority);
-	s.syncAsSint32LE(obj.status);
-	s.syncAsSint32LE(obj.restore_behavior);
-	s.syncAsSint32LE(obj.restore_time);
-	s.syncAsSint32LE(obj.loops);
-	s.syncAsSint32LE(obj.hold);
+static void sync_song_t(Common::Serializer &s, Song &obj) {
+	s.syncAsSint32LE(obj._handle);
+	s.syncAsSint32LE(obj._resourceNum);
+	s.syncAsSint32LE(obj._priority);
+	s.syncAsSint32LE(obj._status);
+	s.syncAsSint32LE(obj._restoreBehavior);
+	s.syncAsSint32LE(obj._restoreTime);
+	s.syncAsSint32LE(obj._loops);
+	s.syncAsSint32LE(obj._hold);
 
 	if (s.isLoading()) {
+		obj._it = 0;
 		obj._delay = 0;
-		obj.it = 0;
-		obj.next_playing = 0;
-		obj.next_stopping = 0;
-		obj.next = 0;
+		obj._next = 0;
+		obj._nextPlaying = 0;
+		obj._nextStopping = 0;
 	}
 }
 
@@ -401,7 +401,7 @@ void StringFrag::saveLoadWithSerializer(Common::Serializer &s) {
 
 #pragma mark -
 
-static void sync_songlib_t(Common::Serializer &s, songlib_t &obj) {
+static void sync_songlib_t(Common::Serializer &s, SongLibrary &obj) {
 	int songcount = 0;
 	if (s.isSaving())
 		songcount = song_lib_count(obj);
@@ -410,16 +410,16 @@ static void sync_songlib_t(Common::Serializer &s, songlib_t &obj) {
 	if (s.isLoading()) {
 		song_lib_init(&obj);
 		while (songcount--) {
-			song_t *newsong = (song_t *)calloc(1, sizeof(song_t));
+			Song *newsong = (Song *)calloc(1, sizeof(Song));
 			sync_song_t(s, *newsong);
 			song_lib_add(obj, newsong);
 		}
 	} else {
-		song_t *seeker = *(obj.lib);
+		Song *seeker = *(obj._lib);
 		while (seeker) {
-			seeker->restore_time = seeker->it->getTimepos();
+			seeker->_restoreTime = seeker->_it->getTimepos();
 			sync_song_t(s, *seeker);
-			seeker = seeker->next;
+			seeker = seeker->_next;
 		}
 	}
 }
@@ -692,11 +692,11 @@ static void reconstruct_clones(EngineState *s, SegManager *self) {
 int _reset_graphics_input(EngineState *s);
 
 static void reconstruct_sounds(EngineState *s) {
-	song_t *seeker;
+	Song *seeker;
 	SongIteratorType it_type = s->resmgr->_sciVersion >= SCI_VERSION_01 ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0;
 
-	if (s->_sound._songlib.lib)
-		seeker = *(s->_sound._songlib.lib);
+	if (s->_sound._songlib._lib)
+		seeker = *(s->_sound._songlib._lib);
 	else {
 		song_lib_init(&s->_sound._songlib);
 		seeker = NULL;
@@ -707,21 +707,21 @@ static void reconstruct_sounds(EngineState *s) {
 		int oldstatus;
 		SongIterator::Message msg;
 
-		base = ff = build_iterator(s, seeker->resource_num, it_type, seeker->handle);
-		if (seeker->restore_behavior == RESTORE_BEHAVIOR_CONTINUE)
-			ff = new_fast_forward_iterator(base, seeker->restore_time);
+		base = ff = build_iterator(s, seeker->_resourceNum, it_type, seeker->_handle);
+		if (seeker->_restoreBehavior == RESTORE_BEHAVIOR_CONTINUE)
+			ff = new_fast_forward_iterator(base, seeker->_restoreTime);
 		ff->init();
 
-		msg = SongIterator::Message(seeker->handle, SIMSG_SET_LOOPS(seeker->loops));
+		msg = SongIterator::Message(seeker->_handle, SIMSG_SET_LOOPS(seeker->_loops));
 		songit_handle_message(&ff, msg);
-		msg = SongIterator::Message(seeker->handle, SIMSG_SET_HOLD(seeker->hold));
+		msg = SongIterator::Message(seeker->_handle, SIMSG_SET_HOLD(seeker->_hold));
 		songit_handle_message(&ff, msg);
 
-		oldstatus = seeker->status;
-		seeker->status = SOUND_STATUS_STOPPED;
-		seeker->it = ff;
-		s->_sound.sfx_song_set_status(seeker->handle, oldstatus);
-		seeker = seeker->next;
+		oldstatus = seeker->_status;
+		seeker->_status = SOUND_STATUS_STOPPED;
+		seeker->_it = ff;
+		s->_sound.sfx_song_set_status(seeker->_handle, oldstatus);
+		seeker = seeker->_next;
 	}
 }
 
@@ -729,7 +729,7 @@ void internal_stringfrag_strncpy(EngineState *s, reg_t *dest, reg_t *src, int le
 
 EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 	EngineState *retval;
-	songlib_t temp;
+	SongLibrary temp;
 
 /*
 	if (s->sound_server) {